Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | moving background-color to style.css | marijus | 2014-02-09 | 2 | -2/+2 |
| | |||||
* | theming chat a little | marijus | 2014-02-09 | 3 | -5/+39 |
| | |||||
* | . | Christian Vogeley | 2014-02-09 | 1 | -0/+1 |
| | |||||
* | create a new "subdued" CSS class for things that shouldn't be in your face ↵ | friendica | 2014-02-08 | 1 | -0/+9 |
| | | | | unless you want them and intentionally hover over them. Typically this would be accomplished via an opacity or colour change, but themes are free to use other methods. Also changed the channel_tabs "chatroom" link to use the subdued class if no rooms have been created rather than a count of chatrooms. Themse should probably create a .subdued and .subdued:hover definition because we'll probably take most of the stuff which is now hardwired to use opacity by id and change it to use the class definition instead. | ||||
* | Merge https://github.com/friendica/red into zpull | friendica | 2014-02-07 | 2 | -4017/+4207 |
|\ | |||||
| * | Merge pull request #303 from tuscanhobbit/master | Paolo T | 2014-02-07 | 2 | -4017/+4207 |
| |\ | | | | | | | IT: update to the strings | ||||
| | * | IT: update to the strings | tuscanhobbit | 2014-02-07 | 2 | -3857/+4049 |
| | | | |||||
* | | | from olivier: use double quotes in js strings, updated FR translation | friendica | 2014-02-07 | 3 | -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 ↵ | friendica | 2014-02-06 | 1 | -1/+2 |
| | | | | | | | | need further on. | ||||
* | | add chatrooms template | friendica | 2014-02-05 | 1 | -0/+10 |
| | | |||||
* | | Merge pull request #298 from cvogeley/master | friendica | 2014-02-06 | 1 | -2/+13 |
|\ \ | | | | | | | Other not so elegant way of detecting touch screen devices | ||||
| * | | Other not so elegant way of detecting touch screen devices | Christian Vogeley | 2014-02-02 | 1 | -2/+13 |
| | | | | | | | | | | | | But at least it seems to work | ||||
* | | | preserve system bit when editing menus | friendica | 2014-02-05 | 1 | -0/+4 |
| | | | |||||
* | | | make links in comments bookmark-able | friendica | 2014-02-04 | 1 | -2/+4 |
| | | | |||||
* | | | add icon translation for new icon | friendica | 2014-02-04 | 1 | -0/+1 |
| | | | |||||
* | | | bookmarks - mop up and go home | friendica | 2014-02-04 | 4 | -3/+12 |
| | | | |||||
* | | | 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 |
| | | | | | | | | | | | | tagrm | ||||
* | | | 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 |
| | | | | | | | | | | | | and the preferred settings come first | ||||
* | | | 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 ↵ | friendica | 2014-02-02 | 4 | -16/+52 |
| | | | | | | | | | | | | complexity and clearly mark the simple permissions which people are encouraged to use. | ||||
* | | | 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 ↵ | friendica | 2014-02-02 | 2 | -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/master | Thomas Willingham | 2014-02-02 | 1 | -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 DeVille | 2014-02-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Mike) | ||||
* | | | | 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 |
| |\ \ \ | | | | | | | | | | | link color | ||||
| | * | | | 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 | ||||
| | * | | 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 |
| | | | | | | | | | | | | on mobile devices keep default behavior | ||||
* | | | 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 |
|\ \ | | | | | | | 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 |
| |/ / |/| | |