| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge https://github.com/friendica/red into zpull | friendica | 2014-02-04 | 2 | -1134/+1188 |
|\ |
|
| * | DE: update to the strings | Tobias Diekershoff | 2014-02-04 | 2 | -1134/+1188 |
* | | bookmark permissions | friendica | 2014-02-04 | 2 | -0/+5 |
|/ |
|
* | photo tagging somewhat working - but can't remove photo tags until we update ... | friendica | 2014-02-03 | 1 | -3/+5 |
* | accept new connection broke yesterday | friendica | 2014-02-03 | 1 | -3/+3 |
* | changed order of the privacy macros so that the dangerous settings come last ... | friendica | 2014-02-02 | 1 | -1/+1 |
* | don't load any configs from DB if installing - especially in style.pcss | friendica | 2014-02-02 | 1 | -1/+5 |
* | don't draw attention to advanced permissions and their corresponding complexi... | friendica | 2014-02-02 | 4 | -16/+52 |
* | added Thomas' additional navbar colours from APW to redbasic | Tazman DeVille | 2014-02-03 | 2 | -3/+43 |
* | Add switch to allow menus to be used as bookmark collections | friendica | 2014-02-02 | 1 | -1/+1 |
* | make chat honour the pause key (but we still need to ping the server to maint... | friendica | 2014-02-02 | 2 | -6/+6 |
* | Merge pull request #297 from tazmandevil/master | Thomas Willingham | 2014-02-02 | 1 | -1/+1 |
|\ |
|
| * | link hover colour remains user set link_colour (w/o change default, | Tazman DeVille | 2014-02-02 | 1 | -1/+1 |
* | | Move CSS out of chat template | Thomas Willingham | 2014-02-02 | 2 | -9/+35 |
|/ |
|
* | add links to change chat status and leave room | friendica | 2014-02-02 | 1 | -0/+2 |
* | fix default link color | friendica | 2014-02-01 | 2 | -2/+2 |
* | Merge https://github.com/friendica/red into zpull | friendica | 2014-02-01 | 5 | -5/+13 |
|\ |
|
| * | Merge pull request #296 from tazmandevil/master | friendica | 2014-02-01 | 4 | -3/+11 |
| |\ |
|
| | * | user configured link colour | Tazman DeVille | 2014-02-02 | 2 | -2/+2 |
| | * | link colours | Tazman DeVille | 2014-02-02 | 1 | -0/+1 |
| | * | link colour options | Tazman DeVille | 2014-02-02 | 4 | -3/+10 |
| * | | Merge pull request #294 from git-marijus/master | friendica | 2014-02-01 | 1 | -2/+2 |
| |\ \
| | |/
| |/| |
|
| | * | comment out since it is not clear if this is not implemented yet or obsolete | marijus | 2014-01-31 | 1 | -2/+2 |
* | | | provide donation options on siteinfo page | friendica | 2014-02-01 | 1 | -0/+1 |
|/ / |
|
* | | Press return to post chat posts- SHIFT-RETURN creates line break | Christian Vogeley | 2014-02-01 | 1 | -0/+17 |
* | | 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 |
|/ |
|
* | 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 |
|\ |
|
| * | 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 shou... | friendica | 2014-01-29 | 1 | -1/+1 |
* | 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 | 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 ever... | friendica | 2014-01-27 | 1 | -1/+1 |