aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Collapse)AuthorAgeFilesLines
* from olivier: use double quotes in js strings, updated FR translationfriendica2014-02-073-5103/+7620
| | | | from me: provide future ability to have an optional edit link/icon next to menus (such as bookmarks)
* notification bug - don't use $r, we already set it to something else that we ↵friendica2014-02-061-1/+2
| | | | need further on.
* add chatrooms templatefriendica2014-02-051-0/+10
|
* Merge pull request #298 from cvogeley/masterfriendica2014-02-061-2/+13
|\ | | | | Other not so elegant way of detecting touch screen devices
| * Other not so elegant way of detecting touch screen devicesChristian Vogeley2014-02-021-2/+13
| | | | | | | | But at least it seems to work
* | preserve system bit when editing menusfriendica2014-02-051-0/+4
| |
* | make links in comments bookmark-ablefriendica2014-02-041-2/+4
| |
* | add icon translation for new iconfriendica2014-02-041-0/+1
| |
* | bookmarks - mop up and go homefriendica2014-02-044-3/+12
| |
* | Merge https://github.com/friendica/red into zpullfriendica2014-02-042-1134/+1188
|\ \
| * | DE: update to the stringsTobias Diekershoff2014-02-042-1134/+1188
| | |
* | | bookmark permissionsfriendica2014-02-042-0/+5
|/ /
* | photo tagging somewhat working - but can't remove photo tags until we update ↵friendica2014-02-031-3/+5
| | | | | | | | tagrm
* | accept new connection broke yesterdayfriendica2014-02-031-3/+3
| |
* | changed order of the privacy macros so that the dangerous settings come last ↵friendica2014-02-021-1/+1
| | | | | | | | and the preferred settings come first
* | don't load any configs from DB if installing - especially in style.pcssfriendica2014-02-021-1/+5
| |
* | don't draw attention to advanced permissions and their corresponding ↵friendica2014-02-024-16/+52
| | | | | | | | complexity and clearly mark the simple permissions which people are encouraged to use.
* | added Thomas' additional navbar colours from APW to redbasicTazman DeVille2014-02-032-3/+43
| |
* | Add switch to allow menus to be used as bookmark collectionsfriendica2014-02-021-1/+1
| |
* | make chat honour the pause key (but we still need to ping the server to ↵friendica2014-02-022-6/+6
| | | | | | | | maintain the in_room status), also the recent change to pull css out of the template file used classes instead of ids so none of the styles were sticking
* | Merge pull request #297 from tazmandevil/masterThomas Willingham2014-02-021-1/+1
|\ \ | | | | | | link hover colour remains user set link_colour (w/o change default,Mike)
| * | link hover colour remains user set link_colour (w/o change default,Tazman DeVille2014-02-021-1/+1
| | | | | | | | | | | | Mike)
* | | 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
| |\ \ | | | | | | | | link color
| | * | 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 obsolete
| | * 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
| | | | | | | | on mobile devices keep default behavior
* | 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
|\ | | | | more progress in admin to maintain hubloc with ping
| * 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 ↵friendica2014-01-291-1/+1
| | | | should have been a class instantiation in reddav