aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Collapse)AuthorAgeFilesLines
* Merge https://github.com/friendica/red into zpullfriendica2014-03-031-0/+3
|\
| * Partially revert 895c9411d93Thomas Willingham2014-03-031-0/+3
| | | | | | | | | | Not entirely sure why the lines in question were removed, but this is required as a quick fix for broken notifications.
* | missing filefriendica2014-03-031-0/+8
|/
* some anomolies found when viewing connections in various cases.friendica2014-03-021-0/+33
|
* disable the right_aside on choklet two-column layoutsfriendica2014-03-022-0/+8
|
* add choklet template with several defined flavours, two and three column ↵friendica2014-03-029-31/+226
| | | | fluid layouts with optional side margins and a region for a blog-style header photo
* first cut at choklet templatefriendica2014-03-022-0/+72
|
* make navbar themable againmarijus2014-03-025-97/+118
|
* allow templates to have multiple styles - this would be a bit like having a ↵friendica2014-03-021-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 *.pdlfriendica2014-03-012-2/+2
|
* Merge pull request #347 from solstag/masterfriendica2014-03-022-288/+354
|\ | | | | Update pt-br translation.
| * Update pt-br translation.Alexandre Hannud Abdo2014-03-012-288/+354
| |
* | Revert "a little fix against bootstrap 3.1.1"marijus2014-02-282-5/+0
| | | | | | | | This reverts commit e82c9eb176541b42c9ea00828d4d1a7f1231743b.
* | a little fix against bootstrap 3.1.1marijus2014-02-282-0/+5
| |
* | add hover effect to usermenu caretmarijus2014-02-284-5/+15
|/
* over-ride code tags within pre blocks as bootstrap which puts a border ↵friendica2014-02-271-0/+4
| | | | around pre tags, which messes up markdown code blocks which have yet another border.
* put schemas in Comanche (this requires theme support (!))friendica2014-02-271-4/+10
|
* minor fixes to suggested chatroomsfriendica2014-02-271-1/+1
|
* chatroom suggestionsfriendica2014-02-272-0/+12
|
* Revert "little correction"marijus2014-02-261-1/+1
| | | | This reverts commit 496a5a556f85c724d2fef3e465c675e34639dc10.
* little correctionmarijus2014-02-261-1/+1
|
* properly fix profile edit dropdown menumarijus2014-02-262-72/+21
|
* comanche: provide an option to add a menu class for different theming ↵friendica2014-02-251-1/+1
| | | | choices on some menus (e.g. horizontal, tabbed, etc.)
* move bootstrap to theme and out of core.friendica2014-02-252-8/+10
|
* provide ability to bookmark chatrooms using rbmarkfriendica2014-02-241-1/+1
|
* Merge pull request #338 from solstag/masterfriendica2014-02-251-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 Abdo2014-02-251-2/+2
| |
* | remote "add bookmark" - like rpost but saves a bookmark from a remote hub ↵friendica2014-02-241-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 stringsAlexandre Hannud Abdo2014-02-242-12/+14
|
* Updates to pt-br translation, including some email templates.Alexandre Hannud Abdo2014-02-2410-973/+1023
|
* little tweaksChristian Vogeley2014-02-221-2/+2
|
* Add option for narrow navbar instead of the bootstrap defaultChristian Vogeley2014-02-224-0/+35
| | | | thick version
* DE: update to the stringsTobias Diekershoff2014-02-222-876/+923
|
* remove some design fixes which got fixed in bootstrap 3.1.1marijus2014-02-212-4/+1
|
* dont allow bootstrap to mess with blockquote font-sizemarijus2014-02-211-0/+5
|
* quickfix for edit profile dropdownmarijus2014-02-211-2/+2
|
* oups... to much cleaning...marijus2014-02-211-0/+58
|
* cleanup style.cssmarijus2014-02-212-270/+3
|
* move jgrowl (alert popup) out of the now taller navbarfriendica2014-02-201-1/+1
|
* Merge pull request #327 from git-marijus/masterfriendica2014-02-211-1/+1
|\ | | | | fixes issue #326 initial scale to big
| * fixes issue #326 initial scale to bigmarijus2014-02-201-1/+1
| |
* | Merge pull request #328 from tuscanhobbit/masterPaolo T2014-02-202-3543/+7994
|\ \ | | | | | | PT-BR: update to the strings
| * | PT-BR: update to the stringstuscanhobbit2014-02-202-3543/+7994
| | |
* | | updated fr translationfriendica2014-02-202-976/+1024
| |/ |/|
* | Merge pull request #324 from tonybaldwin/masterfriendica2014-02-204-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 intony baldwin2014-02-194-4/+4
| | | | | | | | | | | | frames/g
* | | use a "fullscreen" icon for chanview full screen mode; add channel_menu ↵friendica2014-02-194-1/+35
|/ / | | | | | | selection and setting to the settings page.
* | Merge pull request #321 from git-marijus/masterfriendica2014-02-208-250/+308
|\ \ | | | | | | bootstrapify the nav
| * | another correctionmarijus2014-02-191-1/+1
| | |
| * | Merge branch 'master' of https://github.com/friendica/redmarijus2014-02-191-12/+12
| |\ \