aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #277 from mschmitt/masterfriendica2012-04-302-784/+649
|\ | | | | Update Esperanto to 100%
| * Update Esperanto to 100%Martin Schmitt2012-04-302-784/+649
| |
* | Merge pull request #278 from max-weller/meta_viewportfriendica2012-04-301-0/+1
|\ \ | | | | | | adding META viewport tag for better look on tablets
| * | adding META viewport tag for better look on tabletsMax Weller2012-04-301-0/+1
| |/
* | Merge https://github.com/friendica/friendica into pullfriendica2012-04-304-868/+766
|\|
| * Merge branch 'master' of https://github.com/friendica/friendicaTobias Diekershoff2012-04-301-0/+3
| |\
| * | DE update to the stringsTobias Diekershoff2012-04-304-868/+766
| | |
* | | provide "xxx joined yyy" notificationsfriendica2012-04-301-11/+34
| |/ |/|
* | activitystreams schema constants for "join group"friendica2012-04-291-0/+3
|/
* Merge pull request #276 from tomtom84/masterfriendica2012-04-291-6/+10
|\ | | | | close one menu (like notificationsmenu) when another one is opened (like when clicking somewhere else)
| * close one menu (like the notifications menu) when another one is opened ↵tommy tomson2012-04-301-6/+10
| | | | | | | | (like it is done when clicking somewhere else) (thx to ^mw)
* | missed a db fieldfriendica2012-04-291-1/+1
| |
* | typo in profile_selectors, fix remote taggingfriendica2012-04-293-21/+37
| |
* | not all profile selector choices have unique or direct translationsfriendica2012-04-291-6/+12
| |
* | log db error strings in all casesfriendica2012-04-291-3/+3
| |
* | admin page to manage failed updatesfriendica2012-04-294-3/+83
| |
* | improved db error loggingfriendica2012-04-293-124/+157
|/
* the heart should really be red.friendica2012-04-291-1/+1
|
* fix location change notificationfriendica2012-04-291-1/+1
|
* enhanced profile reporting for single valuesfriendica2012-04-291-15/+51
|
* add db field for removed account, which will also be the first test of ↵friendica2012-04-293-4/+13
| | | | update error checking
* toggle to archive unfriends, though render them uselessfriendica2012-04-281-0/+15
|
* indicate successful updatesfriendica2012-04-281-4/+8
|
* diabook-themes: small fixtommy tomson2012-04-292-2/+2
|
* diabook-themes: bug/css-fixestommy tomson2012-04-2923-98/+126
|
* some constants for the db update failure possibilitiesfriendica2012-04-281-0/+8
|
* bring back the email and logging of update failures, but without the ↵friendica2012-04-282-25/+19
| | | | transactions
* Merge https://github.com/friendica/friendica into pullfriendica2012-04-281-1/+1
|\
| * Merge pull request #275 from cvogeley/masterfriendica2012-04-281-1/+1
| |\ | | | | | | small bugfix. sometimes also avatar pics were rescaled
| | * small bugfix. sometimes also avatar pics were rescaledChristian Vogeley2012-04-281-1/+1
| |/
* / a few more continues that should be returnsfriendica2012-04-283-133/+148
|/
* poller refactor: continue not valid in this contextfriendica2012-04-281-1/+1
|
* break up poller into separate processesfriendica2012-04-274-432/+529
|
* add tooltip title to common_tabsfriendica2012-04-271-1/+1
|
* Merge https://github.com/friendica/friendica into pullfriendica2012-04-274-10/+14
|\
| * Diabook-dark update, it's almost useable now (if you're lenient).Thomas Willingham2012-04-283-10/+13
| |
| * Added "important changes" to admin menu for admins who don't followThomas Willingham2012-04-281-0/+1
| | | | | | | | the github properly.
* | PRIVACY: if wall is blocked, don't provide public keywords in HTML metafriendica2012-04-271-2/+4
|/
* string updatefriendica2012-04-271-75/+99
|
* implement contact archivalfriendica2012-04-278-19/+56
|
* archive contact flagfriendica2012-04-273-2/+7
|
* pass zrl to dfrn_request as fallbackfriendica2012-04-271-0/+5
|
* Merge https://github.com/friendica/friendica into pullfriendica2012-04-275-58/+84
|\
| * Merge pull request #274 from cvogeley/masterfriendica2012-04-271-22/+24
| |\ | | | | | | cleanzero: nav.tpl: Another attempt to improve lower tab behaviour
| | * another attempt to fix lower tab behaviour on small screens, community back ↵Christian Vogeley2012-04-271-22/+24
| |/ | | | | | | in tab area
| * Merge pull request #273 from simonlnu/masterSimon2012-04-274-24/+14
| |\ | | | | | | fix netsearch-box dupe and stuff
| | * remove extra netsearch-box and fixSimon L'nu2012-04-274-24/+14
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-270-0/+0
| |/ | | | | | | | | | | * remotes/upstream/master: * master:
| * Merge pull request #272 from simonlnu/masterSimon2012-04-274-12/+46
| |\ | | | | | | fix contact-friend stuff on profile sidebar
| | * fix contact-friend stuff on profile sidebarSimon L'nu2012-04-274-12/+46
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>