Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge https://github.com/friendica/red into zpull | friendica | 2014-03-05 | 2 | -8/+12 |
|\ | |||||
| * | improve navbar collapsed state a little | marijus | 2014-03-05 | 2 | -8/+12 |
| | | |||||
* | | add new template | friendica | 2014-03-05 | 1 | -0/+18 |
|/ | |||||
* | move language selector to a module | friendica | 2014-03-05 | 3 | -9/+3 |
| | |||||
* | add Comanche help link to pdledit | friendica | 2014-03-04 | 1 | -0/+7 |
| | |||||
* | add pdl editor to settings/display | friendica | 2014-03-04 | 1 | -0/+4 |
| | |||||
* | add system PDL editor (lets you change/personalise the layout for any module ↵ | friendica | 2014-03-04 | 1 | -0/+14 |
| | | | | which has a system PDL file.) | ||||
* | Merge pull request #354 from tuscanhobbit/master | Paolo T | 2014-03-04 | 2 | -1001/+1114 |
|\ | | | | | IT: strings updated | ||||
| * | IT: strings updated | Paolo Tacconi | 2014-03-04 | 2 | -1001/+1114 |
| | | |||||
* | | minor template and doc fixes | friendica | 2014-03-04 | 2 | -0/+15 |
| | | |||||
* | | layout export to file | friendica | 2014-03-03 | 2 | -0/+20 |
| | | |||||
* | | remove test menu | friendica | 2014-03-03 | 1 | -1/+0 |
| | | |||||
* | | implement horizontal menu class in redbasic | friendica | 2014-03-03 | 2 | -0/+20 |
| | | |||||
* | | Merge https://github.com/friendica/red into zpull | friendica | 2014-03-03 | 3 | -5/+15 |
|\ \ | |||||
| * \ | Merge pull request #353 from git-marijus/master | friendica | 2014-03-04 | 3 | -5/+15 |
| |\ \ | | | | | | | | | little css fixes | ||||
| | * | | var update | marijus | 2014-03-03 | 1 | -1/+1 |
| | | | | |||||
| | * | | one got lost and a typo | marijus | 2014-03-03 | 1 | -1/+3 |
| | | | | |||||
| | * | | little css fixes | marijus | 2014-03-03 | 2 | -3/+11 |
| | | | | |||||
* | | | | revert the temporary fix for the missing hdr.tpl and add the ability to ↵ | friendica | 2014-03-03 | 1 | -4/+1 |
|/ / / | | | | | | | | | | provide context sensitive help/documentation by passing the current URL path to the help module as $_REQUEST['cmd']. So we could create a special help page for settings/display or whatever. The only issue is whether this should be presented first with a link to the main help page, or if we put a line at the top of the main help page that says "I need help for settings/display". Also edited the help target window name, as "friendika-help" is a bit dated. | ||||
* | | | 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 |
| |