Commit Graph

9354 Commits

Author SHA1 Message Date
friendica
ee1580427e don't draw attention to advanced permissions and their corresponding complexity and clearly mark the simple permissions which people are encouraged to use. 2014-02-02 17:54:36 -08:00
friendica
732a4b898a Merge pull request #300 from tazmandevil/master
added Thomas' additional navbar colours from APW to redbasic
2014-02-02 17:09:25 -08:00
Tazman DeVille
d2b55f5eea added Thomas' additional navbar colours from APW to redbasic 2014-02-03 02:06:07 +01:00
friendica
3eed73d519 minor text change "can" -> "may" 2014-02-02 16:51:11 -08:00
friendica
2768262f93 Add switch to allow menus to be used as bookmark collections 2014-02-02 16:49:09 -08:00
friendica
abb68e846d remove the text "requires compatible chat plugin" 2014-02-02 16:02:04 -08:00
friendica
67899677db make chat honour the pause key (but we still need to ping the server to maintain the in_room status), also the recent change to pull css out of the template file used classes instead of ids so none of the styles were sticking 2014-02-02 15:50:07 -08:00
friendica
02e4527de6 better check for setup module 2014-02-02 14:09:09 -08:00
friendica
cf85fec919 Merge https://github.com/friendica/red into zpull 2014-02-02 14:07:33 -08:00
friendica
b39c0d54c0 some windows fixes 2014-02-02 14:06:36 -08:00
friendica
b7c4f033b5 Merge pull request #299 from toclimb/smilies-fix
More efficient smilie replacing (see pull request #291)
2014-02-02 11:49:52 -08:00
Thomas Willingham
96e423dcfc Merge pull request #297 from tazmandevil/master
link hover colour remains user set link_colour (w/o change default,Mike)
2014-02-02 08:33:26 -08:00
Thomas Willingham
5846dc105a Move CSS out of chat template 2014-02-02 16:28:58 +00:00
toclimb
ba6178bef3 More efficient smilie replacing 2014-02-02 14:52:00 +01:00
Tazman DeVille
16e818def7 link hover colour remains user set link_colour (w/o change default,
Mike)
2014-02-02 14:01:12 +01:00
friendica
e83419b53e add links to change chat status and leave room 2014-02-02 03:43:52 -08:00
friendica
6b15e57cdb add epub mimetype (application/epub+zip) 2014-02-02 02:43:36 -08:00
friendica
17436f060f fix default link color 2014-02-01 21:12:26 -08:00
friendica
34850289ff Merge https://github.com/friendica/red into zpull 2014-02-01 21:03:46 -08:00
friendica
61cc4de225 provide donation options on siteinfo page 2014-02-01 21:03:21 -08:00
friendica
a9ceeff988 Merge pull request #296 from tazmandevil/master
link color
2014-02-01 20:47:19 -08:00
friendica
8e8b49d18c Merge pull request #294 from git-marijus/master
comment out since it is not clear if this is not implemented yet or obsolete
2014-02-01 20:46:52 -08:00
Tazman DeVille
de412abe88 user configured link colour 2014-02-02 05:19:29 +01:00
friendica
255190205b Merge https://github.com/friendica/red into zpull 2014-02-01 20:08:36 -08:00
friendica
2c75210fdb config: don't try to unserialise an array 2014-02-01 20:07:47 -08:00
Tazman DeVille
bd83783391 link colours 2014-02-02 04:32:43 +01:00
Tazman DeVille
a2761213e0 link colour options 2014-02-02 04:26:56 +01:00
cvogeley
3b1346c143 Merge pull request #295 from cvogeley/master
Press return to post chat posts- SHIFT-RETURN creates line break
2014-02-01 14:43:33 -08:00
Christian Vogeley
30aeb42bed Press return to post chat posts- SHIFT-RETURN creates line break
on mobile devices keep default behavior
2014-02-01 23:28:27 +01:00
Thomas Willingham
94d874c0b2 Doc - Make TOS include work. 2014-02-01 11:55:36 +00:00
friendica
94e59d4770 status indication 2014-02-01 01:00:26 -08:00
friendica
d14afc0ee4 provide the room name for the room you're in. 2014-02-01 00:54:20 -08:00
friendica
33f3cd3d4a chat formatting/style improvements 2014-01-31 20:48:26 -08:00
friendica
bd691300a7 provide some interesting new options to channel sources 2014-01-31 20:02:59 -08:00
friendica
902c9b1585 doc updates 2014-01-31 20:02:45 -08:00
marijus
af75b77253 comment out since it is not clear if this is not implemented yet or obsolete 2014-01-31 18:31:14 +01:00
friendica
aaa3c62efa keep presence updated - typo was causing it to logout 2014-01-30 21:09:02 -08:00
friendica
deaf93db71 missing string delimiters (quotes) 2014-01-30 21:01:09 -08:00
friendica
a1d40431f2 chat expiration (default 2 hours) - but can be set on a per-chatroom basis 2014-01-30 20:10:47 -08:00
friendica
49f07bd90f mod/ping should only update basic_presence - and clearing stale entries. otherwise let rooms handle presence for themselves. 2014-01-30 19:01:03 -08:00
friendica
f69bf5e598 more chat work - this time the ajax bits to actually show chats on the page 2014-01-30 18:57:46 -08:00
friendica
2f876334d5 Merge https://github.com/friendica/red into zpull 2014-01-30 14:37:50 -08:00
friendica
0fae8acdef fix basic auth with account (not channel) login 2014-01-30 14:36:56 -08:00
friendica
70de97fca1 Merge pull request #293 from MicMee/master
more progress in admin to maintain hubloc with ping
2014-01-30 14:21:32 -08:00
friendica
f2f1857876 Merge pull request #292 from git-marijus/master
dont show an empty link to profile creation if multi_profile is not enabled
2014-01-30 14:21:03 -08:00
Michael Meer
c0f02d774a started analysis of ping response and clean up more logger 2014-01-30 20:41:40 +01:00
Michael Meer
da1e7cc211 Merge branch 'master' of https://github.com/friendica/red
.
2014-01-30 19:54:12 +01:00
marijus
3bdbdbab53 dont show an empty link to profile creation if multi_profile is not enabled 2014-01-30 19:44:50 +01:00
marijus
13a5dfacb6 Merge branch 'master' of https://github.com/friendica/red 2014-01-30 13:25:07 +01:00
friendica
48bc9b546c typo and clear chattext after submission 2014-01-30 03:51:25 -08:00