| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-02-01 | 1 | -2/+5 |
| |\ | |||||
| | * | status indication | friendica | 2014-02-01 | 1 | -1/+1 |
| | | | |||||
| | * | provide the room name for the room you're in. | friendica | 2014-02-01 | 1 | -0/+1 |
| | | | |||||
| | * | chat formatting/style improvements | friendica | 2014-01-31 | 1 | -2/+4 |
| | | | |||||
| * | | comment out since it is not clear if this is not implemented yet or obsolete | marijus | 2014-01-31 | 1 | -2/+2 |
| |/ | |||||
| * | keep presence updated - typo was causing it to logout | friendica | 2014-01-30 | 1 | -1/+1 |
| | | |||||
| * | more chat work - this time the ajax bits to actually show chats on the page | friendica | 2014-01-30 | 1 | -5/+34 |
| | | |||||
| * | Merge pull request #293 from MicMee/master | friendica | 2014-01-30 | 1 | -0/+1 |
| |\ | | | | | more progress in admin to maintain hubloc with ping | ||||
| | * | Merge branch 'master' of https://github.com/friendica/red | Michael Meer | 2014-01-30 | 1 | -3/+4 |
| | |\ | | | | | | | | | | . | ||||
| | * | | attempt with fix URL for testing works | Michael Meer | 2014-01-30 | 1 | -0/+1 |
| | | | | |||||
| * | | | dont show an empty link to profile creation if multi_profile is not enabled | marijus | 2014-01-30 | 1 | -2/+1 |
| | |/ |/| | |||||
| * | | typo and clear chattext after submission | friendica | 2014-01-30 | 1 | -3/+4 |
| |/ | |||||
| * | a bit more ajax work on chat and chatsvc and some fiddling with layouts | friendica | 2014-01-30 | 1 | -10/+25 |
| | | |||||
| * | chatroom management front-end stuff | friendica | 2014-01-29 | 3 | -0/+44 |
| | | |||||
| * | back-end for changing online status and keeping presence refreshed | friendica | 2014-01-29 | 1 | -0/+3 |
| | | |||||
| * | start on the ajax bits | friendica | 2014-01-29 | 1 | -4/+29 |
| | | |||||
| * | more chat infrastructure | friendica | 2014-01-29 | 1 | -0/+18 |
| | | |||||
| * | more testing of chatroom interfaces, also corrected a function call that ↵ | friendica | 2014-01-29 | 1 | -1/+1 |
| | | | | | should have been a class instantiation in reddav | ||||
| * | add image floating to bbcode | marijus | 2014-01-30 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #288 from tuscanhobbit/master | Paolo T | 2014-01-29 | 2 | -1353/+1355 |
| |\ | | | | | Updated Italian translation | ||||
| | * | Updated Italian translation | Paolo Tacconi | 2014-01-29 | 2 | -3760/+3881 |
| | | | |||||
| * | | debug chatroom_list widget | friendica | 2014-01-29 | 1 | -3/+3 |
| | | | |||||
| * | | add template for chatroomlist widget | friendica | 2014-01-29 | 1 | -0/+11 |
| | | | |||||
| * | | online indication to the directory popup | friendica | 2014-01-28 | 1 | -1/+1 |
| | | | |||||
| * | | online indication on profile sidebar | friendica | 2014-01-28 | 3 | -1/+6 |
| | | | |||||
| * | | fix sql query and provide setting to hide online status | friendica | 2014-01-28 | 1 | -0/+3 |
| | | | |||||
| * | | photo tagging still broken - but at least don't create a new linked item ↵ | friendica | 2014-01-27 | 1 | -1/+1 |
| | | | | | | | | | every time a photo is edited. | ||||
| * | | Merge https://github.com/friendica/red into zpull | friendica | 2014-01-27 | 1 | -4/+5 |
| |\ \ | |||||
| | * \ | Merge branch 'master' of https://github.com/MicMee/red | Michael Meer | 2014-01-27 | 7 | -1307/+1314 |
| | |\ \ | | | | | | | | | | | | | to be in sync | ||||
| | * | | | reorg formula data for hubloc checks | Michael Meer | 2014-01-22 | 1 | -4/+5 |
| | | | | | |||||
| * | | | | cleanup include/menu in preparation for the next phase of bookmarking | friendica | 2014-01-27 | 1 | -0/+1 |
| | |/ / |/| | | |||||
| * | | | add davguest param to cut/paste link for directories in mod/filestorage | friendica | 2014-01-26 | 1 | -2/+1 |
| | | | | |||||
| * | | | Merge https://github.com/friendica/red into zpull | friendica | 2014-01-25 | 4 | -1302/+1312 |
| |\ \ \ | |||||
| | * | | | DE: update to the strings | Tobias Diekershoff | 2014-01-25 | 2 | -1302/+1309 |
| | | | | | |||||
| | * | | | Add admin info to admin panel and site info. | Thomas Willingham | 2014-01-24 | 2 | -0/+3 |
| | | | | | | | | | | | | | | | | | Since we can have multiple admins, this is freeform bbcode. | ||||
| * | | | | get rid of bootstrap's blockqote margin css which is just bloody wrong and ↵ | friendica | 2014-01-25 | 1 | -0/+1 |
| |/ / / | | | | | | | | | | can't easily be over-ridden | ||||
| * / / | prettyphoto (js|css) not found | friendica | 2014-01-24 | 1 | -3/+0 |
| |/ / | |||||
| * | | add primary webbie to directory popup | friendica | 2014-01-21 | 1 | -0/+4 |
| | | | |||||
| * | | fix the admin interface to pending registrations | friendica | 2014-01-21 | 1 | -3/+2 |
| | | | |||||
| * | | no need to have a doule hublocid | Michael Meer | 2014-01-20 | 1 | -2/+3 |
| | | | |||||
| * | | added buttons to perform later hubloc actions | Michael Meer | 2014-01-20 | 1 | -0/+2 |
| | | | |||||
| * | | Missed these from git add...a year ago | Thomas Willingham | 2014-01-17 | 1 | -0/+7 |
| | | | |||||
| * | | Remove deprecated CSS - there is a dark schema now, and shadows and stuff ↵ | Thomas Willingham | 2014-01-16 | 2 | -293/+0 |
| | | | | | | | | | are cofigurable. | ||||
| * | | Tweak "typical" perms macro | Thomas Willingham | 2014-01-16 | 1 | -3/+3 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/pixelroot/red into pixelroot-master | friendica | 2014-01-15 | 2 | -4537/+5082 |
| |\ \ | | | | | | | | | | | | | Conflicts: view/ru/strings.php | ||||
| | * | | modified: view/ru/messages.po | pixelroot | 2014-01-13 | 2 | -1922/+1599 |
| | | | | | | | | | | | | | modified: view/ru/strings.php | ||||
| | * | | modified: view/ru/messages.po | pixelroot | 2014-01-13 | 1 | -3661/+4094 |
| | | | | |||||
| * | | | Merge pull request #271 from cvogeley/master | cvogeley | 2014-01-13 | 1 | -3/+8 |
| |\ \ \ | | | | | | | | | Confirm box: fall back to standard js confirm dialog if bootstrap isn't ... | ||||
| | * | | | Confirm box: fall back to standard js confirm dialog if bootstrap isn't ↵ | Christian Vogeley | 2014-01-13 | 1 | -3/+8 |
| | | | | | | | | | | | | | | | | | available | ||||
| * | | | | DE: update to the strings | Tobias Diekershoff | 2014-01-13 | 2 | -2239/+2388 |
| | | | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |