Commit Graph

3022 Commits

Author SHA1 Message Date
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
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
Tobias Diekershoff
88f25191e0 DE: update to the strings 2014-01-25 07:28:30 +01:00
Thomas Willingham
d3a0d37b0d Add admin info to admin panel and site info.
Since we can have multiple admins, this is freeform bbcode.
2014-01-24 23:58:41 +00:00
friendica
3869b16298 prettyphoto (js|css) not found 2014-01-24 14:35:32 -08:00
Michael Meer
ffabb4cc86 reorg formula data for hubloc checks 2014-01-22 11:29:49 +01:00
friendica
05951a9877 add primary webbie to directory popup 2014-01-21 18:45:40 -08:00
friendica
60416d6f33 fix the admin interface to pending registrations 2014-01-21 14:56:42 -08:00
Michael Meer
86e2237555 no need to have a doule hublocid 2014-01-20 13:03:24 +01:00
Michael Meer
a13593590b added buttons to perform later hubloc actions 2014-01-20 12:12:40 +01:00
Thomas Willingham
a59b7c97f4 Missed these from git add...a year ago 2014-01-17 23:30:33 +00:00
Thomas Willingham
6920c203d1 Remove deprecated CSS - there is a dark schema now, and shadows and stuff are cofigurable. 2014-01-16 04:18:19 +00:00
Thomas Willingham
cd72fd3f01 Tweak "typical" perms macro 2014-01-16 02:53:05 +00:00
friendica
ec6b8e5cda Merge branch 'master' of https://github.com/pixelroot/red into pixelroot-master
Conflicts:
	view/ru/strings.php
2014-01-15 16:14:43 -08:00
cvogeley
d0e657f0f0 Merge pull request #271 from cvogeley/master
Confirm box: fall back to standard js confirm dialog if bootstrap isn't ...
2014-01-13 14:14:53 -08:00
Christian Vogeley
d9d894cbb3 Confirm box: fall back to standard js confirm dialog if bootstrap isn't available 2014-01-13 22:32:13 +01:00
pixelroot
4fdd9c39c5 modified: view/ru/messages.po
modified:   view/ru/strings.php
2014-01-13 18:29:37 +01:00
pixelroot
ecb125a47d modified: view/ru/messages.po 2014-01-13 16:10:58 +01:00
Tobias Diekershoff
87b99be785 DE: update to the strings 2014-01-13 07:28:16 +01:00
cvogeley
df9e628495 Merge pull request #268 from cvogeley/master
delete confirmation popup for blocks and layouts
2014-01-11 17:34:37 -08:00
Christian Vogeley
325c5e4e76 delete confirmation popup for blocks and layouts 2014-01-12 02:29:03 +01:00