Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #342 from zzottel/master | zzottel | 2014-02-27 | 5 | -0/+269 |
|\ | | | | | German help | ||||
| * | some new German files | zottel | 2014-02-27 | 3 | -59/+190 |
| | | |||||
| * | convert existing German help files to BBCode | zottel | 2014-02-27 | 3 | -0/+138 |
| | | |||||
* | | Merge pull request #343 from beardy-unixer/master | Thomas Willingham | 2014-02-27 | 4 | -15/+15 |
|\ \ | |/ |/| | Doc update (just formatting and typos) | ||||
| * | Can't type today | Thomas Willingham | 2014-02-27 | 1 | -1/+1 |
| | | |||||
| * | Who reverted that? | Thomas Willingham | 2014-02-27 | 1 | -1/+1 |
| | | |||||
| * | Doc update | Thomas Willingham | 2014-02-27 | 4 | -15/+15 |
|/ | |||||
* | Typo | cvogeley | 2014-02-27 | 1 | -1/+1 |
| | |||||
* | If we leave this any longer, it'll be 2015 before anyone remembers. | Thomas Willingham | 2014-02-27 | 1 | -1/+1 |
| | |||||
* | Merge https://github.com/friendica/red into zpull | friendica | 2014-02-26 | 2 | -72/+21 |
|\ | |||||
| * | Merge pull request #341 from git-marijus/master | friendica | 2014-02-27 | 2 | -72/+21 |
| |\ | | | | | | | properly fix profile edit dropdown menu | ||||
| | * | Revert "little correction" | marijus | 2014-02-26 | 1 | -1/+1 |
| | | | | | | | | | | | | This reverts commit 496a5a556f85c724d2fef3e465c675e34639dc10. | ||||
| | * | little correction | marijus | 2014-02-26 | 1 | -1/+1 |
| | | | |||||
| | * | properly fix profile edit dropdown menu | marijus | 2014-02-26 | 2 | -72/+21 |
| |/ | |||||
* / | vsprintf error | friendica | 2014-02-26 | 2 | -2/+3 |
|/ | |||||
* | comanche: provide an option to add a menu class for different theming ↵ | friendica | 2014-02-25 | 4 | -7/+17 |
| | | | | choices on some menus (e.g. horizontal, tabbed, etc.) | ||||
* | I'll have to fix this someday. | friendica | 2014-02-25 | 1 | -0/+6 |
| | |||||
* | Merge https://github.com/friendica/red into zpull | friendica | 2014-02-25 | 1 | -2/+2 |
|\ | |||||
| * | Merge pull request #340 from beardy-unixer/master | friendica | 2014-02-26 | 1 | -2/+2 |
| |\ | | | | | | | Fix the weirdness of messages appearing in the middle of the screen | ||||
| | * | Fix the weirdness of messages appearing in the middle of the screen | Thomas Willingham | 2014-02-26 | 1 | -2/+2 |
| |/ | | | | | | | | | and working their way downwards one comment at a time as the ping runs when joining an active chat room. | ||||
* / | put bookmarked chatrooms into poco | friendica | 2014-02-25 | 5 | -3/+52 |
|/ | |||||
* | more chatroom discovery | friendica | 2014-02-25 | 4 | -5/+35 |
| | |||||
* | move bootstrap to theme and out of core. | friendica | 2014-02-25 | 2 | -8/+10 |
| | |||||
* | 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 |
| | | | |