aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-11-159-48/+113
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-11-1421-261/+656
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-11-1219-32/+326
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-11-097-3/+35
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use loggerzotlabs2017-11-081-2/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-11-0812-21/+426
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-11-0615-108/+126
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-11-042092-505289/+492863
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | preserve reverse date sort in mod_search after changeszotlabs2018-01-211-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-01-214-11/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | make sure we deal with lowercase string in all situationsMario Vavti2018-01-211-3/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | css fixMario Vavti2018-01-201-1/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use var instead of thisMario Vavti2018-01-191-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wrong classMario Vavti2018-01-191-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | make sure we deal with stringsMario Vavti2018-01-192-6/+6
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | input event is catching more situations than keyupMario Vavti2018-01-191-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | only show clear button if there is something to clearMario Vavti2018-01-191-3/+8
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bootstrap seems to heavy for this - use custom cssMario Vavti2018-01-192-7/+11
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | provide a button to clear the name filterMario Vavti2018-01-191-2/+12
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-01-199-87/+96
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #960 from einervonvielen/CalDAV-CardDAV-on-Androidgit-marijus2018-01-191-0/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | How to use CalDAV and CardDAV with Androids DAVDroidEiner von Vielen2018-01-181-0/+17
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #962 from dawnbreak/devgit-marijus2018-01-191-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_search: fix the group by messzotlabs2018-01-212-13/+14
| |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | zot api: provide channel list function (list all channel usernames [e.g. chan...zotlabs2018-01-181-0/+24
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove deprecated 'qcomment' feature; unused since 2012zotlabs2018-01-184-30/+0
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dev' of https://github.com/dawnbreak/hubzillazotlabs2018-01-181-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change dsn port handling in dba_pdo.Klaus Weidenbach2018-01-181-2/+2
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | simplify webserver logic flow, remove obsolete $a from routerzotlabs2018-01-182-34/+47
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-01-1810-182/+102
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-01-188-29/+37
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2018-01-181-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #957 from einervonvielen/homeinstall-fix-cron-devgit-marijus2018-01-181-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed poller. Use Master.phpEiner von Vielen2018-01-141-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | consolidate navbar tucson and some javascript cleanupMario Vavti2018-01-185-173/+48
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | raise the queue threshold default from 300 to 3000Mario Vavti2018-01-181-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bump versionMario Vavti2018-01-181-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | implement notifications name filter and slightly change the way we load notif...Mario Vavti2018-01-183-11/+56
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | simplify interactions with the get_features hook by calling it before any fil...zotlabs2018-01-182-23/+25
| |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | provide local pubstream option (content from this site only).zotlabs2018-01-173-4/+16
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | simplify dir_tagadelic dramaticallyzotlabs2018-01-172-19/+8
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use mid/parent_mid to trigger $top_level_postzotlabs2018-01-171-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-01-171-1/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | section-content-info-wrapper for register textMario Vavti2018-01-161-1/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-01-165-4/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove sendzid core code from core (put in plugin where it belongs)zotlabs2018-01-172-5/+12
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-01-159-11/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix some regressions with permission rolesMario Vavti2018-01-157-10/+8
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2018-01-152-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added minimum registration age to /admin/site settings pageAndrew Manning2018-01-142-1/+4
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / /