aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-07-0922-1674/+1724
|\
| * some work on the forum widget queriesredmatrix2016-07-092-1273/+1292
| |
| * gak one more typoredmatrix2016-07-071-1/+1
| |
| * typoredmatrix2016-07-071-1/+1
| |
| * duplicate supression SQL query was horribly inefficient and could cause ↵redmatrix2016-07-071-11/+13
| | | | | | | | issues in resource deprived environments.
| * Merge pull request #450 from git-marijus/devhubzilla2016-07-083-14/+2
| |\ | | | | | | fix /cloud after recent changes
| | * more fixes for /cloud and /davMario Vavti2016-07-073-13/+2
| | |
| | * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-07-0610-345/+386
| | |\
| | * | fix /cloud after recent changesMario Vavti2016-07-061-2/+1
| | | |
| * | | hide the redeliver option one level down since it should rarely be needed by ↵redmatrix2016-07-072-1/+9
| | | | | | | | | | | | | | | | folks outside of shared hosting.
| * | | reduce the memory usage of the expire query dramatically.redmatrix2016-07-061-19/+10
| | | |
| * | | expire crashing on shared hosting from memory exhaustion. Lower the expire ↵redmatrix2016-07-062-2/+2
| | |/ | |/| | | | | | | limit. Also the sys channel was being expired with everybody else due to a flag change regression.
| * | unused fileredmatrix2016-07-051-35/+0
| | |
| * | merge include/reddav.php into Zotlabs/Storage/Directory.phpredmatrix2016-07-052-303/+280
| | |
| * | cleanupredmatrix2016-07-051-2/+14
| | |
| * | regression - save bookmarks no longer present in item menuredmatrix2016-07-052-3/+3
| | |
| * | Merge pull request #448 from Treer/avatarshubzilla2016-07-044-2/+89
| |\ \ | | |/ | |/| Force local cache update when user changes their profile picture
| | * force immediate avatar updateTreer2016-07-033-0/+87
| | |
| | * Mark nickname as required field, if left empty then channel creation fails ↵Treer2016-07-031-2/+2
| |/ | | | | | | silently
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-07-017-41/+30
| |\
| | * use visibility instead of display to hide elementsMario Vavti2016-07-011-2/+2
| | |
| * | delivery invoked twice in mod_tagger, once in post_activity_item() and ↵redmatrix2016-07-012-14/+6
| | | | | | | | | | | | another at the main module level
| * | use small photo for Diaspora attribution correction; the medium looks ↵redmatrix2016-07-012-2/+11
| | | | | | | | | | | | awkward in the D* stream.
* | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-07-0115-3589/+3645
|\ \ \ | | |/ | |/|
| * | ditch the change_view widget and make header fixed in fullscreen modeMario Vavti2016-07-016-39/+28
| |/
| * allow multiple apd's per plugin dirredmatrix2016-07-013-3528/+3567
| |
| * if cron is broken because the entire db or config table is crashed, don't ↵redmatrix2016-06-301-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 postsredmatrix2016-06-303-2/+17
| |
| * sync flags even if post has not been editedredmatrix2016-06-302-20/+24
| |
* | JavaScript popup for page delete confirmationAndrew Manning2016-07-011-0/+3
|/
* Merge pull request #445 from anaqreon/wikihubzilla2016-07-013-3/+81
|\ | | | | Table of contents with links is generated if [toc] is found in Markdown text
| * Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-30319-8242/+10673
| |\ | |/ |/|
* | update moment.js to version 2.13Mario Vavti2016-06-304-50/+423
| |
* | dreport: convert timestamp to channel localtime and get rid of old ↵redmatrix2016-06-291-11/+1
| | | | | | | | pre-template code
* | templatise the Dreport page and add a redeliver option for when things stuff ↵redmatrix2016-06-292-9/+64
| | | | | | | | up badly.
* | wiki featured disabled by default in UNO.redmatrix2016-06-291-1/+1
| |
* | provide wiki as a feature (default is on so there aren't any surprises) and ↵redmatrix2016-06-294-5/+29
| | | | | | | | add to channel menu and profile tabs
* | only request geolocation permission if we're creating a post.redmatrix2016-06-291-1/+1
| |
* | stream large photos through buffered I/O if possibleredmatrix2016-06-292-4/+28
| |
* | Merge pull request #444 from git-marijus/devhubzilla2016-06-30252-7354/+9154
|\ \ | | | | | | Merge branch sabre32 into dev
| * \ Merge branch 'dev' into sabre32Mario Vavti2016-06-293-2/+43
| |\ \
| * | | update to sabre/dav to version 3.2.0Mario Vavti2016-06-2821-224/+319
| | | |
| * | | Merge branch 'dev' into sabre32Mario Vavti2016-06-281-1/+7
| |\ \ \
| * \ \ \ erge branch 'dev' into sabre32Mario Vavti2016-06-2810-71/+267
| |\ \ \ \
| * \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-2817-705/+555
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-271-8/+12
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-2730-30/+98
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-265-36/+199
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-257-53/+59
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-2426-3696/+3867
| |\ \ \ \ \ \ \ \ \ \