Commit Graph

6941 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
Tazman DeVille
d2b55f5eea added Thomas' additional navbar colours from APW to redbasic 2014-02-03 02:06:07 +01:00
friendica
2768262f93 Add switch to allow menus to be used as bookmark collections 2014-02-02 16:49:09 -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
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
Tazman DeVille
16e818def7 link hover colour remains user set link_colour (w/o change default,
Mike)
2014-02-02 14:01:12 +01:00
Christian Vogeley
a2fa1a162d Other not so elegant way of detecting touch screen devices
But at least it seems to work
2014-02-02 13:59:20 +01:00
friendica
e83419b53e add links to change chat status and leave room 2014-02-02 03:43:52 -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
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
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
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
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
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
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
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
friendica
48bc9b546c typo and clear chattext after submission 2014-01-30 03:51:25 -08:00
Michael Meer
0a2b2a1390 attempt with fix URL for testing works 2014-01-30 10:39:09 +01:00
friendica
6c6a9b963a a bit more ajax work on chat and chatsvc and some fiddling with layouts 2014-01-30 01:00:46 -08:00
friendica
080928f214 chatroom management front-end stuff 2014-01-29 21:29:48 -08:00
friendica
7b60978262 back-end for changing online status and keeping presence refreshed 2014-01-29 20:40:37 -08:00
friendica
9fdee53c9a start on the ajax bits 2014-01-29 20:14:18 -08:00
friendica
b8fb6a4373 more chat infrastructure 2014-01-29 17:09:20 -08:00
friendica
677f5f641e more testing of chatroom interfaces, also corrected a function call that should have been a class instantiation in reddav 2014-01-29 16:02:02 -08:00
marijus
fe2b6f3dfb add image floating to bbcode 2014-01-30 00:01:19 +01:00
Paolo T
286dca84a1 Merge pull request #288 from tuscanhobbit/master
Updated Italian translation
2014-01-29 07:48:50 -08:00
Paolo Tacconi
25acd60f63 Updated Italian translation 2014-01-29 16:44:17 +01:00
friendica
6a9d43bcbe debug chatroom_list widget 2014-01-29 03:16:07 -08:00
friendica
f84ba95e87 add template for chatroomlist widget 2014-01-29 01:53:15 -08:00
friendica
d970c69f91 online indication to the directory popup 2014-01-28 19:49:56 -08:00
friendica
cc11535e34 online indication on profile sidebar 2014-01-28 17:07:25 -08:00
friendica
8efac0cfd6 fix sql query and provide setting to hide online status 2014-01-28 16:16:55 -08:00
friendica
3100b5d93e photo tagging still broken - but at least don't create a new linked item every time a photo is edited. 2014-01-27 18:06:09 -08:00
friendica
9551f6b404 Merge https://github.com/friendica/red into zpull 2014-01-27 14:47:58 -08:00
friendica
d6a9497e4a cleanup include/menu in preparation for the next phase of bookmarking 2014-01-27 14:46:39 -08:00
Michael Meer
a3bf272753 Merge branch 'master' of https://github.com/MicMee/red
to be in sync
2014-01-27 10:37:15 +01:00
friendica
d67fdd1299 add davguest param to cut/paste link for directories in mod/filestorage 2014-01-26 14:41:43 -08:00
friendica
f3fd9535a4 Merge https://github.com/friendica/red into zpull 2014-01-25 02:55:17 -08:00
friendica
4b66a399e4 get rid of bootstrap's blockqote margin css which is just bloody wrong and can't easily be over-ridden 2014-01-25 02:53:31 -08:00