Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | 3 | -14/+2 |
|\ | | | | | fix /cloud after recent changes | ||||
| * | more fixes for /cloud and /dav | Mario Vavti | 2016-07-07 | 3 | -13/+2 |
| | | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-07-06 | 4 | -7/+285 |
| |\ | |||||
| * | | 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. | ||||
* | | | expire crashing on shared hosting from memory exhaustion. Lower the expire ↵ | redmatrix | 2016-07-06 | 1 | -1/+1 |
| |/ |/| | | | | | limit. Also the sys channel was being expired with everybody else due to a flag change regression. | ||||
* | | merge include/reddav.php into Zotlabs/Storage/Directory.php | redmatrix | 2016-07-05 | 1 | -4/+280 |
| | | |||||
* | | regression - save bookmarks no longer present in item menu | redmatrix | 2016-07-05 | 1 | -1/+1 |
| | | |||||
* | | 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 | 2 | -2/+5 |
| | |||||
* | disable wiki if feature disabled, sync updates of delayed publish posts | redmatrix | 2016-06-30 | 3 | -2/+17 |
| | |||||
* | 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 | 37 | -55/+242 |
|\ | |||||
| * | 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 |
| | | |||||
| * | Merge pull request #444 from git-marijus/dev | hubzilla | 2016-06-30 | 1 | -2/+2 |
| |\ | | | | | | | Merge branch sabre32 into dev | ||||
| | * | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-29 | 2 | -2/+5 |
| | |\ | |||||
| | * \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-28 | 8 | -10/+86 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-27 | 27 | -27/+72 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-26 | 1 | -21/+25 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-24 | 11 | -73/+244 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-23 | 2 | -10/+19 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | erge branch 'dev' into sabre32 | Mario Vavti | 2016-06-22 | 6 | -7/+751 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-21 | 2 | -24/+46 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-20 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-18 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-16 | 2 | -4/+52 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-15 | 4 | -9/+149 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-14 | 13 | -80/+86 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-13 | 2 | -15/+183 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-10 | 3 | -0/+455 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-10 | 4 | -19/+25 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-08 | 6 | -10/+429 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-07 | 1 | -43/+63 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-06 | 2 | -1/+190 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-05 | 4 | -10/+22 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-03 | 2 | -7/+103 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-02 | 25 | -196/+189 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-01 | 21 | -184/+66 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |