aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Modify events_post() in mod/events.php to set the `private` field to true ↵Zach Prezkuta2012-05-021-0/+19
| | | | when an event is shared with specific people. This is necessary to have event posts show correctly in Diaspora if an event is created visible only to self, but modified later to be visible to others.
* use mysql replace on cache itemsfriendica2012-05-021-12/+30
|
* fixing common friendsfriendica2012-05-021-6/+7
|
* Merge https://github.com/friendica/friendica into pullfriendica2012-05-027-396/+418
|\
| * Merge pull request #282 from max-weller/masterfriendica2012-05-023-1/+9
| |\ | | | | | | Moved <meta viewport> to theme; Diabook style
| | * Moved Meta Viewport from global head.tpl to diabook's headerMax Weller2012-05-023-1/+9
| |/ | | | | | | | | | | | | | | | | I mistakenly added this <meta> tag to the global header, but it causes problems for other themes, as they have other optimal widths. I also added a style to diabook which makes the jGrowl messages appear below the header bar, so you can still click the menu items without having to close messages first.
| * diabook-themes: more improvements in theme.php, add titles to bbcode under ↵tommy tomson2012-05-024-28/+47
| | | | | | | | coment-box
| * diabook-theme: tryied to improve performance a bittommy tomson2012-05-022-377/+370
| |
| * diabook-theme: fix footer/impressumtommy tomson2012-05-021-1/+3
| |
* | rev updatefriendica2012-05-022-5/+12
|/
* missing paramfriendica2012-05-021-1/+2
|
* provide "service_class" identifier which will let us provide service_class ↵friendica2012-05-023-3/+14
| | | | limits such as number of FB friends, etc.
* delineate the new profile changes from the rest of the textfriendica2012-05-021-1/+1
|
* how did that happen?friendica2012-05-021-1/+1
|
* shuffle results of remote_common_friends widgetfriendica2012-05-022-8/+25
|
* only validate oncefriendica2012-05-011-3/+0
|
* perform basic validationfriendica2012-05-012-3/+9
|
* 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 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>