| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote branch 'upstream/master' | zottel | 2012-05-07 | 40 | -611/+6304 |
| |\ | |||||
| | * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-06 | 3 | -48/+54 |
| | |\ | |||||
| | | * | Merge pull request #291 from simonlnu/master | Simon | 2012-05-06 | 3 | -48/+54 |
| | | |\ | | | | | | | | | minor css tweaks | ||||
| | | | * | more css tweaks. nothing major | Simon L'nu | 2012-05-07 | 3 | -48/+54 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-07 | 0 | -0/+0 |
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: I'll leave the private mail recipient autocomplete partially done. Need a good UI/JS person to finish it off. mail autcomplete testing email recip autocomplete rev update diabook-theme: small fix diabook-theme: add "Earth Layers"-box at right_side diabook-theme: twitterbox-bugfix diabook: small fix diabook-theme: bugfix * master: | ||||
| | * / | reset permissions to forum default when adding forum delivery chain | friendica | 2012-05-06 | 2 | -3/+14 |
| | |/ | |||||
| | * | Merge branch 'ac' | friendica | 2012-05-06 | 7 | -14/+454 |
| | |\ | |||||
| | | * | I'll leave the private mail recipient autocomplete partially done. Need a ↵ | friendica | 2012-05-06 | 1 | -3/+10 |
| | | | | | | | | | | | | | good UI/JS person to finish it off. | ||||
| | | * | mail autcomplete testing | friendica | 2012-05-06 | 7 | -15/+448 |
| | | | | |||||
| | * | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-06 | 18 | -236/+1321 |
| | |\ \ | | |/ | |/| | |||||
| | | * | diabook-theme: small fix | tommy tomson | 2012-05-07 | 1 | -1/+1 |
| | | | | |||||
| | | * | diabook-theme: add "Earth Layers"-box at right_side | tommy tomson | 2012-05-07 | 6 | -24/+269 |
| | | | | |||||
| | | * | diabook-theme: twitterbox-bugfix | tommy tomson | 2012-05-06 | 6 | -15/+701 |
| | | | | |||||
| | | * | diabook: small fix | tommy tomson | 2012-05-06 | 1 | -5/+8 |
| | | | | |||||
| | | * | Merge remote-tracking branch 'origin/master' | tommy tomson | 2012-05-06 | 8 | -185/+320 |
| | | |\ | |||||
| | | | * | Merge pull request #290 from simonlnu/master | Simon | 2012-05-06 | 8 | -185/+320 |
| | | | |\ | | | | | | | | | | | font and width tweaking | ||||
| | | | | * | fixing widths to be more dynamic where possible. font size fixes. add README.md | Simon L'nu | 2012-05-06 | 8 | -185/+320 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-06 | 3 | -25/+29 |
| | | | | |\ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: bad sql left after the mailbox in/out merge * master: | ||||
| | | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-05 | 17 | -262/+4358 |
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: diabook-theme: small fix diabook-theme: twitter-box-update at right_aside diabook-theme: can now set the twitter search term in theme-settings & small fixes consolidate item deletion so we can fix orphaned categories and file_as tags. DE: new email templates translated workaround to clean up orphaned filetags only show remove category to item owner Option to set theme width added. Minor layout changes * master: | ||||
| | | | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-04 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: * master: | ||||
| | | * | | | | diabook-theme: bugfix | tommy tomson | 2012-05-06 | 1 | -18/+34 |
| | | |/ / / | |||||
| | * | | | | email recip autocomplete | friendica | 2012-05-06 | 1 | -0/+25 |
| | | | | | | |||||
| | * | | | | rev update | friendica | 2012-05-06 | 2 | -79/+105 |
| | |/ / / | |||||
| | * | | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-05 | 8 | -37/+4046 |
| | |\ \ \ | | | |/ | | |/| | |||||
| | | * | | diabook-theme: small fix | tommy tomson | 2012-05-06 | 1 | -2/+2 |
| | | | | | |||||
| | | * | | diabook-theme: twitter-box-update at right_aside | tommy tomson | 2012-05-06 | 3 | -5/+34 |
| | | | | | |||||
| | | * | | diabook-theme: can now set the twitter search term in theme-settings & small ↵ | tommy tomson | 2012-05-05 | 8 | -33/+4013 |
| | | | | | | | | | | | | | | | | | fixes | ||||
| | * | | | bad sql left after the mailbox in/out merge | friendica | 2012-05-05 | 3 | -25/+29 |
| | |/ / | |||||
| | * | | 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 remote branch 'upstream/master' | zottel | 2012-05-05 | 6 | -787/+795 |
| |\| | |||||
| | * | 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 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: | ||||
| * | | | Merge remote branch 'upstream/master' | zottel | 2012-05-04 | 10 | -686/+970 |
| |\| | | |||||
| | * | | 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 remote branch 'upstream/master' | zottel | 2012-05-04 | 37 | -2709/+4343 |
| |\| | |||||
| | * | 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 |
| | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |