| Commit message (Expand) | Author | Age | Files | Lines |
... | |
| * | 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 |
| |\ |
|
| | * | Revert "little correction" | marijus | 2014-02-26 | 1 | -1/+1 |
| | * | 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 choices... | friendica | 2014-02-25 | 4 | -7/+17 |
* | 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 | Thomas Willingham | 2014-02-26 | 1 | -2/+2 |
| |/ |
|
* / | 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 |
| |\ |
|
| | * | 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 |
| | |\
| | |/
| |/| |
|
* / | | 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. | Alexandre Hannud Abdo | 2014-02-25 | 1 | -2/+2 |
* | | | remote "add bookmark" - like rpost but saves a bookmark from a remote hub int... | friendica | 2014-02-24 | 5 | -13/+156 |
|/ / |
|
* | | 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 |
| |\ \ |
|
| | * | | 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 |
|\ \ |
|
| * | | 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 defin... | friendica | 2014-02-23 | 2 | -2/+5 |
* | | 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 |
| |\ \ |
|
| | * | | 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 |
* | | | | minor stuff, some doco, auth cleanup, and make "unknown" more translateable b... | friendica | 2014-02-22 | 3 | -5/+2 |
|/ / / |
|
* | | | 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 | Tobias Diekershoff | 2014-02-22 | 2 | -876/+923 |
| |/ / |
|
* / / | This should resolve the dav authentication loop (correctly) | friendica | 2014-02-22 | 4 | -9/+23 |
|/ / |
|