aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-0336-82/+210
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: diabook-theme: small fix diabook-theme: made boxes at right_aside sortable use cid rather than uid in perms Modify events_post() in mod/events.php to set the `private` field to true 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 items fixing common friends rev update Moved Meta Viewport from global head.tpl to diabook's header * master:
| * diabook-theme: small fixtommy tomson2012-05-031-0/+1
| |
| * diabook-theme: made boxes at right_aside sortabletommy tomson2012-05-0329-57/+122
| |
| * use cid rather than uid in permsfriendica2012-05-021-3/+12
| |
| * Merge pull request #283 from fermionic/private-events-post-correctly-in-diasporafriendica2012-05-021-0/+19
| |\ | | | | | | Fix private-events posts in Diaspora
| | * 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.
| * | rev updatefriendica2012-05-022-5/+12
| | |
* | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-0211-412/+458
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: diabook-themes: more improvements in theme.php, add titles to bbcode under coment-box diabook-theme: tryied to improve performance a bit diabook-theme: fix footer/impressum missing param provide "service_class" identifier which will let us provide service_class limits such as number of FB friends, etc. delineate the new profile changes from the rest of the text how did that happen? shuffle results of remote_common_friends widget only validate once perform basic validation * master:
| * | 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
| |/
| * 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
| |
* | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-026-4/+109
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: final touches - show friends in common with total strangers from different sites fix size cross fingers reduce the scope a bit add template fn not found really fat fingers today - though none of this has gone further than my own site another one typo first try common friends for visitors * master:
| * 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
| |
* | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-010-0/+0
|/ | | | | | | | | | | | | * remotes/upstream/master: improve handling of relative feed url's convert html entities to utf-8 before email header encoding More Diabook-dark touch-ups. Should *really* be useable this time...with editplain anyway. modified: images/smiley-thumbsup.gif diabook-themes: small fix at "community pages"-box link socgraph to zrls adding zrl support to social graphs * master:
* 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-19 06:43:28 +0000