Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-07-09 | 22 | -1674/+1724 |
|\ | |||||
| * | some work on the forum widget queries | redmatrix | 2016-07-09 | 2 | -1273/+1292 |
| | | |||||
| * | 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 | 10 | -345/+386 |
| | |\ | |||||
| | * | | 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 | 2 | -1/+9 |
| | | | | | | | | | | | | | | | | folks outside of shared hosting. | ||||
| * | | | reduce the memory usage of the expire query dramatically. | redmatrix | 2016-07-06 | 1 | -19/+10 |
| | | | | |||||
| * | | | expire crashing on shared hosting from memory exhaustion. Lower the expire ↵ | redmatrix | 2016-07-06 | 2 | -2/+2 |
| | |/ | |/| | | | | | | | limit. Also the sys channel was being expired with everybody else due to a flag change regression. | ||||
| * | | unused file | redmatrix | 2016-07-05 | 1 | -35/+0 |
| | | | |||||
| * | | merge include/reddav.php into Zotlabs/Storage/Directory.php | redmatrix | 2016-07-05 | 2 | -303/+280 |
| | | | |||||
| * | | cleanup | redmatrix | 2016-07-05 | 1 | -2/+14 |
| | | | |||||
| * | | regression - save bookmarks no longer present in item menu | redmatrix | 2016-07-05 | 2 | -3/+3 |
| | | | |||||
| * | | Merge pull request #448 from Treer/avatars | hubzilla | 2016-07-04 | 4 | -2/+89 |
| |\ \ | | |/ | |/| | Force local cache update when user changes their profile picture | ||||
| | * | force immediate avatar update | Treer | 2016-07-03 | 3 | -0/+87 |
| | | | |||||
| | * | 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 | 7 | -41/+30 |
| |\ | |||||
| | * | use visibility instead of display to hide elements | Mario Vavti | 2016-07-01 | 1 | -2/+2 |
| | | | |||||
| * | | delivery invoked twice in mod_tagger, once in post_activity_item() and ↵ | redmatrix | 2016-07-01 | 2 | -14/+6 |
| | | | | | | | | | | | | another at the main module level | ||||
| * | | use small photo for Diaspora attribution correction; the medium looks ↵ | redmatrix | 2016-07-01 | 2 | -2/+11 |
| | | | | | | | | | | | | awkward in the D* stream. | ||||
* | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-07-01 | 15 | -3589/+3645 |
|\ \ \ | | |/ | |/| | |||||
| * | | ditch the change_view widget and make header fixed in fullscreen mode | Mario Vavti | 2016-07-01 | 6 | -39/+28 |
| |/ | |||||
| * | allow multiple apd's per plugin dir | redmatrix | 2016-07-01 | 3 | -3528/+3567 |
| | | |||||
| * | if cron is broken because the entire db or config table is crashed, don't ↵ | redmatrix | 2016-06-30 | 1 | -0/+9 |
| | | | | | | | | send a cron broken email - because we have no way of limiting it to just one email. We need a working config to do that. | ||||
| * | 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 | 2 | -20/+24 |
| | | |||||
* | | JavaScript popup for page delete confirmation | Andrew Manning | 2016-07-01 | 1 | -0/+3 |
|/ | |||||
* | Merge pull request #445 from anaqreon/wiki | hubzilla | 2016-07-01 | 3 | -3/+81 |
|\ | | | | | Table of contents with links is generated if [toc] is found in Markdown text | ||||
| * | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-30 | 319 | -8242/+10673 |
| |\ | |/ |/| | |||||
* | | update moment.js to version 2.13 | Mario Vavti | 2016-06-30 | 4 | -50/+423 |
| | | |||||
* | | 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 | 2 | -9/+64 |
| | | | | | | | | up badly. | ||||
* | | wiki featured disabled by default in UNO. | redmatrix | 2016-06-29 | 1 | -1/+1 |
| | | |||||
* | | provide wiki as a feature (default is on so there aren't any surprises) and ↵ | redmatrix | 2016-06-29 | 4 | -5/+29 |
| | | | | | | | | add to channel menu and profile tabs | ||||
* | | only request geolocation permission if we're creating a post. | redmatrix | 2016-06-29 | 1 | -1/+1 |
| | | |||||
* | | stream large photos through buffered I/O if possible | redmatrix | 2016-06-29 | 2 | -4/+28 |
| | | |||||
* | | Merge pull request #444 from git-marijus/dev | hubzilla | 2016-06-30 | 252 | -7354/+9154 |
|\ \ | | | | | | | Merge branch sabre32 into dev | ||||
| * \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-29 | 3 | -2/+43 |
| |\ \ | |||||
| * | | | update to sabre/dav to version 3.2.0 | Mario Vavti | 2016-06-28 | 21 | -224/+319 |
| | | | | |||||
| * | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-28 | 1 | -1/+7 |
| |\ \ \ | |||||
| * \ \ \ | erge branch 'dev' into sabre32 | Mario Vavti | 2016-06-28 | 10 | -71/+267 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-28 | 17 | -705/+555 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-27 | 1 | -8/+12 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-27 | 30 | -30/+98 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-26 | 5 | -36/+199 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-25 | 7 | -53/+59 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-24 | 26 | -3696/+3867 |
| |\ \ \ \ \ \ \ \ \ \ |