Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | more work on diaspora relay | redmatrix | 2016-05-09 | 1 | -0/+5 |
| | |||||
* | minor cleanup. No functional changes | Treer | 2016-05-10 | 1 | -4/+15 |
| | |||||
* | if we do not have a layout $layout should be empty not default | Mario Vavti | 2016-05-09 | 1 | -1/+1 |
| | |||||
* | remove unused code and whitespace | Mario Vavti | 2016-05-09 | 1 | -10/+0 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-05-09 | 3 | -11/+24 |
|\ | |||||
| * | prevent recursion in the database driver when debugging is enabled and the ↵ | redmatrix | 2016-05-09 | 3 | -11/+24 |
| | | | | | | | | system config is not yet loaded - caused by calling get_config and making db calls within the logger function; which we then attempt to log... | ||||
* | | make editwebpage use status_editor() and fix storing of layout on webpage ↵ | Mario Vavti | 2016-05-09 | 2 | -4/+13 |
| | | | | | | | | creation | ||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-05-09 | 4 | -73/+196 |
|\| | |||||
| * | clean up some cruft | redmatrix | 2016-05-08 | 1 | -46/+0 |
| | | |||||
| * | convert media embed functions that deal with rewriting specific corporate ↵ | redmatrix | 2016-05-08 | 1 | -23/+6 |
| | | | | | | | | services to addon hooks | ||||
| * | improve non-ACL option description in ACL dialog | Treer | 2016-05-08 | 2 | -4/+190 |
| | | |||||
* | | make editblock use status_editor() | Mario Vavti | 2016-05-07 | 1 | -14/+11 |
|/ | |||||
* | missed one other place where we called comanche outside the page build | redmatrix | 2016-05-06 | 1 | -2/+2 |
| | |||||
* | objectify comanche | redmatrix | 2016-05-05 | 2 | -422/+39 |
| | |||||
* | comments | redmatrix | 2016-05-05 | 1 | -0/+4 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-05-05 | 1 | -5/+32 |
|\ | |||||
| * | Unify permissions dialog for network posts, channel posts, and remote posts | Treer | 2016-05-06 | 1 | -5/+32 |
| | | | | | | | | | | | | * changes the warning from being about when a post is "sent" to when it's "shared", to match the Share button. * hyperlinks the "cannot be changed" part of the warning to the help file * adds some more content to the help file | ||||
* | | - Setup: check php version (5.4 required) | redmatrix | 2016-05-05 | 1 | -1/+36 |
|/ | | | | | | | | | | | | | | | - Comanche: implement conditionals. Currently the only supported tests are true/false for system config settings and supports the following forms: [if $config.system.foo] [widget=widget1][/widget] [else] [widget=widget2][/widget] [/if] [if $config.system.foo] [widget=widget1][/widget] [/if] | ||||
* | replace app tagcloud with more traditional categories widget. One can always ↵ | redmatrix | 2016-05-05 | 2 | -0/+44 |
| | | | | change this in the PDL | ||||
* | isolate all the tagadelic core code into a class and reuse it | redmatrix | 2016-05-04 | 1 | -85/+4 |
| | |||||
* | provide a tag cloud for app categories and allow filtering apps from this | redmatrix | 2016-05-04 | 3 | -1/+94 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-05-04 | 1 | -5/+22 |
|\ | |||||
| * | add help to some permissions dialogs | Treer | 2016-05-05 | 1 | -3/+3 |
| | | |||||
| * | Refine permissions dialog UI | Treer | 2016-05-04 | 1 | -5/+22 |
| | | |||||
* | | add categories to apps (wip) | redmatrix | 2016-05-04 | 3 | -29/+164 |
|/ | |||||
* | Sync the current list of system apps with the built-in name translation ↵ | redmatrix | 2016-05-03 | 1 | -3/+8 |
| | | | | table. Some of the names were changed in the past without the translation table being updated to reflect it. | ||||
* | more background work for app management - give every member a copy of all ↵ | redmatrix | 2016-05-03 | 2 | -15/+62 |
| | | | | 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. | ||||
* | some preliminary structural work for app organisation | redmatrix | 2016-05-03 | 1 | -2/+7 |
| | |||||
* | 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 |
| |