aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'upstream/master'zottel2012-05-0220-249/+383
|\
| * final touches - show friends in common with total strangers from different sitesfriendica2012-05-012-7/+13
| |
| * fix sizefriendica2012-05-011-1/+1
| |
| * cross fingersfriendica2012-05-011-1/+1
| |
| * reduce the scope a bitfriendica2012-05-012-19/+11
| |
| * add templatefriendica2012-05-011-0/+21
| |
| * fn not foundfriendica2012-05-011-0/+1
| |
| * really fat fingers today - though none of this has gone further than my own sitefriendica2012-05-011-1/+1
| |
| * another onefriendica2012-05-011-1/+1
| |
| * typofriendica2012-05-011-1/+1
| |
| * first try common friends for visitorsfriendica2012-05-014-1/+86
| |
| * improve handling of relative feed url'sfriendica2012-05-011-1/+1
| |
| * Merge https://github.com/friendica/friendica into pullfriendica2012-05-015-11/+13
| |\
| | * More Diabook-dark touch-ups. Should *really* be useable this time...with ↵Thomas Willingham2012-05-012-5/+7
| | | | | | | | | | | | editplain anyway.
| | * modified: images/smiley-thumbsup.gifThomas Willingham2012-05-011-0/+0
| | | | | | | | | | | | | | | | | | Restored some yellow where there shouldn't have been transparency. Probably introduced by me in the first place.
| | * diabook-themes: small fix at "community pages"-boxtommy tomson2012-05-012-6/+6
| | |
| * | convert html entities to utf-8 before email header encodingfriendica2012-05-013-194/+202
| |/
| * 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
| | |\ | | | | | | | | font and background adjustments
| | | * lighten bg and darken font on dispy lightSimon L'nu2012-05-012-9/+11
| | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-010-0/+0
| | |/ | | | | | | | | | | | | | | | | | | * remotes/upstream/master: hidden plugins (add .hidden file to dir) * master:
| * / adding zrl support to social graphsfriendica2012-05-015-18/+39
| |/
* | Merge remote branch 'upstream/master'zottel2012-05-0185-2812/+3625
|\|
| * Merge https://github.com/friendica/friendica into pullfriendica2012-04-3027-84/+119
| |\
| | * Merge pull request #280 from simonlnu/masterSimon2012-04-305-15/+9
| | |\ | | | | | | | | added a / for consistency's sake ;p
| | | * sub-minor change to head.tplSimon L'nu2012-05-011-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-0134-462/+1041
| | | |\ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: diabook-themes: add "community profiles"-box to right_column change api.php in function api_item_get_user to check if $usercache is NULL before checking an element in it 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 diabook-themes: add "last tweets"-box to right_aside, that searches for #friendica on twitter rev update start adding tooltips to tab menus fix join group notifications * master:
| | * | 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
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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:
| | | * \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-2929-144/+238
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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:
| | | * \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-284-134/+149
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: a few more continues that should be returns small bugfix. sometimes also avatar pics were rescaled * master:
| | | * \ \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-281-1/+1
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: poller refactor: continue not valid in this context * master:
| | | * \ \ \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-2810-445/+548
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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:
| | | * | | | | | fix #search-textSimon L'nu2012-04-274-14/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: 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:
| * | | | | | | | 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
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Bug in StatusNet API
| | * | | | | | | change api.php in function api_item_get_user to check if $usercache is NULL ↵Zach Prezkuta2012-04-301-1/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | before checking an element in it
| * | | | | | | Merge https://github.com/friendica/friendica into pullfriendica2012-04-305-7/+327
| |\ \ \ \ \ \ \
| | * | | | | | | diabook-themes: add "last tweets"-box to right_aside, that searches for ↵tommy tomson2012-05-015-7/+327
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #friendica on twitter
| * | | | | | | | make 'aaa joined group bbb' work from the initiating end, new privacy pref ↵friendica2012-04-303-29/+81
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to control it also hidewall wasn't properly checked before sending 'xxx is friends with yyy' messages
| * | | | | | | 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%
| | * | | | | | 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
| |\| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 01:34:39 +0000