Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://github.com/dawnbreak/hubzilla | zotlabs | 2018-01-18 | 1 | -2/+2 |
|\ | |||||
| * | Change dsn port handling in dba_pdo. | Klaus Weidenbach | 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 |
|\| | |||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-01-18 | 8 | -29/+37 |
| |\ | |||||
| * \ | 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 | ||||
| | | * | | 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 ↵ | Mario Vavti | 2018-01-18 | 3 | -11/+56 |
| | | | | | | | | | | | | | | | | notification to the ui | ||||
* | | | | simplify interactions with the get_features hook by calling it before any ↵ | zotlabs | 2018-01-18 | 2 | -23/+25 |
| |_|/ |/| | | | | | | | | filtering takes place | ||||
* | | | 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 |
|\| | | |||||
| * | | section-content-info-wrapper for register text | Mario Vavti | 2018-01-16 | 1 | -1/+3 |
| | | | |||||
| * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-01-16 | 5 | -4/+21 |
| |\ \ | |||||
* | | | | 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 |
|\| | | | |/ / |/| | | |||||
| * | | 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 |
| |\ \ | | |/ | |/| | |||||
| * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-01-14 | 3 | -4/+9 |
| |\ \ | |||||
* | | | | surface the article feature | zotlabs | 2018-01-15 | 4 | -4/+6 |
| | | | | |||||
* | | | | add summary bbcode tag | zotlabs | 2018-01-15 | 1 | -0/+15 |
| |_|/ |/| | | |||||
* | | | 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 ↵ | zotlabs | 2018-01-14 | 1 | -8/+9 |
| | | | | | | | | | | | | not support iframes from html source. | ||||
* | | | 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-12 | 1 | -0/+77 |
| |\ | |||||
| * | | update league/html-to-markdown via composer | Mario Vavti | 2018-01-12 | 10 | -390/+379 |
| | | | |||||
| * | | fix some breaking changes with bootstrap 4 beta3 | Mario Vavti | 2018-01-12 | 5 | -5/+5 |
| | | | |||||
| * | | update to bootstrap 4 beta3 | Mario Vavti | 2018-01-12 | 22 | -3814/+11387 |
| | | | |||||
| * | | typo | Mario Vavti | 2018-01-12 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2018-01-12 | 9 | -119/+336 |
| |\ \ | |||||
| * | | | mod hq: stick to show latest unseen toplevel post on load | Mario Vavti | 2018-01-12 | 1 | -2/+2 |
| | | | | |||||
* | | | | cleanup of last fix | zotlabs | 2018-01-13 | 3 | -4/+4 |
| | | | | |||||
* | | | | unexpected openssl result | zotlabs | 2018-01-13 | 3 | -2/+3 |
| | | | | |||||
* | | | | improve owa logging | zotlabs | 2018-01-13 | 1 | -1/+5 |
| | | | | |||||
* | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-01-12 | 13 | -144/+364 |
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| | | |||||
| * | | Merge pull request #951 from dawnbreak/docu | git-marijus | 2018-01-12 | 9 | -119/+336 |
| |\ \ | | |/ | |/| | :bulb: Add source documentation from recent conversations. | ||||
| | * | :bulb: Add source documentation from recent conversations. | Klaus Weidenbach | 2018-01-05 | 9 | -119/+336 |
| | | | | | | | | | | | | | | | | | | There have been some conversations in the last weeks which explained several parts of the code, so add it to the source code documentation. Also some other small source code documentation improvements. | ||||
| * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-01-12 | 3 | -10/+25 |
| |\ \ | |||||
| * | | | continue working on hq | Mario Vavti | 2018-01-11 | 2 | -20/+20 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-01-11 | 18 | -13/+20 |
| |\ \ \ | |||||
| * \ \ \ | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-01-10 | 3 | -4/+6 |
| |\ \ \ \ | |||||
| * | | | | | introduce datasrc2src(selector) js function | Mario Vavti | 2018-01-10 | 2 | -5/+8 |
| | | | | | | |||||
* | | | | | | ability to parse info blocks in third-party (or system) widgets | zotlabs | 2018-01-12 | 1 | -0/+77 |
| |_|_|/ / |/| | | | |