aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* modified: images/smiley-thumbsup.gifThomas Willingham2012-05-011-0/+0
* diabook-themes: small fix at "community pages"-boxtommy tomson2012-05-012-6/+6
* link socgraph to zrlsfriendica2012-05-012-25/+21
* Merge https://github.com/friendica/friendica into pullfriendica2012-05-012-9/+11
|\
| * Merge pull request #281 from simonlnu/masterSimon2012-05-012-9/+11
| |\
| | * lighten bg and darken font on dispy lightSimon L'nu2012-05-012-9/+11
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-010-0/+0
| |/
* / adding zrl support to social graphsfriendica2012-05-015-18/+39
|/
* Merge https://github.com/friendica/friendica into pullfriendica2012-04-3027-84/+119
|\
| * 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 branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-3018-1821/+1750
| | |\
| | * \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-2929-144/+238
| | |\ \
| | * \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-284-134/+149
| | |\ \ \
| | * \ \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-281-1/+1
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-2810-445/+548
| | |\ \ \ \ \
| | * | | | | | fix #search-textSimon L'nu2012-04-274-14/+8
| | * | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-270-0/+0
* | | | | | | | hidden plugins (add .hidden file to dir)friendica2012-04-307-12/+111
|/ / / / / / /
* | | | | | | 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 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
|/ / / / /
* | | | | 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