aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #342 from zzottel/masterzzottel2014-02-275-0/+269
|\
| * some new German fileszottel2014-02-273-59/+190
| * convert existing German help files to BBCodezottel2014-02-273-0/+138
* | Merge pull request #343 from beardy-unixer/masterThomas Willingham2014-02-274-15/+15
|\ \ | |/ |/|
| * Can't type todayThomas Willingham2014-02-271-1/+1
| * Who reverted that?Thomas Willingham2014-02-271-1/+1
| * Doc updateThomas Willingham2014-02-274-15/+15
|/
* Typocvogeley2014-02-271-1/+1
* If we leave this any longer, it'll be 2015 before anyone remembers.Thomas Willingham2014-02-271-1/+1
* Merge https://github.com/friendica/red into zpullfriendica2014-02-262-72/+21
|\
| * Merge pull request #341 from git-marijus/masterfriendica2014-02-272-72/+21
| |\
| | * Revert "little correction"marijus2014-02-261-1/+1
| | * little correctionmarijus2014-02-261-1/+1
| | * properly fix profile edit dropdown menumarijus2014-02-262-72/+21
| |/
* / vsprintf errorfriendica2014-02-262-2/+3
|/
* comanche: provide an option to add a menu class for different theming choices...friendica2014-02-254-7/+17
* I'll have to fix this someday.friendica2014-02-251-0/+6
* Merge https://github.com/friendica/red into zpullfriendica2014-02-251-2/+2
|\
| * Merge pull request #340 from beardy-unixer/masterfriendica2014-02-261-2/+2
| |\
| | * Fix the weirdness of messages appearing in the middle of the screenThomas Willingham2014-02-261-2/+2
| |/
* / put bookmarked chatrooms into pocofriendica2014-02-255-3/+52
|/
* more chatroom discoveryfriendica2014-02-254-5/+35
* move bootstrap to theme and out of core.friendica2014-02-252-8/+10
* Merge https://github.com/friendica/red into zpullfriendica2014-02-257-17/+35
|\
| * Also update database.sqlThomas Willingham2014-02-251-12/+12
| * Update channel permissions to full intsThomas Willingham2014-02-252-3/+21
| * Merge pull request #339 from tuscanhobbit/masterfriendica2014-02-264-2/+2
| |\
| | * assets dir had the old logotuscanhobbit2014-02-254-2/+2
| | * Merge pull request #1 from friendica/masterPaolo T2014-02-251248-31142/+75933
| | |\ | | |/ | |/|
* / | allow personalised page layouts for modules.friendica2014-02-254-6/+13
|/ /
* | provide ability to bookmark chatrooms using rbmarkfriendica2014-02-243-4/+33
* | Merge pull request #338 from solstag/masterfriendica2014-02-251-2/+2
|\ \
| * | Fix typo that broke jquery.divgrow. Sorry I should have tested.Alexandre Hannud Abdo2014-02-251-2/+2
* | | remote "add bookmark" - like rpost but saves a bookmark from a remote hub int...friendica2014-02-245-13/+156
|/ /
* | string 'null' showing up in timeago since last modifyfriendica2014-02-241-3/+2
* | take a pfriendica2014-02-241-1/+1
* | Merge https://github.com/friendica/red into zpullfriendica2014-02-2414-997/+1051
|\ \
| * \ Merge pull request #337 from solstag/masterfriendica2014-02-2513-996/+1050
| |\ \
| | * | Translation for jQuery.divgrow strings. Fix mismatch in jQuery.timeago stringsAlexandre Hannud Abdo2014-02-243-23/+27
| | * | Updates to pt-br translation, including some email templates.Alexandre Hannud Abdo2014-02-2410-973/+1023
| |/ /
| * | Doco - just a friendicared => [baseurl]Thomas Willingham2014-02-241-1/+1
* | | set theme for un-viewable profilefriendica2014-02-242-22/+33
|/ /
* | Merge pull request #335 from beardy-unixer/masterfriendica2014-02-2440-1/+2509
|\ \
| * | The string replacement missed that little blighter.Thomas Willingham2014-02-241-1/+1
| * | Import doco from docs@friendicared.netThomas Willingham2014-02-2439-0/+2507
| * | Make bbcode the default doco ready for the next commitThomas Willingham2014-02-241-1/+2
|/ /
* | In case a page has overloaded a module, see if we already have a layout defin...friendica2014-02-232-2/+5
* | Merge https://github.com/friendica/red into zpullfriendica2014-02-224-0/+35
|\ \
| * \ Merge pull request #334 from cvogeley/masterfriendica2014-02-234-0/+35
| |\ \
| | * | little tweaksChristian Vogeley2014-02-221-2/+2
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 05:41:04 +0000