aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'upstream/master'zottel2012-05-0410-686/+970
|\
| * Merge https://github.com/friendica/friendica into pullfriendica2012-05-042-656/+876
| |\
| | * Merge pull request #287 from mschmitt/masterfriendica2012-05-042-656/+876
| | |\ | | | | | | | | Update Esperanto to 100%
| | | * Esperanto 100%Martin Schmitt2012-05-042-656/+876
| | |/
| * / category removalfriendica2012-05-042-5/+16
| |/
| * "show more" friends in commonfriendica2012-05-046-25/+78
| |
* | Merge remote branch 'upstream/master'zottel2012-05-0437-2709/+4343
|\|
| * DE stringsTobias Diekershoff2012-05-042-621/+847
| |
| * implement max load average before queuing/deferring delivery and poller ↵friendica2012-05-034-1/+28
| | | | | | | | processes
| * yet another bug in remote_friends_in_commonfriendica2012-05-032-1/+2
| |
| * string updatefriendica2012-05-031-2/+2
| |
| * use html symbols for double quotesfriendica2012-05-031-1/+1
| |
| * string updatefriendica2012-05-034-94/+91
| |
| * Merge pull request #284 from fabrixxm/masterfriendica2012-05-031-3/+3
| |\ | | | | | | validate_url() and validate_email() validate also IP address.
| | * validate_url() and validate_email() validate also IP address.Fabio Comuni2012-05-031-3/+3
| | |
| * | Merge pull request #286 from grossard/french_proofreadingfriendica2012-05-0314-60/+64
| |\ \ | | | | | | | | proofreading the mail templates in fr
| | * | proofreading the mail templates in frLudovic Grossard2012-05-0314-60/+64
| |/ / | | | | | | | | | fixed typo, grammar, spelling…
| * | Merge pull request #285 from simonlnu/masterSimon2012-05-0310-1927/+3306
| |\ \ | | |/ | |/| dispy reworking, step 1
| | * forgot to move modernizr up. modernizr needs to be in <head>, like html5shiv ↵Simon L'nu2012-05-032-1/+3
| | | | | | | | | | | | | | | | | | (which it includes) Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * major reworking of dispy dark. light to followSimon L'nu2012-05-0310-1927/+3304
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-033-7/+37
| | |\ | | |/ | |/| | | | | | | | | | | | | | | | * remotes/upstream/master: diabook-theme: small fix Avoid tagging both '@Robert Johnson' and also '@Robert', when '@Robert Johnson' was already matched, and '@Robert' might be somebody different entirely. * master:
| | * 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:
| | * \ 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:
| | * \ \ 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:
| | * | | | 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:
* | | | | | Merge remote branch 'upstream/master'zottel2012-05-0343-493/+697
|\| | | | |
| * | | | | diabook-theme: small fixtommy tomson2012-05-032-2/+4
| | | | | |
| * | | | | Merge https://github.com/friendica/friendica into pullfriendica2012-05-0229-57/+123
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | diabook-theme: small fixtommy tomson2012-05-031-0/+1
| | | | | |
| | * | | | diabook-theme: made boxes at right_aside sortabletommy tomson2012-05-0329-57/+122
| | | | | |
| * | | | | Avoid tagging both '@Robert Johnson' and also '@Robert', when '@Robert ↵friendica2012-05-021-5/+33
| |/ / / / | | | | | | | | | | | | | | | Johnson' was already matched, and '@Robert' might be somebody different entirely.
| * | | | 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.
| | * | | 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
| | |/ | |/|
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-10 03:41:51 +0000