Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | more background work for app management - give every member a copy of all ↵ | redmatrix | 2016-05-03 | 1 | -2/+2 |
| | | | | the system apps so that they can edit and delete them to taste/preference. This needs further work to pick up changes in system apps (additions, edits, deletions, etc.). Currently this is done once and never attempted again. | ||||
* | Merge pull request #365 from Treer/fontawesome | git-marijus | 2016-05-03 | 1 | -1/+1 |
|\ | | | | | another font-awesome icon | ||||
| * | another font-awesome icon | Treer | 2016-05-04 | 1 | -1/+1 |
| | | |||||
* | | more security stuff | redmatrix | 2016-05-02 | 1 | -13/+3 |
| | | |||||
* | | a couple of bugfixes from earlier checkins and implementation of source tags | redmatrix | 2016-05-01 | 2 | -0/+2 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-05-01 | 4 | -10/+18 |
|\ \ | |||||
| * | | fix mime-type icons in /cloud | Mario Vavti | 2016-05-01 | 1 | -1/+1 |
| | | | |||||
| * | | tweak dl bbcode in expanded autocomplete a bit more | Mario Vavti | 2016-05-01 | 1 | -3/+4 |
| | | | |||||
| * | | Merge pull request #363 from Treer/bbcode | git-marijus | 2016-05-01 | 1 | -6/+9 |
| |\ \ | | | | | | | | | tweak dl bbcode in expanded autocomplete | ||||
| | * | | tweak dl bbcode in expanded autocomplete | Treer | 2016-05-01 | 1 | -6/+9 |
| | | | | |||||
| * | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-05-01 | 1 | -2/+0 |
| |\ \ \ | |||||
| | * | | | css fix | Mario Vavti | 2016-05-01 | 1 | -2/+0 |
| | |/ / | |||||
| * / / | make weblink and attach button hideable and some minor fixes | Mario Vavti | 2016-05-01 | 1 | -1/+7 |
| |/ / | |||||
* / / | some much needed work on oembed security | redmatrix | 2016-05-01 | 2 | -0/+20 |
|/ / | |||||
* | | 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 |