aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | more wordsmithingfriendica2014-02-021-1/+1
* | | | | | | | | changed order of the privacy macros so that the dangerous settings come last ...friendica2014-02-021-1/+1
* | | | | | | | | don't load any configs from DB if installing - especially in style.pcssfriendica2014-02-023-6/+11
* | | | | | | | | wordsmithingfriendica2014-02-021-4/+4
* | | | | | | | | don't draw attention to advanced permissions and their corresponding complexi...friendica2014-02-026-24/+62
* | | | | | | | | Merge pull request #300 from tazmandevil/masterfriendica2014-02-022-3/+43
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | added Thomas' additional navbar colours from APW to redbasicTazman DeVille2014-02-032-3/+43
|/ / / / / / / / /
* | | | | | | | | minor text change "can" -> "may"friendica2014-02-021-2/+2
* | | | | | | | | Add switch to allow menus to be used as bookmark collectionsfriendica2014-02-023-2/+6
* | | | | | | | | remove the text "requires compatible chat plugin"friendica2014-02-021-1/+1
* | | | | | | | | make chat honour the pause key (but we still need to ping the server to maint...friendica2014-02-023-51/+55
| |_|_|_|_|/ / / |/| | | | | | |
* | | | | | | | better check for setup modulefriendica2014-02-021-1/+1
* | | | | | | | Merge https://github.com/friendica/red into zpullfriendica2014-02-024-20/+44
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge pull request #299 from toclimb/smilies-fixfriendica2014-02-021-10/+8
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | More efficient smilie replacingtoclimb2014-02-021-10/+8
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge pull request #297 from tazmandevil/masterThomas Willingham2014-02-021-1/+1
| |\ \ \ \ \ \
| | * | | | | | link hover colour remains user set link_colour (w/o change default,Tazman DeVille2014-02-021-1/+1
| | |/ / / / /
| * / / / / / Move CSS out of chat templateThomas Willingham2014-02-022-9/+35
| |/ / / / /
* / / / / / some windows fixesfriendica2014-02-023-10/+21
|/ / / / /
* | | | | add links to change chat status and leave roomfriendica2014-02-024-16/+36
* | | | | add epub mimetype (application/epub+zip)friendica2014-02-022-1/+2
* | | | | fix default link colorfriendica2014-02-012-2/+2
* | | | | Merge https://github.com/friendica/red into zpullfriendica2014-02-015-5/+13
|\ \ \ \ \
| * \ \ \ \ Merge pull request #296 from tazmandevil/masterfriendica2014-02-014-3/+11
| |\ \ \ \ \
| | * | | | | user configured link colourTazman DeVille2014-02-022-2/+2
| | * | | | | link coloursTazman DeVille2014-02-021-0/+1
| | * | | | | link colour optionsTazman DeVille2014-02-024-3/+10
| * | | | | | Merge pull request #294 from git-marijus/masterfriendica2014-02-011-2/+2
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | comment out since it is not clear if this is not implemented yet or obsoletemarijus2014-01-311-2/+2
* | | | | | | provide donation options on siteinfo pagefriendica2014-02-012-1/+18
|/ / / / / /
* | | | | | Merge https://github.com/friendica/red into zpullfriendica2014-02-012-1/+18
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #295 from cvogeley/mastercvogeley2014-02-011-0/+17
| |\ \ \ \ \ | | |_|/ / / | |/| | / / | | | |/ / | | |/| |
| | * | | Press return to post chat posts- SHIFT-RETURN creates line breakChristian Vogeley2014-02-011-0/+17
| |/ / /
| * | | Doc - Make TOS include work.Thomas Willingham2014-02-011-1/+1
* | | | config: don't try to unserialise an arrayfriendica2014-02-011-4/+4
|/ / /
* | | status indicationfriendica2014-02-012-2/+12
* | | provide the room name for the room you're in.friendica2014-02-013-2/+10
* | | chat formatting/style improvementsfriendica2014-01-311-2/+4
* | | provide some interesting new options to channel sourcesfriendica2014-01-314-956/+1012
* | | doc updatesfriendica2014-01-3189-1381/+2568
|/ /
* | keep presence updated - typo was causing it to logoutfriendica2014-01-302-2/+2
* | missing string delimiters (quotes)friendica2014-01-301-3/+3
* | chat expiration (default 2 hours) - but can be set on a per-chatroom basisfriendica2014-01-304-5/+22
* | mod/ping should only update basic_presence - and clearing stale entries. othe...friendica2014-01-301-9/+6
* | more chat work - this time the ajax bits to actually show chats on the pagefriendica2014-01-301-5/+34
* | Merge https://github.com/friendica/red into zpullfriendica2014-01-306-20/+39
|\ \
| * \ Merge pull request #293 from MicMee/masterfriendica2014-01-305-18/+38
| |\ \
| | * | started analysis of ping response and clean up more loggerMichael Meer2014-01-302-7/+16
| | * | Merge branch 'master' of https://github.com/friendica/redMichael Meer2014-01-301-3/+4
| | |\ \
| | * | | clean up logger commands. Placed apostrophs at the end from some comments to ...Michael Meer2014-01-304-15/+3