Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge https://github.com/friendica/red into zpull | friendica | 2014-03-03 | 1 | -0/+3 | |
|\| | | ||||||
| * | | Partially revert 895c9411d93 | Thomas Willingham | 2014-03-03 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | Not entirely sure why the lines in question were removed, but this is required as a quick fix for broken notifications. | |||||
* | | | missing file | friendica | 2014-03-03 | 1 | -0/+8 | |
|/ / | ||||||
* | | some anomolies found when viewing connections in various cases. | friendica | 2014-03-02 | 1 | -0/+33 | |
| | | ||||||
* | | disable the right_aside on choklet two-column layouts | friendica | 2014-03-02 | 2 | -0/+8 | |
| | | ||||||
* | | add choklet template with several defined flavours, two and three column ↵ | friendica | 2014-03-02 | 9 | -31/+226 | |
| | | | | | | | | fluid layouts with optional side margins and a region for a blog-style header photo | |||||
* | | first cut at choklet template | friendica | 2014-03-02 | 2 | -0/+72 | |
| | | ||||||
* | | make navbar themable again | marijus | 2014-03-02 | 5 | -97/+118 | |
| | | ||||||
* | | allow templates to have multiple styles - this would be a bit like having a ↵ | friendica | 2014-03-02 | 1 | -1/+2 | |
| | | | | | | | | schema for a template file. At first you'll think this is insane and overly complicated, you'll just have to wait and see what I'm up to. Then it will start to make sense. | |||||
* | | s/layout/template/g *.pdl | friendica | 2014-03-01 | 2 | -2/+2 | |
| | | ||||||
* | | Merge pull request #347 from solstag/master | friendica | 2014-03-02 | 2 | -288/+354 | |
|\ \ | | | | | | | Update pt-br translation. | |||||
| * | | Update pt-br translation. | Alexandre Hannud Abdo | 2014-03-01 | 2 | -288/+354 | |
| | | | ||||||
* | | | Revert "a little fix against bootstrap 3.1.1" | marijus | 2014-02-28 | 2 | -5/+0 | |
| | | | | | | | | | | | | This reverts commit e82c9eb176541b42c9ea00828d4d1a7f1231743b. | |||||
* | | | a little fix against bootstrap 3.1.1 | marijus | 2014-02-28 | 2 | -0/+5 | |
| | | | ||||||
* | | | add hover effect to usermenu caret | marijus | 2014-02-28 | 4 | -5/+15 | |
|/ / | ||||||
* | | over-ride code tags within pre blocks as bootstrap which puts a border ↵ | friendica | 2014-02-27 | 1 | -0/+4 | |
| | | | | | | | | around pre tags, which messes up markdown code blocks which have yet another border. | |||||
* | | put schemas in Comanche (this requires theme support (!)) | friendica | 2014-02-27 | 1 | -4/+10 | |
| | | ||||||
* | | minor fixes to suggested chatrooms | friendica | 2014-02-27 | 1 | -1/+1 | |
| | | ||||||
* | | chatroom suggestions | friendica | 2014-02-27 | 2 | -0/+12 | |
| | | ||||||
* | | Revert "little correction" | marijus | 2014-02-26 | 1 | -1/+1 | |
| | | | | | | | | This reverts commit 496a5a556f85c724d2fef3e465c675e34639dc10. | |||||
* | | little correction | marijus | 2014-02-26 | 1 | -1/+1 | |
| | | ||||||
* | | properly fix profile edit dropdown menu | marijus | 2014-02-26 | 2 | -72/+21 | |
| | | ||||||
* | | comanche: provide an option to add a menu class for different theming ↵ | friendica | 2014-02-25 | 1 | -1/+1 | |
| | | | | | | | | choices on some menus (e.g. horizontal, tabbed, etc.) | |||||
* | | move bootstrap to theme and out of core. | friendica | 2014-02-25 | 2 | -8/+10 | |
|/ | ||||||
* | provide ability to bookmark chatrooms using rbmark | friendica | 2014-02-24 | 1 | -1/+1 | |
| | ||||||
* | Merge pull request #338 from solstag/master | friendica | 2014-02-25 | 1 | -2/+2 | |
|\ | | | | | Fix typo that broke jquery.divgrow. Sorry I should have tested. | |||||
| * | Fix typo that broke jquery.divgrow. Sorry I should have tested. | Alexandre Hannud Abdo | 2014-02-25 | 1 | -2/+2 | |
| | | ||||||
* | | remote "add bookmark" - like rpost but saves a bookmark from a remote hub ↵ | friendica | 2014-02-24 | 1 | -0/+16 | |
|/ | | | | into one of your own bookmark folders (or a new one if desired). | |||||
* | Translation for jQuery.divgrow strings. Fix mismatch in jQuery.timeago strings | Alexandre Hannud Abdo | 2014-02-24 | 2 | -12/+14 | |
| | ||||||
* | Updates to pt-br translation, including some email templates. | Alexandre Hannud Abdo | 2014-02-24 | 10 | -973/+1023 | |
| | ||||||
* | little tweaks | Christian Vogeley | 2014-02-22 | 1 | -2/+2 | |
| | ||||||
* | Add option for narrow navbar instead of the bootstrap default | Christian Vogeley | 2014-02-22 | 4 | -0/+35 | |
| | | | | thick version | |||||
* | DE: update to the strings | Tobias Diekershoff | 2014-02-22 | 2 | -876/+923 | |
| | ||||||
* | 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 | |
| |\ \ |