Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_search: fix the group by mess | zotlabs | 2018-01-21 | 2 | -13/+14 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #10 from redmatrix/dev | mrjive | 2018-01-22 | 26 | -300/+274 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | make sure we deal with lowercase string in all situations | Mario Vavti | 2018-01-21 | 1 | -3/+3 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | css fix | Mario Vavti | 2018-01-20 | 1 | -1/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use var instead of this | Mario Vavti | 2018-01-19 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wrong class | Mario Vavti | 2018-01-19 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | make sure we deal with strings | Mario Vavti | 2018-01-19 | 2 | -6/+6 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | input event is catching more situations than keyup | Mario Vavti | 2018-01-19 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | only show clear button if there is something to clear | Mario Vavti | 2018-01-19 | 1 | -3/+8 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bootstrap seems to heavy for this - use custom css | Mario Vavti | 2018-01-19 | 2 | -7/+11 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | provide a button to clear the name filter | Mario Vavti | 2018-01-19 | 1 | -2/+12 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-01-19 | 9 | -87/+96 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | zot api: provide channel list function (list all channel usernames [e.g. chan... | zotlabs | 2018-01-18 | 1 | -0/+24 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove deprecated 'qcomment' feature; unused since 2012 | zotlabs | 2018-01-18 | 4 | -30/+0 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dev' of https://github.com/dawnbreak/hubzilla | zotlabs | 2018-01-18 | 1 | -2/+2 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | simplify webserver logic flow, remove obsolete $a from router | zotlabs | 2018-01-18 | 2 | -34/+47 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-01-18 | 10 | -182/+102 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | simplify interactions with the get_features hook by calling it before any fil... | zotlabs | 2018-01-18 | 2 | -23/+25 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #960 from einervonvielen/CalDAV-CardDAV-on-Android | git-marijus | 2018-01-19 | 1 | -0/+17 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | How to use CalDAV and CardDAV with Androids DAVDroid | Einer von Vielen | 2018-01-18 | 1 | -0/+17 | |
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #962 from dawnbreak/dev | git-marijus | 2018-01-19 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change dsn port handling in dba_pdo. | Klaus Weidenbach | 2018-01-18 | 1 | -2/+2 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-01-18 | 8 | -29/+37 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | provide local pubstream option (content from this site only). | zotlabs | 2018-01-17 | 3 | -4/+16 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | simplify dir_tagadelic dramatically | zotlabs | 2018-01-17 | 2 | -19/+8 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use mid/parent_mid to trigger $top_level_post | zotlabs | 2018-01-17 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-01-17 | 1 | -1/+3 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove sendzid core code from core (put in plugin where it belongs) | zotlabs | 2018-01-17 | 2 | -5/+12 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-01-15 | 9 | -11/+12 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2018-01-18 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #957 from einervonvielen/homeinstall-fix-cron-dev | git-marijus | 2018-01-18 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed poller. Use Master.php | Einer von Vielen | 2018-01-14 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | consolidate navbar tucson and some javascript cleanup | Mario Vavti | 2018-01-18 | 5 | -173/+48 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | raise the queue threshold default from 300 to 3000 | Mario Vavti | 2018-01-18 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bump version | Mario Vavti | 2018-01-18 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | implement notifications name filter and slightly change the way we load notif... | Mario Vavti | 2018-01-18 | 3 | -11/+56 | |
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #8 from redmatrix/dev | mrjive | 2018-01-18 | 1 | -1/+3 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | section-content-info-wrapper for register text | Mario Vavti | 2018-01-16 | 1 | -1/+3 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #7 from redmatrix/dev | mrjive | 2018-01-16 | 569 | -20244/+34966 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-01-16 | 5 | -4/+21 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | surface the article feature | zotlabs | 2018-01-15 | 4 | -4/+6 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add summary bbcode tag | zotlabs | 2018-01-15 | 1 | -0/+15 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix some regressions with permission roles | Mario Vavti | 2018-01-15 | 7 | -10/+8 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2018-01-15 | 2 | -1/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added minimum registration age to /admin/site settings page | Andrew Manning | 2018-01-14 | 2 | -1/+4 | |
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-01-15 | 3 | -27/+19 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | move markdown-in-posts/comments feature to plugin | zotlabs | 2018-01-14 | 2 | -19/+10 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | support tables in markdown posts/comments (but not table alignment); and do n... | zotlabs | 2018-01-14 | 1 | -8/+9 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-01-13 | 37 | -4210/+11772 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-01-14 | 3 | -4/+9 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |