Commit graph

5324 commits

Author SHA1 Message Date
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
Simon L'nu 3bfa3f2a13 fix #search-text
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-27 21:02:57 -04:00
Simon L'nu b618715fc6 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  string update
  implement contact archival
  archive contact flag
  pass zrl to dfrn_request as fallback
  rev update
  another attempt to fix lower tab behaviour on small screens, community back in tab area

* master:
2012-04-27 21:00:56 -04:00
Thomas Willingham adc2fc18a5 Added "important changes" to admin menu for admins who don't follow
the github properly.
2012-04-28 01:25:55 +01:00
friendica c3f70a9e56 string update 2012-04-27 17:19:10 -07:00
friendica 26c53580d1 implement contact archival 2012-04-27 17:17:58 -07:00
friendica 0ab6b60a52 archive contact flag 2012-04-27 16:46:28 -07:00
friendica ecc4962bd1 pass zrl to dfrn_request as fallback 2012-04-27 16:23:25 -07:00
friendica b3750ab54e Merge https://github.com/friendica/friendica into pull 2012-04-27 15:56:28 -07:00
friendica c7cbff6fbb rev update 2012-04-27 15:55:56 -07:00
friendica 455973180b Merge pull request #274 from cvogeley/master
cleanzero: nav.tpl: Another attempt to improve lower tab behaviour
2012-04-27 15:55:38 -07:00
Christian Vogeley 731379fa25 another attempt to fix lower tab behaviour on small screens, community back in tab area 2012-04-27 23:48:44 +02:00
Simon a632f03531 Merge pull request #273 from simonlnu/master
fix netsearch-box dupe and stuff
2012-04-27 11:38:19 -07:00
Simon L'nu 64f3af49fa remove extra netsearch-box and fix
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-27 14:33:56 -04:00
Simon L'nu fcbe78f9aa Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:

* master:
2012-04-27 14:33:11 -04:00