aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' into permsredmatrix2016-07-03315-11811/+14396
|\
| * Merge pull request #448 from Treer/avatarshubzilla2016-07-044-2/+89
| |\
| | * force immediate avatar updateTreer2016-07-033-0/+87
| | * Mark nickname as required field, if left empty then channel creation fails si...Treer2016-07-031-2/+2
| |/
| * 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
| | * ditch the change_view widget and make header fixed in fullscreen modeMario Vavti2016-07-016-39/+28
| * | delivery invoked twice in mod_tagger, once in post_activity_item() and anothe...redmatrix2016-07-012-14/+6
| * | use small photo for Diaspora attribution correction; the medium looks awkward...redmatrix2016-07-012-2/+11
| |/
| * 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 sen...redmatrix2016-06-301-0/+9
| * 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
| * Merge pull request #445 from anaqreon/wikihubzilla2016-07-013-3/+81
| |\
| | * 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 pre-templa...redmatrix2016-06-291-11/+1
| * | templatise the Dreport page and add a redeliver option for when things stuff ...redmatrix2016-06-292-9/+64
| * | 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 a...redmatrix2016-06-294-5/+29
| * | 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 '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
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-238-24/+36
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ erge branch 'dev' into sabre32Mario Vavti2016-06-2214-77/+842
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-2110-50/+565
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-201-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-2040-86788/+61549
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-2021-42/+108
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | return something so we can make a conclusionMario Vavti2016-06-191-0/+5
| | * | | | | | | | | | | | | | | | | Merge branch 'dev' into sabre32Mario Vavti2016-06-1914-13/+21622
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-188-1084/+1160
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-173-3/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-174-8/+38
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-162-0/+40
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ mrge branch 'dev' into sabre32Mario Vavti2016-06-162-0/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-169-536/+1491
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-1660-17/+23584
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-152-1/+11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-156-10/+160
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \