aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
...
| * | 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
* | | | | | | | | | | | | | | | | | Merge pull request #438 from anaqreon/wikihubzilla2016-06-261-4/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | A page name wrapped in double brackets is converted into a link to another pa...Andrew Manning2016-06-251-0/+20
| * | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-259-120/+80
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Post generation about new wiki is optional, default is NOT to post. Fixed bug...Andrew Manning2016-06-251-4/+2
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Allow absolute links to css and js filesTreer2016-06-251-8/+20
| |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | media (e.g. video) files weren't being detected correctly in oembed, causing ...redmatrix2016-06-251-9/+8
| |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | change AbConfig to use channel_id instead of channel_hash; which was a mistak...redmatrix2016-06-233-12/+11
* | | | | | | | | | | | | | | relocate the cache classredmatrix2016-06-233-72/+6
* | | | | | | | | | | | | | | code cleanup for profile_photosredmatrix2016-06-231-20/+45
| |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | the xchan_query wasn't fully optimised as we were comparing quoted and unquot...redmatrix2016-06-221-4/+4
* | | | | | | | | | | | | | db statement debuggingredmatrix2016-06-221-1/+4
* | | | | | | | | | | | | | use the normal html escape for '@' in addresses rather than the high-plane un...redmatrix2016-06-222-2/+2
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | vcard spec changesredmatrix2016-06-211-0/+1
* | | | | | | | | | | | | 1. provide automatic relocation of important links in items that are imported...redmatrix2016-06-215-46/+60
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
* | | | | | | | | | | | make sure the optimisations are reliableredmatrix2016-06-201-1/+1
* | | | | | | | | | | | code optimisationredmatrix2016-06-203-9/+8
* | | | | | | | | | | | update attach on import if existsredmatrix2016-06-201-2/+2
* | | | | | | | | | | | Merge pull request #429 from anaqreon/wikihubzilla2016-06-211-1/+43
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-206-13/+25
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| * | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-173-8/+33
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
| * | | | | | | | | | | Wiki page revision comparison tool with diff displayed in modal dialog. Lever...Andrew Manning2016-06-171-1/+43