Commit Graph

5388 Commits

Author SHA1 Message Date
friendica 25afec0f81 Merge pull request #279 from fermionic/generate-random-id-bug-in-statusnet-api
Bug in StatusNet API
2012-04-30 20:45:10 -07:00
Zach Prezkuta a844093365 change api.php in function api_item_get_user to check if $usercache is NULL before checking an element in it 2012-04-30 20:51:22 -06:00
friendica a3a55897e5 Merge https://github.com/friendica/friendica into pull 2012-04-30 19:04:28 -07:00
friendica 3c0cf72716 make 'aaa joined group bbb' work from the initiating end, new privacy pref to control it
also hidewall wasn't properly checked before sending 'xxx is friends with yyy' messages
2012-04-30 19:01:41 -07:00
tommy tomson f35ffa9b60 diabook-themes: add "last tweets"-box to right_aside, that searches for #friendica on twitter 2012-05-01 02:33:55 +02:00
friendica 88c77083e6 rev update 2012-04-30 17:17:19 -07:00
friendica 05df5337dd start adding tooltips to tab menus 2012-04-30 05:15:29 -07:00
friendica 5d10672fb8 fix join group notifications 2012-04-30 04:11:42 -07:00
Simon L'nu 9b7dac6ce1 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  provide "xxx joined yyy" notifications
  adding META viewport tag for better look on tablets
  Update Esperanto to 100%
  DE update to the strings
  activitystreams schema constants for "join group"
  missed a db field
  typo in profile_selectors, fix remote tagging
  not all profile selector choices have unique or direct translations
  log db error strings in all cases
  admin page to manage failed updates
  improved db error logging
  close one menu (like the notifications menu) when another one is opened (like it is done when clicking somewhere else) (thx to ^mw)

* master:
2012-04-30 06:02:38 -04:00
friendica 9f18c9d664 Merge pull request #277 from mschmitt/master
Update Esperanto to 100%
2012-04-30 01:29:50 -07:00
friendica 6b9ac25398 Merge pull request #278 from max-weller/meta_viewport
adding META viewport tag for better look on tablets
2012-04-30 01:29:35 -07:00
friendica 52e4098a3d Merge https://github.com/friendica/friendica into pull 2012-04-30 01:26:06 -07:00
friendica 3ff8fe53a2 provide "xxx joined yyy" notifications 2012-04-30 01:25:25 -07:00
Max Weller 9d8a0553ac adding META viewport tag for better look on tablets 2012-04-30 09:48:21 +02:00
Martin Schmitt 5b9f01c3ab Update Esperanto to 100% 2012-04-30 09:00:03 +02:00
Tobias Diekershoff 36522c4341 Merge branch 'master' of https://github.com/friendica/friendica 2012-04-30 08:40:06 +02:00
Tobias Diekershoff f08dc392df DE update to the strings 2012-04-30 08:39:12 +02:00
friendica 0639f645d2 activitystreams schema constants for "join group" 2012-04-29 23:15:12 -07:00
friendica 384d28a6bd Merge pull request #276 from tomtom84/master
close one menu (like notificationsmenu) when another one is opened (like when clicking somewhere else)
2012-04-29 22:39:29 -07:00
friendica da555286d6 missed a db field 2012-04-29 22:36:26 -07:00
friendica 928faf3b97 typo in profile_selectors, fix remote tagging 2012-04-29 22:34:05 -07:00
friendica ae2aa74444 not all profile selector choices have unique or direct translations 2012-04-29 20:05:29 -07:00
friendica 1ebde08415 log db error strings in all cases 2012-04-29 19:41:17 -07:00
friendica 0153d86b7f admin page to manage failed updates 2012-04-29 19:10:07 -07:00
Simon L'nu 34eb843fb4 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  the heart should really be red.
  fix location change notification
  enhanced profile reporting for single values
  add db field for removed account, which will also be the first test of update error checking
  toggle to archive unfriends, though render them useless
  indicate successful updates
  diabook-themes: small fix
  diabook-themes: bug/css-fixes
  some constants for the db update failure possibilities
  bring back the email and logging of update failures, but without the transactions

* master:
2012-04-29 22:06:16 -04:00
friendica e3fecb2557 improved db error logging 2012-04-29 17:34:54 -07:00
tommy tomson ab908469ae close one menu (like the notifications menu) when another one is opened (like it is done when clicking somewhere else) (thx to ^mw) 2012-04-30 02:00:41 +02:00
friendica def6f0b408 the heart should really be red. 2012-04-29 02:11:33 -07:00
friendica 735f518fd8 fix location change notification 2012-04-29 01:49:54 -07:00
friendica a9dba2720b enhanced profile reporting for single values 2012-04-29 01:42:48 -07:00
friendica 249a6814cd add db field for removed account, which will also be the first test of update error checking 2012-04-29 01:08:28 -07:00
friendica 64060f82dc toggle to archive unfriends, though render them useless 2012-04-28 21:56:17 -07:00
friendica b3a71e4327 indicate successful updates 2012-04-28 21:35:14 -07:00
tommy tomson 920d40acf4 diabook-themes: small fix 2012-04-29 05:58:23 +02:00
tommy tomson 3d054341ef diabook-themes: bug/css-fixes 2012-04-29 04:12:04 +02:00
friendica 356bd9b04a some constants for the db update failure possibilities 2012-04-28 17:53:19 -07:00
friendica 7919d00399 bring back the email and logging of update failures, but without the transactions 2012-04-28 17:50:28 -07:00
Simon L'nu ecd1dab373 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  a few more continues that should be returns
  small bugfix. sometimes also avatar pics were rescaled

* master:
2012-04-28 20:16:25 -04:00
friendica 8a112aee00 Merge https://github.com/friendica/friendica into pull 2012-04-28 16:55:07 -07:00
friendica 4ff2e9a103 a few more continues that should be returns 2012-04-28 16:54:33 -07:00
friendica a757afc6bd Merge pull request #275 from cvogeley/master
small bugfix. sometimes also avatar pics were rescaled
2012-04-28 16:46:12 -07:00
Simon L'nu 9413900a9f Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  poller refactor: continue not valid in this context

* master:
2012-04-28 15:46:16 -04:00
Christian Vogeley 3f586bb962 small bugfix. sometimes also avatar pics were rescaled 2012-04-28 20:15:10 +02:00
friendica 44700b914d poller refactor: continue not valid in this context 2012-04-28 04:20:38 -07:00
Simon L'nu c661dc502f Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  break up poller into separate processes
  add tooltip title to common_tabs
  PRIVACY: if wall is blocked, don't provide public keywords in HTML meta
  Diabook-dark update, it's almost useable now (if you're lenient).
  Added "important changes" to admin menu for admins who don't follow the github properly.

* master:
2012-04-28 05:29:03 -04:00
friendica f163aed66d break up poller into separate processes 2012-04-27 23:17:40 -07:00
friendica 3bb06cc3e4 add tooltip title to common_tabs 2012-04-27 19:47:52 -07:00
friendica e356920e14 Merge https://github.com/friendica/friendica into pull 2012-04-27 19:40:24 -07:00
friendica 39d0926d09 PRIVACY: if wall is blocked, don't provide public keywords in HTML meta 2012-04-27 19:39:19 -07:00
Thomas Willingham 4b553de79f Diabook-dark update, it's almost useable now (if you're lenient). 2012-04-28 03:01:27 +01:00