| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge https://github.com/friendica/red into zpull | friendica | 2014-02-25 | 7 | -17/+35 |
| |\ | |||||
| | * | Also update database.sql | Thomas Willingham | 2014-02-25 | 1 | -12/+12 |
| | | | |||||
| | * | Update channel permissions to full ints | Thomas Willingham | 2014-02-25 | 2 | -3/+21 |
| | | | |||||
| | * | Merge pull request #339 from tuscanhobbit/master | friendica | 2014-02-26 | 4 | -2/+2 |
| | |\ | | | | | | | Wrong logo on assets/home page | ||||
| | | * | assets dir had the old logo | tuscanhobbit | 2014-02-25 | 4 | -2/+2 |
| | | | | |||||
| | | * | Merge pull request #1 from friendica/master | Paolo T | 2014-02-25 | 1248 | -31142/+75933 |
| | | |\ | | |/ | |/| | Update this fork | ||||
| * / | | allow personalised page layouts for modules. | friendica | 2014-02-25 | 4 | -6/+13 |
| |/ / | |||||
| * | | provide ability to bookmark chatrooms using rbmark | friendica | 2014-02-24 | 3 | -4/+33 |
| | | | |||||
| * | | Merge pull request #338 from solstag/master | friendica | 2014-02-25 | 1 | -2/+2 |
| |\ \ | | | | | | | Fix typo that broke jquery.divgrow. Sorry I should have tested. | ||||
| | * | | Fix typo that broke jquery.divgrow. Sorry I should have tested. | Alexandre Hannud Abdo | 2014-02-25 | 1 | -2/+2 |
| | | | | |||||
| * | | | remote "add bookmark" - like rpost but saves a bookmark from a remote hub ↵ | friendica | 2014-02-24 | 5 | -13/+156 |
| |/ / | | | | | | | into one of your own bookmark folders (or a new one if desired). | ||||
| * | | string 'null' showing up in timeago since last modify | friendica | 2014-02-24 | 1 | -3/+2 |
| | | | |||||
| * | | take a p | friendica | 2014-02-24 | 1 | -1/+1 |
| | | | |||||
| * | | Merge https://github.com/friendica/red into zpull | friendica | 2014-02-24 | 14 | -997/+1051 |
| |\ \ | |||||
| | * \ | Merge pull request #337 from solstag/master | friendica | 2014-02-25 | 13 | -996/+1050 |
| | |\ \ | | | | | | | | | Updates to pt-br translation, including some email templates. Fix some jQuery translation issues. | ||||
| | | * | | Translation for jQuery.divgrow strings. Fix mismatch in jQuery.timeago strings | Alexandre Hannud Abdo | 2014-02-24 | 3 | -23/+27 |
| | | | | | |||||
| | | * | | Updates to pt-br translation, including some email templates. | Alexandre Hannud Abdo | 2014-02-24 | 10 | -973/+1023 |
| | |/ / | |||||
| | * | | Doco - just a friendicared => [baseurl] | Thomas Willingham | 2014-02-24 | 1 | -1/+1 |
| | | | | |||||
| * | | | set theme for un-viewable profile | friendica | 2014-02-24 | 2 | -22/+33 |
| |/ / | |||||
| * | | Merge pull request #335 from beardy-unixer/master | friendica | 2014-02-24 | 40 | -1/+2509 |
| |\ \ | | | | | | | Import doco from docs@friendicared.net | ||||
| | * | | The string replacement missed that little blighter. | Thomas Willingham | 2014-02-24 | 1 | -1/+1 |
| | | | | |||||
| | * | | Import doco from docs@friendicared.net | Thomas Willingham | 2014-02-24 | 39 | -0/+2507 |
| | | | | |||||
| | * | | Make bbcode the default doco ready for the next commit | Thomas Willingham | 2014-02-24 | 1 | -1/+2 |
| |/ / | |||||
| * | | In case a page has overloaded a module, see if we already have a layout ↵ | friendica | 2014-02-23 | 2 | -2/+5 |
| | | | | | | | | | defined. Otherwise, if a pdl file exists for this module, use it. | ||||
| * | | Merge https://github.com/friendica/red into zpull | friendica | 2014-02-22 | 4 | -0/+35 |
| |\ \ | |||||
| | * \ | Merge pull request #334 from cvogeley/master | friendica | 2014-02-23 | 4 | -0/+35 |
| | |\ \ | | | | | | | | | Add option for narrow navbar instead of the bootstrap default | ||||
| | | * | | little tweaks | Christian Vogeley | 2014-02-22 | 1 | -2/+2 |
| | | | | | |||||
| | | * | | Add option for narrow navbar instead of the bootstrap default | Christian Vogeley | 2014-02-22 | 4 | -0/+35 |
| | | | | | | | | | | | | | | | | | thick version | ||||
| * | | | | minor stuff, some doco, auth cleanup, and make "unknown" more translateable ↵ | friendica | 2014-02-22 | 3 | -5/+2 |
| |/ / / | | | | | | | | | | by context. | ||||
| * | | | Merge https://github.com/friendica/red into zpull | friendica | 2014-02-22 | 2 | -876/+923 |
| |\| | | |||||
| | * | | Merge pull request #333 from tobiasd/20140222 | tobiasd | 2014-02-22 | 2 | -876/+923 |
| | |\ \ | | | | | | | | | DE: Update to the strings | ||||
| | | * | | DE: update to the strings | Tobias Diekershoff | 2014-02-22 | 2 | -876/+923 |
| | |/ / | |||||
| * / / | This should resolve the dav authentication loop (correctly) | friendica | 2014-02-22 | 4 | -9/+23 |
| |/ / | |||||
| * | | prevent mod/cloud looping (ping gets a new session on each call [wtf?] which ↵ | friendica | 2014-02-22 | 2 | -2/+2 |
| | | | | | | | | | triggers our "changed uid" detector) | ||||
| * | | Merge https://github.com/friendica/red into zpull | friendica | 2014-02-21 | 19 | -3404/+1958 |
| |\ \ | |||||
| | * \ | Merge pull request #332 from zzottel/master | friendica | 2014-02-22 | 5 | -23/+223 |
| | |\ \ | | | | | | | | | First steps at German doco | ||||
| | | * | | changed old Friendica stuff to what we have now in Red | zottel | 2014-02-21 | 1 | -21/+9 |
| | | | | | |||||
| | | * | | small corrections | zottel | 2014-02-21 | 1 | -2/+2 |
| | | | | | |||||
| | | * | | first few German help files | zottel | 2014-02-21 | 3 | -0/+212 |
| | | | | | |||||
| | | * | | Merge remote-tracking branch 'upstream/master' | zottel | 2014-02-21 | 2 | -270/+3 |
| | | |\ \ | |||||
| | | * \ \ | Merge remote-tracking branch 'upstream/master' | zottel | 2014-02-21 | 20 | -4562/+9069 |
| | | |\ \ \ | |||||
| | | * \ \ \ | Merge remote-tracking branch 'upstream/master' | zottel | 2014-02-20 | 6 | -14/+33 |
| | | |\ \ \ \ | |||||
| | | * \ \ \ \ | Merge remote-tracking branch 'upstream/master' | zottel | 2014-02-20 | 20 | -1258/+1468 |
| | | |\ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | zottel | 2014-02-19 | 33 | -349/+1949 |
| | | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | zottel | 2014-02-17 | 16 | -1603/+1674 |
| | | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | zottel | 2014-02-15 | 75 | -930/+1258 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | * | \ \ \ \ \ \ \ \ | Merge pull request #331 from git-marijus/master | friendica | 2014-02-22 | 13 | -3111/+1732 |
| | |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | update bootstrap and revert some style.css cleaning | ||||
| | | * | | | | | | | | | remove some design fixes which got fixed in bootstrap 3.1.1 | marijus | 2014-02-21 | 2 | -4/+1 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | dont allow bootstrap to mess with blockquote font-size | marijus | 2014-02-21 | 1 | -0/+5 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | quickfix for edit profile dropdown | marijus | 2014-02-21 | 1 | -2/+2 |
| | | | | | | | | | | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |