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 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
| | |/ | |/|
* | | Merge branch 'dev' into sabre32Mario Vavti2016-06-251-9/+8
|\| |
| * | media (e.g. video) files weren't being detected correctly in oembed, causing ...redmatrix2016-06-251-9/+8
* | | Merge branch 'dev' into sabre32Mario Vavti2016-06-247-104/+62
|\| |
| * | 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
* | | Merge branch 'dev' into sabre32Mario Vavti2016-06-234-7/+10
|\| |
| * | 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
| |/
* | erge branch 'dev' into sabre32Mario Vavti2016-06-225-46/+61
|\|
| * vcard spec changesredmatrix2016-06-211-0/+1
| * 1. provide automatic relocation of important links in items that are imported...redmatrix2016-06-215-46/+60
* | Merge branch 'dev' into sabre32Mario Vavti2016-06-215-12/+53
|\|
| * 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
* | | | | Merge branch 'dev' into sabre32Mario Vavti2016-06-201-1/+1
|\| | | |
| * | | | Merge branch 'master' into devMario Vavti2016-06-201-1/+1
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Merge branch '1.8RC'redmatrix2016-06-1975-8346/+2856
| | |\ \ \
| | | * | | add new connection to default group when auto-acceptedredmatrix2016-06-152-1/+11
| | | * | | DB schema issue with importredmatrix2016-06-121-12/+26
| | | * | | Apply purify_html to page content before preview and save to prevent JavaScri...Andrew Manning2016-06-121-1/+1
| | * | | | When picktime is false, close date selector on date selectOda2016-06-181-1/+1
| | * | | | issue #386 (master)redmatrix2016-05-161-1/+1
| | * | | | issue #383redmatrix2016-05-141-1/+0
| | * | | | SECURITY: edited comment to private post loses privacy info. Not visible in s...redmatrix2016-05-121-0/+10
* | | | | | Merge branch 'dev' into sabre32Mario Vavti2016-06-202-11/+16
|\| | | | |
| * | | | | Don't use count() to check DB resultsredmatrix2016-06-192-11/+16
* | | | | | Merge branch 'dev' into sabre32Mario Vavti2016-06-184-2/+9
|\| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-12 05:04:42 +0000