Commit Graph

9324 Commits

Author SHA1 Message Date
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
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
Michael Meer c5ac5544cb clean up logger commands. Placed apostrophs at the end from some comments to keep the syntax highlighting in vi working 2014-01-30 11:04:20 +01:00
Michael Meer 0a2b2a1390 attempt with fix URL for testing works 2014-01-30 10:39:09 +01:00
Michael Meer e5d1e20ff5 Merge branch 'master' of https://github.com/friendica/red
to be in sync with master repro
2014-01-30 10:21:21 +01:00
marijus 3d43553b20 Merge branch 'master' of https://github.com/friendica/red 2014-01-30 10:15:36 +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
marijus 91e9e3be91 Merge branch 'master' of https://github.com/friendica/red 2014-01-30 09:57:31 +01: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 838ebbcb62 apply service class limits (at the account level) to chatroom creation as chat has the potential to adversely affect system performance. In the future we may also want to service_class restrict the number of participants in a room. 2014-01-29 18:29:03 -08:00
friendica c24aa824fe chat is a members only feature, there is no "guest" access. 2014-01-29 18:19:19 -08:00
friendica 0d326dfb45 mod/chatsvc - ajax backend for chat 2014-01-29 18:02:51 -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 5e952e3738 Merge branch 'master' of https://github.com/friendica/red 2014-01-30 00:33:46 +01:00
marijus eb02e6605c Merge branch 'master' of https://github.com/friendica/red 2014-01-30 00:30:55 +01:00
friendica 1915add7c1 Merge pull request #290 from git-marijus/master
add image floating to bbcode
2014-01-29 15:28:09 -08:00
friendica 777d4e1ddb Merge pull request #289 from beardy-unixer/master
Make Firefox behave if an attachment points to a file with a space in it...
2014-01-29 15:27:41 -08:00
friendica 9df2082b84 Merge pull request #291 from toclimb/smilies-fix
Trying to make emoticons behave, 2nd round
2014-01-29 15:26:51 -08:00
marijus 75022367e5 minor whitespace cleanup 2014-01-30 00:15:13 +01:00
marijus 4d23902d48 oups 2014-01-30 00:11:17 +01:00
marijus a58239b9a8 Merge branch 'upstream' 2014-01-30 00:08:40 +01:00
marijus fe2b6f3dfb add image floating to bbcode 2014-01-30 00:01:19 +01:00
toclimb 4c28939488 Don't look for emoticons inside the matching angle brackets of HTML tags (seriously) 2014-01-29 23:56:05 +01:00
Thomas Willingham 5a5973982f Really fix attachments in Firefox 2014-01-29 22:11:36 +00:00
Thomas Willingham c48c7a64c7 Doco - add KDE/Gnome/Davfs2 instructions 2014-01-29 21:42:12 +00:00
Thomas Willingham 34b7b544cd Doco - add KDE/Gnome/Davfs2 instructions 2014-01-29 21:38:48 +00:00
Thomas Willingham 5c54880ce8 Make Firefox behave if an attachment points to a file with a space in it. 2014-01-29 20:38:32 +00:00
Paolo T 286dca84a1 Merge pull request #288 from tuscanhobbit/master
Updated Italian translation
2014-01-29 07:48:50 -08:00
Paolo Tacconi 6d1c203eee Updated Italian translation 2014-01-29 16:46:10 +01:00