Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-14 | 1 | -25/+59 |
|\ | |||||
| * | document mod_acl a bit better and try to remove some redundancies and ↵ | redmatrix | 2016-07-13 | 1 | -25/+59 |
| | | | | | | | | consolidate the various options | ||||
* | | Refactored the scan and import functions to reduce redundant code and ↵ | Andrew Manning | 2016-07-14 | 1 | -373/+23 |
| | | | | | | | | simplify logic. Import of pages, layouts, and blocks works. | ||||
* | | Blocks, pages, and layouts import from zip file. Layouts are not applied to ↵ | Andrew Manning | 2016-07-13 | 1 | -9/+190 |
| | | | | | | | | pages until imported twice though. | ||||
* | | Updated import_blocks for database calls | Andrew Manning | 2016-07-13 | 1 | -5/+3 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-13 | 1 | -1/+1 |
|\| | |||||
| * | missing namespace prefix \ | redmatrix | 2016-07-12 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-12 | 11 | -34/+12 |
|\| | |||||
| * | move permissiondescription class to zotlabs/lib | redmatrix | 2016-07-11 | 9 | -22/+10 |
| | | |||||
| * | use the profile_uid here. | redmatrix | 2016-07-11 | 1 | -7/+2 |
| | | |||||
| * | remove check for mcrypt | Mario Vavti | 2016-07-10 | 1 | -5/+0 |
| | | |||||
* | | Import blocks from zip file, but needs updates as detailed in ↵ | Andrew Manning | 2016-07-12 | 1 | -0/+222 |
|/ | | | | https://gitlab.com/zot/hubsites/merge_requests/2 | ||||
* | gak one more typo | redmatrix | 2016-07-07 | 1 | -1/+1 |
| | |||||
* | typo | redmatrix | 2016-07-07 | 1 | -1/+1 |
| | |||||
* | duplicate supression SQL query was horribly inefficient and could cause ↵ | redmatrix | 2016-07-07 | 1 | -11/+13 |
| | | | | issues in resource deprived environments. | ||||
* | Merge pull request #450 from git-marijus/dev | hubzilla | 2016-07-08 | 2 | -14/+0 |
|\ | | | | | fix /cloud after recent changes | ||||
| * | more fixes for /cloud and /dav | Mario Vavti | 2016-07-07 | 2 | -13/+0 |
| | | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-07-06 | 2 | -2/+4 |
| |\ | |||||
| * | | fix /cloud after recent changes | Mario Vavti | 2016-07-06 | 1 | -2/+1 |
| | | | |||||
* | | | hide the redeliver option one level down since it should rarely be needed by ↵ | redmatrix | 2016-07-07 | 1 | -0/+1 |
| |/ |/| | | | | | folks outside of shared hosting. | ||||
* | | force immediate avatar update | Treer | 2016-07-03 | 1 | -0/+2 |
| | | |||||
* | | Mark nickname as required field, if left empty then channel creation fails ↵ | Treer | 2016-07-03 | 1 | -2/+2 |
|/ | | | | silently | ||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-07-01 | 1 | -2/+4 |
|\ | |||||
| * | ditch the change_view widget and make header fixed in fullscreen mode | Mario Vavti | 2016-07-01 | 1 | -2/+4 |
| | | |||||
* | | delivery invoked twice in mod_tagger, once in post_activity_item() and ↵ | redmatrix | 2016-07-01 | 1 | -9/+5 |
| | | | | | | | | another at the main module level | ||||
* | | use small photo for Diaspora attribution correction; the medium looks ↵ | redmatrix | 2016-07-01 | 1 | -0/+9 |
|/ | | | | awkward in the D* stream. | ||||
* | allow multiple apd's per plugin dir | redmatrix | 2016-07-01 | 1 | -0/+2 |
| | |||||
* | disable wiki if feature disabled, sync updates of delayed publish posts | redmatrix | 2016-06-30 | 1 | -0/+5 |
| | |||||
* | sync flags even if post has not been edited | redmatrix | 2016-06-30 | 1 | -1/+14 |
| | |||||
* | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-30 | 32 | -52/+126 |
|\ | |||||
| * | dreport: convert timestamp to channel localtime and get rid of old ↵ | redmatrix | 2016-06-29 | 1 | -11/+1 |
| | | | | | | | | pre-template code | ||||
| * | templatise the Dreport page and add a redeliver option for when things stuff ↵ | redmatrix | 2016-06-29 | 1 | -9/+43 |
| | | | | | | | | up badly. | ||||
| * | provide wiki as a feature (default is on so there aren't any surprises) and ↵ | redmatrix | 2016-06-29 | 1 | -0/+15 |
| | | | | | | | | add to channel menu and profile tabs | ||||
| * | stream large photos through buffered I/O if possible | redmatrix | 2016-06-29 | 1 | -3/+27 |
| | | |||||
| * | missing backslash leads to wsod on refresh permissions | Mario Vavti | 2016-06-29 | 1 | -1/+1 |
| | | |||||
| * | readability | redmatrix | 2016-06-28 | 1 | -1/+4 |
| | | |||||
| * | still working through some issues with curl magic-auth | redmatrix | 2016-06-27 | 2 | -4/+3 |
| | | | | | | | | fixed profile photo upload | ||||
| * | add letsencrypt x3 intermediate cert and new cert file, improve UX of new ↵ | redmatrix | 2016-06-27 | 1 | -1/+2 |
| | | | | | | | | registrations | ||||
| * | comment on the setup page about the possible need for intermediate certs. | redmatrix | 2016-06-27 | 2 | -4/+10 |
| | | |||||
| * | fix for the rendering side of issue #412. We traditionally store all | redmatrix | 2016-06-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | "user generated" content with ENT_COMPAT encoding to reduce the attack vector for JS CSS exploits. This may present compatibility issues sharing wikis to platforms which do not provide such CSS protection. We can either decide that wikis are inherently insecure and filter them on render (with an associated performance penalty), or keep the existing method of filtering on store. I'm not making that choice. I'm merely fixing the obvious rendering issue in mono-platform viewing. | ||||
| * | remove the app $a passed to profile_load, also add profile_load to mod_wiki ↵ | redmatrix | 2016-06-26 | 26 | -26/+28 |
| | | | | | | | | which should fix issue #431 | ||||
* | | Replace homemade table of content generator with existing jQuery plugin. Now ↵ | Andrew Manning | 2016-06-30 | 1 | -4/+2 |
| | | | | | | | | toc is linked to document headings. | ||||
* | | Fixed bug with rendering table of contents upon page load | Andrew Manning | 2016-06-26 | 1 | -2/+3 |
| | | |||||
* | | Also generate table of contents when loading the page | Andrew Manning | 2016-06-26 | 1 | -0/+1 |
| | | |||||
* | | Added table of contents generator. Table is inserted wherever [toc] is ↵ | Andrew Manning | 2016-06-26 | 1 | -0/+1 |
|/ | | | | encountered. | ||||
* | A page name wrapped in double brackets is converted into a link to another ↵ | Andrew Manning | 2016-06-25 | 1 | -4/+11 |
| | | | | page in the current wiki | ||||
* | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-25 | 8 | -64/+87 |
|\ | |||||
| * | fix pdledit "list layouts" | redmatrix | 2016-06-24 | 1 | -5/+5 |
| | | |||||
| * | change AbConfig to use channel_id instead of channel_hash; which was a ↵ | redmatrix | 2016-06-23 | 3 | -4/+3 |
| | | | | | | | | mistake in retrospect | ||||
| * | code cleanup for profile_photos | redmatrix | 2016-06-23 | 4 | -47/+62 |
| | |