Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-07-20 | 3 | -18/+17 |
|\ | |||||
| * | some work on guest access token ui | Mario Vavti | 2016-07-17 | 1 | -17/+1 |
| | | |||||
| * | check for variables after schema files have been added | Mario Vavti | 2016-07-16 | 1 | -12/+12 |
| | | |||||
| * | check for variables in schemes | Mario Vavti | 2016-07-16 | 1 | -1/+1 |
| | | |||||
| * | hide/show mixup | Mario Vavti | 2016-07-16 | 1 | -3/+2 |
| | | |||||
| * | only use visibility for tabs | Mario Vavti | 2016-07-16 | 1 | -4/+4 |
| | | |||||
| * | provide examples for using access tokens in urls | redmatrix | 2016-07-15 | 1 | -0/+6 |
| | | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-07-15 | 1 | -0/+11 |
| |\ | |||||
| | * | more cleanup of atoken UI | redmatrix | 2016-07-15 | 1 | -1/+4 |
| | | | |||||
| | * | cleanup and debug of atoken feature | redmatrix | 2016-07-15 | 1 | -0/+8 |
| | | | |||||
| * | | upgrade to jquery-3.1 and minor fixes | Mario Vavti | 2016-07-15 | 1 | -3/+0 |
| |/ | |||||
| * | do not use visibility for fullscreen button and move fullscreen button to ↵ | Mario Vavti | 2016-07-11 | 1 | -2/+4 |
| | | | | | | | | the right | ||||
* | | Set max-width for embedded images | Andrew Manning | 2016-07-09 | 1 | -0/+4 |
|/ | |||||
* | use visibility instead of display to hide elements | Mario Vavti | 2016-07-01 | 1 | -2/+2 |
| | |||||
* | css fixes | Mario Vavti | 2016-06-13 | 1 | -1/+4 |
| | |||||
* | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-13 | 1 | -0/+6 |
|\ | |||||
| * | Photo embed button with album browser works in new post editor. | Andrew Manning | 2016-06-12 | 1 | -0/+6 |
| | | |||||
* | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-11 | 1 | -9/+0 |
|\| | |||||
| * | css fixes | Mario Vavti | 2016-06-11 | 1 | -9/+0 |
| | | |||||
* | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-10 | 1 | -1/+8 |
|\| | |||||
| * | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-02 | 1 | -3/+0 |
| |\ | |||||
| * | | Hacked Parsedown and Markdown to add class inline-code to <code> blocks for ↵ | Andrew Manning | 2016-05-29 | 1 | -0/+9 |
| | | | | | | | | | | | | proper inline code rendering. Stopped using Parsedown even though Markdown is slower, hence extra delay when previewing pages. | ||||
* | | | more style work | Mario Vavti | 2016-06-09 | 1 | -1/+11 |
| |/ |/| | |||||
* | | render code bbcode inline if there are no linebreaks in the text. | Mario Vavti | 2016-05-30 | 1 | -3/+2 |
|/ | |||||
* | possible fix for #385 | Mario Vavti | 2016-05-21 | 1 | -0/+4 |
| | |||||
* | Dutch and Spanish Spanish strings, and some schema-bits | jeroenpraat | 2016-05-16 | 5 | -30/+110 |
| | |||||
* | improve non-ACL option description in ACL dialog | Treer | 2016-05-08 | 1 | -0/+7 |
| | |||||
* | use section-content-info-wrapper class for info text | Mario Vavti | 2016-05-06 | 1 | -9/+0 |
| | |||||
* | use darker background colour only for searchbar | Mario Vavti | 2016-05-06 | 1 | -8/+17 |
| | |||||
* | add help to some permissions dialogs | Treer | 2016-05-05 | 1 | -0/+10 |
| | |||||
* | Refine permissions dialog UI | Treer | 2016-05-04 | 1 | -6/+51 |
| | |||||
* | css fix | Mario Vavti | 2016-05-01 | 1 | -2/+0 |
| | |||||
* | Merge pull request #362 from Treer/fontawesome | redmatrix | 2016-05-01 | 3 | -6/+6 |
|\ | | | | | Update Font-Awesome to 4.6.1 | ||||
| * | update icon names in view/ | Treer | 2016-05-01 | 3 | -6/+6 |
| | | |||||
* | | css fix | Mario Vavti | 2016-04-30 | 1 | -3/+2 |
| | | |||||
* | | Add definition lists to bbcode | Treer | 2016-04-30 | 1 | -0/+21 |
|/ | |||||
* | provide help button in context help popup | Mario Vavti | 2016-04-28 | 1 | -0/+18 |
| | |||||
* | css fix | Mario Vavti | 2016-04-28 | 1 | -0/+1 |
| | |||||
* | only padding-top needs adjustment | Mario Vavti | 2016-04-26 | 1 | -2/+2 |
| | |||||
* | fix top padding for narrow navbar | Mario Vavti | 2016-04-26 | 1 | -0/+9 |
| | |||||
* | Revert "Revert "revert inline-block for blockquote"" | redmatrix | 2016-04-25 | 1 | -1/+0 |
| | | | | This reverts commit ae026247934f422622031c426af01101c05f4c18. | ||||
* | Revert "revert inline-block for blockquote" | redmatrix | 2016-04-25 | 1 | -0/+1 |
| | | | | This reverts commit 15cfd6fda79fdaff8302f2eae91e8fc40940609a. | ||||
* | 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 |
| | |||||
* | simplify context help js and move it to main.js where all the nav related js ↵ | Mario Vavti | 2016-04-23 | 1 | -16/+12 |
| | | | | 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. | ||||
* | 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 | 1 | -1/+5 |
| | |||||
* | fix help button for collapsed state | Mario Vavti | 2016-04-21 | 1 | -1/+2 |
| | |||||
* | some fixes for contextual help and disable transition animation for now - it ↵ | Mario Vavti | 2016-04-21 | 1 | -35/+28 |
| | | | | 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 | 1 | -47/+0 |
| | | | | original help menu button behavior is restored. |