| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' of git://github.com/friendica/friendica | Vasudev Kamath | 2012-05-05 | 141 | -6803/+10113 |
| |\ | |||||
| | * | consolidate item deletion so we can fix orphaned categories and file_as tags. | friendica | 2012-05-05 | 1 | -27/+32 |
| | | | |||||
| | * | Merge pull request #289 from cvogeley/master | friendica | 2012-05-05 | 3 | -8/+87 |
| | |\ | | | | | | | Option to set theme width added. Minor layout changes | ||||
| | | * | Option to set theme width added. Minor layout changes | Christian Vogeley | 2012-05-05 | 3 | -8/+87 |
| | | | | |||||
| | * | | DE: new email templates translated | Tobias Diekershoff | 2012-05-05 | 2 | -28/+27 |
| | | | | |||||
| | * | | workaround to clean up orphaned filetags | friendica | 2012-05-04 | 1 | -1/+1 |
| | | | | |||||
| | * | | only show remove category to item owner | friendica | 2012-05-04 | 3 | -161/+165 |
| | |/ | |||||
| | * | Merge pull request #288 from simonlnu/master | Simon | 2012-05-04 | 6 | -787/+795 |
| | |\ | | | | | | | multiple fixes | ||||
| | | * | fix lightbox; finished dark, now on to light | Simon L'nu | 2012-05-04 | 6 | -787/+795 |
| | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-04 | 10 | -686/+970 |
| | | |\ | | |/ | |/| | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: category removal Esperanto 100% "show more" friends in common * master: | ||||
| | * | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-04 | 2 | -656/+876 |
| | |\ \ | |||||
| | | * \ | Merge pull request #287 from mschmitt/master | friendica | 2012-05-04 | 2 | -656/+876 |
| | | |\ \ | | | | | | | | | | | Update Esperanto to 100% | ||||
| | | | * | | Esperanto 100% | Martin Schmitt | 2012-05-04 | 2 | -656/+876 |
| | | |/ / | |||||
| | * / / | category removal | friendica | 2012-05-04 | 2 | -5/+16 |
| | |/ / | |||||
| | * | | "show more" friends in common | friendica | 2012-05-04 | 6 | -25/+78 |
| | | | | |||||
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-04 | 0 | -0/+0 |
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: DE strings implement max load average before queuing/deferring delivery and poller processes yet another bug in remote_friends_in_common string update use html symbols for double quotes string update proofreading the mail templates in fr fixed typo, grammar, spelling… validate_url() and validate_email() validate also IP address. * master: | ||||
| | * | DE strings | Tobias Diekershoff | 2012-05-04 | 2 | -621/+847 |
| | | | |||||
| | * | implement max load average before queuing/deferring delivery and poller ↵ | friendica | 2012-05-03 | 4 | -1/+28 |
| | | | | | | | | | processes | ||||
| | * | yet another bug in remote_friends_in_common | friendica | 2012-05-03 | 2 | -1/+2 |
| | | | |||||
| | * | string update | friendica | 2012-05-03 | 1 | -2/+2 |
| | | | |||||
| | * | use html symbols for double quotes | friendica | 2012-05-03 | 1 | -1/+1 |
| | | | |||||
| | * | string update | friendica | 2012-05-03 | 4 | -94/+91 |
| | | | |||||
| | * | Merge pull request #284 from fabrixxm/master | friendica | 2012-05-03 | 1 | -3/+3 |
| | |\ | | | | | | | validate_url() and validate_email() validate also IP address. | ||||
| | | * | validate_url() and validate_email() validate also IP address. | Fabio Comuni | 2012-05-03 | 1 | -3/+3 |
| | | | | |||||
| | * | | Merge pull request #286 from grossard/french_proofreading | friendica | 2012-05-03 | 14 | -60/+64 |
| | |\ \ | | | | | | | | | proofreading the mail templates in fr | ||||
| | | * | | proofreading the mail templates in fr | Ludovic Grossard | 2012-05-03 | 14 | -60/+64 |
| | |/ / | | | | | | | | | | fixed typo, grammar, spelling… | ||||
| | * | | Merge pull request #285 from simonlnu/master | Simon | 2012-05-03 | 10 | -1927/+3306 |
| | |\ \ | | |/ | |/| | dispy reworking, step 1 | ||||
| | | * | forgot to move modernizr up. modernizr needs to be in <head>, like html5shiv ↵ | Simon L'nu | 2012-05-03 | 2 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | (which it includes) Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | | * | major reworking of dispy dark. light to follow | Simon L'nu | 2012-05-03 | 10 | -1927/+3304 |
| | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-03 | 3 | -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: | ||||
| | * | | diabook-theme: small fix | tommy tomson | 2012-05-03 | 2 | -2/+4 |
| | | | | |||||
| | * | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-02 | 29 | -57/+123 |
| | |\ \ | |||||
| | * | | | Avoid tagging both '@Robert Johnson' and also '@Robert', when '@Robert ↵ | friendica | 2012-05-02 | 1 | -5/+33 |
| | | | | | | | | | | | | | | | | | Johnson' was already matched, and '@Robert' might be somebody different entirely. | ||||
| | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-03 | 36 | -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 fix | tommy tomson | 2012-05-03 | 1 | -0/+1 |
| | | | | | |||||
| | | * | | diabook-theme: made boxes at right_aside sortable | tommy tomson | 2012-05-03 | 29 | -57/+122 |
| | |/ / | |||||
| | * | | use cid rather than uid in perms | friendica | 2012-05-02 | 1 | -3/+12 |
| | | | | |||||
| | * | | Merge pull request #283 from fermionic/private-events-post-correctly-in-diaspora | friendica | 2012-05-02 | 1 | -0/+19 |
| | |\ \ | | | | | | | | | Fix private-events posts in Diaspora | ||||
| | | * | | Modify events_post() in mod/events.php to set the `private` field to true ↵ | Zach Prezkuta | 2012-05-02 | 1 | -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 items | friendica | 2012-05-02 | 1 | -12/+30 |
| | | | | |||||
| | * | | fixing common friends | friendica | 2012-05-02 | 1 | -6/+7 |
| | | | | |||||
| | * | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-02 | 7 | -396/+418 |
| | |\ \ | |||||
| | | * \ | Merge pull request #282 from max-weller/master | friendica | 2012-05-02 | 3 | -1/+9 |
| | | |\ \ | | | | | | | | | | | Moved <meta viewport> to theme; Diabook style | ||||
| | | | * | | Moved Meta Viewport from global head.tpl to diabook's header | Max Weller | 2012-05-02 | 3 | -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 update | friendica | 2012-05-02 | 2 | -5/+12 |
| | | | | | |||||
| | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-02 | 11 | -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 tomson | 2012-05-02 | 4 | -28/+47 |
| | | | | | | | | | | | | | | | | | coment-box | ||||
| | | * | | diabook-theme: tryied to improve performance a bit | tommy tomson | 2012-05-02 | 2 | -377/+370 |
| | | | | | |||||
| | | * | | diabook-theme: fix footer/impressum | tommy tomson | 2012-05-02 | 1 | -1/+3 |
| | |/ / | |||||
| | * | | missing param | friendica | 2012-05-02 | 1 | -1/+2 |
| | | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |