Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | remove some design fixes which got fixed in bootstrap 3.1.1 | marijus | 2014-02-21 | 2 | -4/+1 |
| | |||||
* | dont allow bootstrap to mess with blockquote font-size | marijus | 2014-02-21 | 1 | -0/+5 |
| | |||||
* | quickfix for edit profile dropdown | marijus | 2014-02-21 | 1 | -2/+2 |
| | |||||
* | oups... to much cleaning... | marijus | 2014-02-21 | 1 | -0/+58 |
| | |||||
* | cleanup style.css | marijus | 2014-02-21 | 2 | -270/+3 |
| | |||||
* | move jgrowl (alert popup) out of the now taller navbar | friendica | 2014-02-20 | 1 | -1/+1 |
| | |||||
* | Merge pull request #327 from git-marijus/master | friendica | 2014-02-21 | 1 | -1/+1 |
|\ | | | | | fixes issue #326 initial scale to big | ||||
| * | fixes issue #326 initial scale to big | marijus | 2014-02-20 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #328 from tuscanhobbit/master | Paolo T | 2014-02-20 | 2 | -3543/+7994 |
|\ \ | | | | | | | PT-BR: update to the strings | ||||
| * | | PT-BR: update to the strings | tuscanhobbit | 2014-02-20 | 2 | -3543/+7994 |
| | | | |||||
* | | | updated fr translation | friendica | 2014-02-20 | 2 | -976/+1024 |
| |/ |/| | |||||
* | | Merge pull request #324 from tonybaldwin/master | friendica | 2014-02-20 | 4 | -4/+4 |
|\ \ | | | | | | | Do not view remote profiles in frames. (changed description for display->settings), in ALL relevant files | ||||
| * | | s/View remote profiles as webpages/Do not view remote profiles in | tony baldwin | 2014-02-19 | 4 | -4/+4 |
| | | | | | | | | | | | | frames/g | ||||
* | | | use a "fullscreen" icon for chanview full screen mode; add channel_menu ↵ | friendica | 2014-02-19 | 4 | -1/+35 |
|/ / | | | | | | | selection and setting to the settings page. | ||||
* | | Merge pull request #321 from git-marijus/master | friendica | 2014-02-20 | 8 | -250/+308 |
|\ \ | | | | | | | bootstrapify the nav | ||||
| * | | another correction | marijus | 2014-02-19 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-02-19 | 1 | -12/+12 |
| |\ \ | |||||
| * | | | one pixel to much... | marijus | 2014-02-19 | 1 | -1/+1 |
| | | | | |||||
| * | | | bootstrapify the nav | marijus | 2014-02-19 | 8 | -250/+308 |
| | | | | |||||
* | | | | Merge pull request #323 from tuscanhobbit/master | Paolo T | 2014-02-19 | 2 | -929/+977 |
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | IT: update to the strings | ||||
| * | | IT: update to the strings | tuscanhobbit | 2014-02-19 | 2 | -929/+977 |
| | | | |||||
* | | | introduce a new privacy level "PERMS_AUTHED" to indicate somebody that is ↵ | friendica | 2014-02-18 | 1 | -12/+12 |
| |/ |/| | | | | | able to successfully authenticate (but is not necessarily in this network). | ||||
* | | Merge https://github.com/friendica/red into zpull | friendica | 2014-02-18 | 1 | -2/+5 |
|\ \ | |||||
| * \ | Merge pull request #320 from dawnbreak/master | friendica | 2014-02-19 | 1 | -2/+5 |
| |\ \ | | | | | | | | | Let user cancel the red_encrypt dialogue | ||||
| | * | | Let user cancel the red_encrypt dialogue | Klaus | 2014-02-18 | 1 | -2/+5 |
| | | | | | | | | | | | | If the user press cancel on the prompt also cancel the encryption. Maybe should also add this to passhint promt. | ||||
* | | | | change edit/delete to icons on filestorage page | friendica | 2014-02-18 | 1 | -3/+4 |
|/ / / | |||||
* | | | edit bookmarks | friendica | 2014-02-18 | 3 | -2/+13 |
| | | | |||||
* | | | several things were not working correctly w/r/t community tagging. The ↵ | friendica | 2014-02-16 | 1 | -0/+4 |
| | | | | | | | | | | | | preference vanished from settings at some point, and we also weren't updating the original post timestamp so that the changed taxonomy would propagate correctly as an edit. | ||||
* | | | DE: update to the strings | Tobias Diekershoff | 2014-02-16 | 2 | -1556/+1604 |
|/ / | |||||
* | | This makes advanced privacy settings adjustable in expert mode only. Also ↵ | marijus | 2014-02-13 | 3 | -20/+36 |
| | | | | | | | | they are hidden behind a button. This is a design hotfix should probably come up with something better someday... | ||||
* | | don't fix the height of the archive widget - fix the maximum height | friendica | 2014-02-13 | 1 | -1/+1 |
| | | |||||
* | | very simple scheme | friendica | 2014-02-13 | 1 | -0/+5 |
| | | |||||
* | | make activities optional for profile things, clean up the forms | friendica | 2014-02-12 | 3 | -10/+13 |
| | | |||||
* | | ui improvements on the manage page | friendica | 2014-02-12 | 3 | -9/+17 |
| | | |||||
* | | DE: update to the strings | Tobias Diekershoff | 2014-02-12 | 2 | -3988/+4119 |
| | | |||||
* | | shamelessly steal, and cut/paste from the settings page to get mod_photos ↵ | friendica | 2014-02-11 | 2 | -12/+21 |
| | | | | | | | | edit permissions working - and it looks like we still have some other fancybox instances (yet another lightbox) which haven't yet been converted to colorbox and will need to be fixed. Way too many lightboxes. | ||||
* | | add chanview mode to settings | friendica | 2014-02-10 | 1 | -0/+1 |
| | | |||||
* | | whitespace | marijus | 2014-02-10 | 1 | -1/+1 |
| | | |||||
* | | 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 |