Commit graph

9452 commits

Author SHA1 Message Date
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
Paolo Tacconi
25acd60f63 Updated Italian translation 2014-01-29 16:44:17 +01:00
Michael Meer
ef97a454bb ping gives us now a reply. But the reply doesnt contains useful data, requires still some investigations 2014-01-29 15:45:35 +01:00
Michael Meer
ac8d481a32 Merge branch 'master' of https://github.com/friendica/red
to be in sync with main repro
2014-01-29 14:07:25 +01:00
friendica
a1e7c65d51 chatroom permissions enforcement 2014-01-29 03:40:14 -08:00
friendica
6a9d43bcbe debug chatroom_list widget 2014-01-29 03:16:07 -08:00
friendica
c95f65e092 prevent runaway presence indication 2014-01-29 02:36:01 -08:00
friendica
10b51a9471 issues uncovered whilst testing the chatroom API 2014-01-29 02:25:21 -08:00
friendica
f84ba95e87 add template for chatroomlist widget 2014-01-29 01:53:15 -08:00
friendica
9f54675702 chatroom list widget backend 2014-01-29 01:52:23 -08:00
friendica
9261a170eb basic chatroom management backend 2014-01-29 00:08:29 -08:00
friendica
0013e59086 chatpresence timing out too quickly 2014-01-28 20:19:16 -08:00
friendica
2822e6e70a missing file in checkin 2014-01-28 20:15:57 -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
3dfd38021f SECURITY: remove style and class bbcodes 2014-01-28 16:35:10 -08:00
friendica
d79a2e3b55 undo pull request #287 2014-01-28 16:32:47 -08:00
friendica
22cbfdce1d Merge pull request #287 from toclimb/testing
Don't look for text emoticons inside the matching angle brackets of a HTML tag
2014-01-28 16:21:36 -08:00
friendica
8efac0cfd6 fix sql query and provide setting to hide online status 2014-01-28 16:16:55 -08:00
friendica
6e22aa25cc basic presence indication 2014-01-28 15:52:54 -08:00
toclimb
3cab53a7ef Don't look for text emoticons inside the matching angle brackets of a HTML tag 2014-01-29 00:43:54 +01:00
friendica
8c8be2a05e add client field to chatpresence - which will give us a place to put IP addresses for webRTC. Might as well allow for that since we'll (soon) have presence. Then we wouldn't need SIP and folks can "just" p2p each other using any mechanism they wish if they have permission to do so. 2014-01-28 15:05:44 -08:00
Michael Meer
aa285b83c1 to make visible what I try, ping still won't work, but I'm confused about get_channel 2014-01-28 10:58:31 +01:00
Michael Meer
8ddee71c2b Merge branch 'master' of https://github.com/friendica/red
to be in sync with main repro
2014-01-28 09:49:09 +01:00