aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* more permissions workredmatrix2016-07-092-2/+4
* more work on permsredmatrix2016-07-092-7/+9
* Merge branch 'dev' into permsredmatrix2016-07-054-338/+16
|\
| * unused fileredmatrix2016-07-051-35/+0
| * merge include/reddav.php into Zotlabs/Storage/Directory.phpredmatrix2016-07-051-299/+0
| * cleanupredmatrix2016-07-051-2/+14
| * regression - save bookmarks no longer present in item menuredmatrix2016-07-051-2/+2
* | more heavy lifting on xtensible permsredmatrix2016-07-041-233/+244
* | more heavy lifting on extensible permsredmatrix2016-07-041-13/+16
|/
* force immediate avatar updateTreer2016-07-031-0/+13
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-07-011-15/+0
|\
| * ditch the change_view widget and make header fixed in fullscreen modeMario Vavti2016-07-011-15/+0
* | delivery invoked twice in mod_tagger, once in post_activity_item() and anothe...redmatrix2016-07-011-5/+1
* | use small photo for Diaspora attribution correction; the medium looks awkward...redmatrix2016-07-011-2/+2
|/
* sync flags even if post has not been editedredmatrix2016-06-301-19/+10
* Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-309-17/+110
|\
| * 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-293-5/+14
| * stream large photos through buffered I/O if possibleredmatrix2016-06-291-1/+1
| * Merge branch 'dev' into sabre32Mario Vavti2016-06-291-0/+38
| |\
| | * identity_export_year() was a bit short-sighted. We really require arbitrary d...redmatrix2016-06-281-0/+38
| * | Merge branch 'dev' into sabre32Mario Vavti2016-06-284-7/+30
| |\|
| | * still working through some issues with curl magic-authredmatrix2016-06-271-0/+7
| | * add letsencrypt x3 intermediate cert and new cert file, improve UX of new reg...redmatrix2016-06-272-3/+19
| | * replace [+] and [-] with chevron iconsredmatrix2016-06-271-4/+4
| * | Merge branch 'dev' into sabre32Mario Vavti2016-06-273-3/+26
| |\|
| | * remove the app $a passed to profile_load, also add profile_load to mod_wiki w...redmatrix2016-06-261-2/+1
| | * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-06-262-12/+42
| | |\
| | * | issue #442, tables contain too much whitespace (there's a definite issue here...redmatrix2016-06-262-1/+25
| * | | Merge branch 'dev' into sabre32Mario Vavti2016-06-262-12/+42
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'dev' into sabre32Mario Vavti2016-06-251-9/+8
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'dev' into sabre32Mario Vavti2016-06-247-104/+62
| |\ \ \
| * \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-234-7/+10
| |\ \ \ \
| * \ \ \ \ erge branch 'dev' into sabre32Mario Vavti2016-06-225-46/+61
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-215-12/+53
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-201-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-202-11/+16
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-184-2/+9
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-174-8/+38
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-164-12/+114
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-152-1/+11
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-1411-75/+101
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-134-24/+61
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-111-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-102-0/+471
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | more style workMario Vavti2016-06-091-1/+1
* | | | | | | | | | | | | | | | | | Replace homemade table of content generator with existing jQuery plugin. Now ...Andrew Manning2016-06-301-1/+2
* | | | | | | | | | | | | | | | | | Added table of contents generator. Table is inserted wherever [toc] is encoun...Andrew Manning2016-06-261-1/+75
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #441 from Treer/cdnhubzilla2016-06-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | fix absolute .js urlsTreer2016-06-261-1/+1