aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* trying to get back to upstream statezottel2014-02-281-0/+96
* Merge remote-tracking branch 'upstream/master'zottel2014-02-281-0/+2
|\
| * more tasksfriendica2014-02-271-0/+2
* | Merge remote-tracking branch 'upstream/master'zottel2014-02-2812-159/+132
|\|
| * over-ride code tags within pre blocks as bootstrap which puts a border around...friendica2014-02-271-0/+4
| * put schemas in Comanche (this requires theme support (!))friendica2014-02-276-62/+81
| * minor fixes to suggested chatroomsfriendica2014-02-272-4/+2
| * chatroom suggestionsfriendica2014-02-273-0/+48
| * fix photos in private mailfriendica2014-02-272-2/+2
| * Capitalise $a->page['title'] in doco pages.Thomas Willingham2014-02-271-3/+3
* | change page title for bbcode help fileszottel2014-02-271-1/+1
|/
* 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-21 08:57:02 +0000