Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #362 from Treer/fontawesome | redmatrix | 2016-05-01 | 93 | -418/+418 |
|\ | | | | | Update Font-Awesome to 4.6.1 | ||||
| * | update icon names in view/ | Treer | 2016-05-01 | 85 | -349/+349 |
| | | |||||
| * | update icon names in view/js | Treer | 2016-05-01 | 7 | -68/+68 |
| | | |||||
| * | update icon names in include/ | Treer | 2016-05-01 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-04-30 | 2 | -6/+7 |
|\ \ | |||||
| * \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | jeroenpraat | 2016-04-30 | 2 | -3/+24 |
| |\ \ | |||||
| * | | | Small fix of Dutch strings | jeroenpraat | 2016-04-30 | 2 | -6/+7 |
| | | | | |||||
* | | | | css fix | Mario Vavti | 2016-04-30 | 3 | -15/+5 |
| |/ / |/| | | |||||
* | | | add dl bbcode to the expanded autocomplete | Mario Vavti | 2016-04-30 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #361 from Treer/bbcode | git-marijus | 2016-04-30 | 2 | -1/+22 |
|\ \ \ | |/ / |/| | | Add definition lists to bbcode | ||||
| * | | Add definition lists to bbcode | Treer | 2016-04-30 | 2 | -1/+22 |
| | | | |||||
* | | | Update NL+ES-ES | jeroenpraat | 2016-04-30 | 4 | -1916/+1888 |
| |/ |/| | |||||
* | | get rid of the unused ispublic variable | Mario Vavti | 2016-04-29 | 5 | -23/+2 |
| | | |||||
* | | css fix | Mario Vavti | 2016-04-29 | 1 | -1/+2 |
| | | |||||
* | | some work on making mod editpost use status_editor() - if you find anything ↵ | Mario Vavti | 2016-04-29 | 2 | -6/+6 |
| | | | | | | | | related to jot broken please revert this commit | ||||
* | | css fixes | Mario Vavti | 2016-04-29 | 1 | -5/+1 |
| | | |||||
* | | This setting isn't implemented so remove the UI until it is. | redmatrix | 2016-04-28 | 1 | -3/+0 |
|/ | |||||
* | provide help button in context help popup | Mario Vavti | 2016-04-28 | 2 | -5/+22 |
| | |||||
* | css fix | Mario Vavti | 2016-04-28 | 1 | -0/+1 |
| | |||||
* | some refinements on jot | Mario Vavti | 2016-04-27 | 2 | -14/+21 |
| | |||||
* | only padding-top needs adjustment | Mario Vavti | 2016-04-26 | 1 | -2/+2 |
| | |||||
* | hopefully fix jot dropdown visibility issue | Mario Vavti | 2016-04-26 | 1 | -3/+5 |
| | |||||
* | move spoiler= and quote= bbcode handling from prepare_body() to bbcode() and ↵ | Mario Vavti | 2016-04-26 | 1 | -1/+1 |
| | | | | add open tag to bbco_autocomplete | ||||
* | fix top padding for narrow navbar | Mario Vavti | 2016-04-26 | 1 | -0/+9 |
| | |||||
* | +es-es strings update | jeroenpraat | 2016-04-25 | 4 | -15342/+15688 |
| | |||||
* | make it more obvious what is behind the dropdowns | Mario Vavti | 2016-04-25 | 3 | -14/+14 |
| | |||||
* | revert inline-block for blockquote | Mario Vavti | 2016-04-24 | 1 | -1/+0 |
| | |||||
* | fix context help position with narrow navbar | Mario Vavti | 2016-04-23 | 2 | -0/+5 |
| | |||||
* | update jquery.textcomplete to version 1.3.4 and add minified version | Mario Vavti | 2016-04-23 | 1 | -1/+1 |
| | |||||
* | make the link to /help in dropdown conditional to the use of context help | Mario Vavti | 2016-04-23 | 1 | -1/+1 |
| | |||||
* | pull-right is not needed here | Mario Vavti | 2016-04-23 | 1 | -1/+1 |
| | |||||
* | simplify context help js and move it to main.js where all the nav related js ↵ | Mario Vavti | 2016-04-23 | 4 | -70/+47 |
| | | | | resides, do not close the context help if we click outside of it - members might want to work on something while help is open, move the link to /help to dropdown-menu. | ||||
* | only display help button in collapsed panel if context help is enabled | Mario Vavti | 2016-04-23 | 1 | -2/+4 |
| | |||||
* | Merge branch 'master' into dev | redmatrix | 2016-04-23 | 2 | -7224/+7467 |
|\ | |||||
| * | Update DE translation strings | phellmes | 2016-04-22 | 2 | -7224/+7467 |
| | | |||||
* | | make it icon-question-sign for contextual and icon-question for normal help ↵ | Mario Vavti | 2016-04-22 | 1 | -2/+2 |
| | | | | | | | | instead of adding a caret-down | ||||
* | | No idea how long RSD (Really Simple Discovery) has been broken. I had no ↵ | redmatrix | 2016-04-21 | 2 | -0/+16 |
| | | | | | | | | idea it was even here. | ||||
* | | remove obsolete class | Mario Vavti | 2016-04-21 | 1 | -4/+0 |
| | | |||||
* | | indicate if we will be displayed contextual help or default help | Mario Vavti | 2016-04-21 | 2 | -3/+7 |
| | | |||||
* | | fix help button for collapsed state | Mario Vavti | 2016-04-21 | 3 | -5/+6 |
| | | |||||
* | | some fixes for contextual help and disable transition animation for now - it ↵ | Mario Vavti | 2016-04-21 | 3 | -49/+46 |
| | | | | | | | | looked really wired because main moved with a different speed than help-content and help-content can not be displayed under the panel as it is implemented now. | ||||
* | | Added admin/site setting that toggles context help panel. If disabled, ↵ | Andrew Manning | 2016-04-21 | 2 | -47/+49 |
| | | | | | | | | original help menu button behavior is restored. | ||||
* | | Merge branch 'dev' into toggle-context-help | Andrew Manning | 2016-04-20 | 3 | -8/+14 |
|\ \ | |||||
| * | | Merge branch 'master' into dev | redmatrix | 2016-04-20 | 2 | -3/+9 |
| |\| | |||||
| | * | some crossbrowser rendering work on the comment box | Mario Vavti | 2016-04-20 | 1 | -1/+3 |
| | | | |||||
| | * | Use stopImmidiatePropagation() only if we are in a list to not interfere ↵ | Mario Vavti | 2016-04-20 | 1 | -2/+6 |
| | | | | | | | | | | | | with other keypress listeners (e.g. chat). | ||||
| * | | module updates | redmatrix | 2016-04-18 | 1 | -5/+5 |
| | | | |||||
* | | | Try toggling context help using onclick attribute | Andrew Manning | 2016-04-19 | 2 | -1/+2 |
|/ / | |||||
* | | Merge branch 'master' into dev | redmatrix | 2016-04-18 | 4 | -11600/+11628 |
|\| | |||||
| * | Spanish and Dutch strings update | jeroenpraat | 2016-04-17 | 4 | -11600/+11628 |
| | |