aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #297 from tazmandevil/masterThomas Willingham2014-02-021-1/+1
|\
| * link hover colour remains user set link_colour (w/o change default,Tazman DeVille2014-02-021-1/+1
* | Move CSS out of chat templateThomas Willingham2014-02-022-9/+35
|/
* add links to change chat status and leave roomfriendica2014-02-021-0/+2
* fix default link colorfriendica2014-02-012-2/+2
* Merge https://github.com/friendica/red into zpullfriendica2014-02-015-5/+13
|\
| * Merge pull request #296 from tazmandevil/masterfriendica2014-02-014-3/+11
| |\
| | * user configured link colourTazman DeVille2014-02-022-2/+2
| | * link coloursTazman DeVille2014-02-021-0/+1
| | * link colour optionsTazman DeVille2014-02-024-3/+10
| * | Merge pull request #294 from git-marijus/masterfriendica2014-02-011-2/+2
| |\ \ | | |/ | |/|
| | * comment out since it is not clear if this is not implemented yet or obsoletemarijus2014-01-311-2/+2
* | | provide donation options on siteinfo pagefriendica2014-02-011-0/+1
|/ /
* | Press return to post chat posts- SHIFT-RETURN creates line breakChristian Vogeley2014-02-011-0/+17
* | status indicationfriendica2014-02-011-1/+1
* | provide the room name for the room you're in.friendica2014-02-011-0/+1
* | chat formatting/style improvementsfriendica2014-01-311-2/+4
|/
* keep presence updated - typo was causing it to logoutfriendica2014-01-301-1/+1
* more chat work - this time the ajax bits to actually show chats on the pagefriendica2014-01-301-5/+34
* Merge pull request #293 from MicMee/masterfriendica2014-01-301-0/+1
|\
| * Merge branch 'master' of https://github.com/friendica/redMichael Meer2014-01-301-3/+4
| |\
| * | attempt with fix URL for testing worksMichael Meer2014-01-301-0/+1
* | | dont show an empty link to profile creation if multi_profile is not enabledmarijus2014-01-301-2/+1
| |/ |/|
* | typo and clear chattext after submissionfriendica2014-01-301-3/+4
|/
* a bit more ajax work on chat and chatsvc and some fiddling with layoutsfriendica2014-01-301-10/+25
* chatroom management front-end stufffriendica2014-01-293-0/+44
* back-end for changing online status and keeping presence refreshedfriendica2014-01-291-0/+3
* start on the ajax bitsfriendica2014-01-291-4/+29
* more chat infrastructurefriendica2014-01-291-0/+18
* more testing of chatroom interfaces, also corrected a function call that shou...friendica2014-01-291-1/+1
* add image floating to bbcodemarijus2014-01-301-1/+1
* Merge pull request #288 from tuscanhobbit/masterPaolo T2014-01-292-1353/+1355
|\
| * Updated Italian translationPaolo Tacconi2014-01-292-3760/+3881
* | debug chatroom_list widgetfriendica2014-01-291-3/+3
* | add template for chatroomlist widgetfriendica2014-01-291-0/+11
* | online indication to the directory popupfriendica2014-01-281-1/+1
* | online indication on profile sidebarfriendica2014-01-283-1/+6
* | fix sql query and provide setting to hide online statusfriendica2014-01-281-0/+3
* | photo tagging still broken - but at least don't create a new linked item ever...friendica2014-01-271-1/+1
* | Merge https://github.com/friendica/red into zpullfriendica2014-01-271-4/+5
|\ \
| * \ Merge branch 'master' of https://github.com/MicMee/redMichael Meer2014-01-277-1307/+1314
| |\ \
| * | | reorg formula data for hubloc checksMichael Meer2014-01-221-4/+5
* | | | cleanup include/menu in preparation for the next phase of bookmarkingfriendica2014-01-271-0/+1
| |/ / |/| |
* | | add davguest param to cut/paste link for directories in mod/filestoragefriendica2014-01-261-2/+1
* | | Merge https://github.com/friendica/red into zpullfriendica2014-01-254-1302/+1312
|\ \ \
| * | | DE: update to the stringsTobias Diekershoff2014-01-252-1302/+1309
| * | | Add admin info to admin panel and site info.Thomas Willingham2014-01-242-0/+3
* | | | get rid of bootstrap's blockqote margin css which is just bloody wrong and ca...friendica2014-01-251-0/+1
|/ / /
* / / prettyphoto (js|css) not foundfriendica2014-01-241-3/+0
|/ /
* | add primary webbie to directory popupfriendica2014-01-211-0/+4