aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/friendica/redmarijus2014-02-023-10/+36
|\
| * 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
| |/
* | Merge branch 'master' of https://github.com/friendica/redmarijus2014-02-0213-24/+87
|\|
| * 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
| | |\ \
| * | | | 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
| | |/ /
| * | | config: don't try to unserialise an arrayfriendica2014-02-011-4/+4
* | | | Merge branch 'master' of https://github.com/friendica/redmarijus2014-02-0197-2342/+3605
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | Doc - Make TOS include work.Thomas Willingham2014-02-011-1/+1
| |/
| * 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
* | comment out since it is not clear if this is not implemented yet or obsoletemarijus2014-01-311-2/+2
|/
* 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
| | * | attempt with fix URL for testing worksMichael Meer2014-01-305-7/+19
| | * | Merge branch 'master' of https://github.com/friendica/redMichael Meer2014-01-3021-1394/+1900
| | |\ \
| | * | | ping gives us now a reply. But the reply doesnt contains useful data, require...Michael Meer2014-01-291-11/+13
| | * | | Merge branch 'master' of https://github.com/friendica/redMichael Meer2014-01-2921-17/+293
| | |\ \ \
| | * | | | to make visible what I try, ping still won't work, but I'm confused about get...Michael Meer2014-01-282-1/+9
| | * | | | Merge branch 'master' of https://github.com/friendica/redMichael Meer2014-01-28209-24210/+141
| | |\ \ \ \
| | * | | | | add a temporary logger command at remote server sideMichael Meer2014-01-271-0/+1
| * | | | | | Merge pull request #292 from git-marijus/masterfriendica2014-01-301-2/+1
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | dont show an empty link to profile creation if multi_profile is not enabledmarijus2014-01-301-2/+1
| | * | | | | Merge branch 'master' of https://github.com/friendica/redmarijus2014-01-301-3/+4
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Merge branch 'master' of https://github.com/friendica/redmarijus2014-01-304-13/+29
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Merge branch 'master' of https://github.com/friendica/redmarijus2014-01-3011-11/+392
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of https://github.com/friendica/redmarijus2014-01-301-2/+2
| | |\ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 09:16:47 +0000