aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #280 from simonlnu/masterSimon2012-04-305-15/+9
|\
| * sub-minor change to head.tplSimon L'nu2012-05-011-1/+1
| * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-0134-462/+1041
| |\ | |/ |/|
* | diabook-themes: add "community profiles"-box to right_columntommy tomson2012-05-0122-69/+110
* | Merge pull request #279 from fermionic/generate-random-id-bug-in-statusnet-apifriendica2012-04-301-1/+1
|\ \
| * | change api.php in function api_item_get_user to check if $usercache is NULL b...Zach Prezkuta2012-04-301-1/+1
|/ /
* | Merge https://github.com/friendica/friendica into pullfriendica2012-04-305-7/+327
|\ \
| * | diabook-themes: add "last tweets"-box to right_aside, that searches for #frie...tommy tomson2012-05-015-7/+327
* | | make 'aaa joined group bbb' work from the initiating end, new privacy pref to...friendica2012-04-303-29/+81
|/ /
* | rev updatefriendica2012-04-302-359/+500
* | start adding tooltips to tab menusfriendica2012-04-303-0/+23
* | fix join group notificationsfriendica2012-04-302-5/+7
| * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-3018-1821/+1750
| |\ | |/ |/|
* | Merge pull request #277 from mschmitt/masterfriendica2012-04-302-784/+649
|\ \
| * | 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 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 the notifications menu) when another one is opened (like...tommy tomson2012-04-301-6/+10
* | | 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
|/ /
| * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-2929-144/+238
| |\ | |/ |/|
* | 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 update...friendica2012-04-293-4/+13
* | 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 transact...friendica2012-04-282-25/+19
| * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-284-134/+149
| |\ | |/ |/|
* | 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 rescaledChristian Vogeley2012-04-281-1/+1
| |/ /
* / / a few more continues that should be returnsfriendica2012-04-283-133/+148
|/ /
| * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-281-1/+1
| |\ | |/ |/|
* | poller refactor: continue not valid in this contextfriendica2012-04-281-1/+1
| * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-2810-445/+548
| |\ | |/ |/|
* | break up poller into separate processesfriendica2012-04-274-432/+529