Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | more security stuff | redmatrix | 2016-05-02 | 2 | -50/+36 |
| | |||||
* | a bit more oembed security - and document the shortcomings of this approach | redmatrix | 2016-05-02 | 1 | -16/+20 |
| | |||||
* | sort out the rest of the source categories | redmatrix | 2016-05-02 | 1 | -2/+2 |
| | |||||
* | a couple of bugfixes from earlier checkins and implementation of source tags | redmatrix | 2016-05-01 | 2 | -1/+35 |
| | |||||
* | use only the std_version | redmatrix | 2016-05-01 | 3 | -3/+3 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-05-01 | 1 | -2/+10 |
|\ | |||||
| * | make weblink and attach button hideable and some minor fixes | Mario Vavti | 2016-05-01 | 1 | -2/+10 |
| | | |||||
* | | some much needed work on oembed security | redmatrix | 2016-05-01 | 3 | -56/+214 |
|/ | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-04-30 | 6 | -75/+109 |
|\ | |||||
| * | Merge pull request #362 from Treer/fontawesome | redmatrix | 2016-05-01 | 5 | -33/+33 |
| |\ | | | | | | | Update Font-Awesome to 4.6.1 | ||||
| | * | update icon names in include/ | Treer | 2016-05-01 | 5 | -33/+33 |
| | | | |||||
| * | | make mod editlayout use status_editor() | Mario Vavti | 2016-04-30 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #361 from Treer/bbcode | git-marijus | 2016-04-30 | 1 | -0/+50 |
| |\ \ | | |/ | |/| | Add definition lists to bbcode | ||||
| | * | improve whitespace control around definition list ([dl]) bbcode | Treer | 2016-04-30 | 1 | -4/+6 |
| | | | |||||
| | * | Add definition lists to bbcode | Treer | 2016-04-30 | 1 | -0/+48 |
| | | | |||||
| * | | get rid of the unused ispublic variable | Mario Vavti | 2016-04-29 | 1 | -1/+0 |
| | | | |||||
| * | | some work on making mod editpost use status_editor() - if you find anything ↵ | Mario Vavti | 2016-04-29 | 1 | -16/+26 |
| | | | | | | | | | | | | related to jot broken please revert this commit | ||||
| * | | jot: cleanup unused variables | Mario Vavti | 2016-04-29 | 1 | -25/+0 |
| | | | |||||
* | | | trim engr_units string slight improvement to avoid subtle bugs | redmatrix | 2016-04-29 | 1 | -1/+3 |
|/ / | |||||
* / | allow engineering units (e.g. 400M, 1G) as service class limits | redmatrix | 2016-04-28 | 3 | -2/+5 |
|/ | |||||
* | provide courtesy function for syncing one item. We'll probably be doing this ↵ | redmatrix | 2016-04-27 | 1 | -0/+15 |
| | | | | a lot. | ||||
* | Use / for album name in photo activities if no album present. | redmatrix | 2016-04-27 | 1 | -1/+1 |
| | |||||
* | implement the singleton delivery stuff | redmatrix | 2016-04-26 | 3 | -8/+38 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-04-26 | 2 | -45/+28 |
|\ | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-04-26 | 1 | -6/+12 |
| |\ | |||||
| * | | move spoiler= and quote= bbcode handling from prepare_body() to bbcode() and ↵ | Mario Vavti | 2016-04-26 | 2 | -45/+28 |
| | | | | | | | | | | | | add open tag to bbco_autocomplete | ||||
* | | | move iconfig functions to include/config.php with all the rest of the ↵ | redmatrix | 2016-04-26 | 4 | -159/+165 |
| |/ |/| | | | | | configs, fix an issue with singleton discovery and start work on singleton delivery | ||||
* | | some cleanup on the mysqli driver | redmatrix | 2016-04-25 | 1 | -6/+12 |
|/ | |||||
* | Setup was horked after this commit and I couldn't easily make it right so ↵ | redmatrix | 2016-04-25 | 4 | -79/+66 |
| | | | | | | | | reverting - will try again at a future date Revert "remove global db variable" This reverts commit c3b0c0f32a17649503db67f208cce6f9e0cdc322. | ||||
* | remove global db variable | redmatrix | 2016-04-25 | 4 | -66/+79 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-04-23 | 1 | -13/+4 |
|\ | |||||
| * | simplify context help js and move it to main.js where all the nav related js ↵ | Mario Vavti | 2016-04-23 | 1 | -13/+4 |
| | | | | | | | | 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. | ||||
* | | this should work to call a hook for a string class method | redmatrix | 2016-04-23 | 1 | -2/+12 |
| | | |||||
* | | Class method support for hooks | redmatrix | 2016-04-23 | 1 | -2/+3 |
|/ | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-04-21 | 2 | -9/+27 |
|\ | |||||
| * | some fixes for contextual help and disable transition animation for now - it ↵ | Mario Vavti | 2016-04-21 | 1 | -6/+11 |
| | | | | | | | | 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. | ||||
| * | Merge pull request #351 from anaqreon/toggle-context-help | git-marijus | 2016-04-21 | 1 | -2/+9 |
| |\ | | | | | | | Toggle context help | ||||
| | * | Added admin/site setting that toggles context help panel. If disabled, ↵ | Andrew Manning | 2016-04-21 | 1 | -0/+6 |
| | | | | | | | | | | | | original help menu button behavior is restored. | ||||
| | * | Merge branch 'dev' into toggle-context-help | Andrew Manning | 2016-04-20 | 5 | -21/+212 |
| | |\ | |||||
| | * | | Try toggling context help using onclick attribute | Andrew Manning | 2016-04-19 | 1 | -2/+3 |
| | | | | |||||
| * | | | Merge pull request #348 from git-marijus/dev | git-marijus | 2016-04-21 | 1 | -5/+11 |
| |\ \ \ | | | | | | | | | | | add querystring to css and js which is added via head_add_{css, js} | ||||
| | * | | | add querystring to css and js which is added via head_add_{css, js} | Mario Vavti | 2016-04-19 | 1 | -5/+11 |
| | | |/ | | |/| | |||||
* | / | | new hook interface (the old one still works but requires handlers to have ↵ | redmatrix | 2016-04-21 | 1 | -13/+13 |
|/ / / | | | | | | | | | | two calling arguments; the first of which is no longer used). The new interface is called from Zotlabs\Extend\Hook::register() and allows you to specify which hook version to use. The default will be the new interface with one function argument. We also implement the hook priority field which was always there but needed to be set manually in the DB. This provides a way for two hook handlers that implement the same hook interface to determine which order to be called in the event of conflicts. | ||||
* | | | send the correct number of args | redmatrix | 2016-04-20 | 1 | -1/+1 |
| | | | |||||
* | | | There is no longer a followup flag in the notifier. Remove all traces of it. | redmatrix | 2016-04-20 | 1 | -2/+0 |
| | | | |||||
* | | | bb2d updates from testing signature changes | redmatrix | 2016-04-20 | 1 | -5/+5 |
| | | | |||||
* | | | testing dmeta | redmatrix | 2016-04-19 | 1 | -6/+5 |
| | | | |||||
* | | | rework bb2diaspora for eradicating the diaspora comment virus | redmatrix | 2016-04-19 | 1 | -3/+26 |
|/ / | |||||
* / | module updates | redmatrix | 2016-04-18 | 5 | -21/+212 |
|/ | |||||
* | some issues with GNU-Social's implementation of events in feeds. The summary ↵ | redmatrix | 2016-04-18 | 1 | -2/+2 |
| | | | | element is over-riding content, so put summary into the xcal namespace. Some investigation reveals that both projects are non-compliant in the xcal space. Will deal with this later. |