aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | css fixMario Vavti2016-06-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dev' into sabre32Mario Vavti2016-06-1443-158/+223
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | css fixesMario Vavti2016-06-131-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dev' into sabre32Mario Vavti2016-06-1310-39/+372
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-116-9051/+9048
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-112-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-10354-18/+1687
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-1010-3504/+3553
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | more style workMario Vavti2016-06-092-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sabre32' of https://github.com/redmatrix/hubzilla into sabre32Mario Vavti2016-06-092-0/+12
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-0925-6391/+6420
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sabre32' of https://github.com/redmatrix/hubzilla into sabre32Mario Vavti2016-06-061785-413/+391
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sabre32' of https://github.com/redmatrix/hubzilla into sabre32Mario Vavti2016-06-03107-692/+755
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sabre32' of https://github.com/redmatrix/hubzilla into sabre32Mario Vavti2016-06-0146-461/+295
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \