Commit graph

20935 commits

Author SHA1 Message Date
Mario Vavti
66e1e5b1b6 bootstrap seems to heavy for this - use custom css 2018-01-19 12:18:59 +01:00
Mario Vavti
ecd161d678 provide a button to clear the name filter 2018-01-19 11:40:16 +01:00
Mario Vavti
e9f32ef94e Merge remote-tracking branch 'mike/master' into dev 2018-01-19 09:16:51 +01:00
git-marijus
2cf4381e19
Merge pull request #960 from einervonvielen/CalDAV-CardDAV-on-Android
How to use CalDAV and CardDAV with Androids DAVDroid
2018-01-19 09:15:49 +01:00
git-marijus
0844fb8d8a
Merge pull request #962 from dawnbreak/dev
Change dsn port handling in dba_pdo.
2018-01-19 09:10:28 +01:00
zotlabs
764d6e3407 zot api: provide channel list function (list all channel usernames [e.g. channel_address] associated with the logged in account) 2018-01-18 17:20:30 -08:00
zotlabs
b2ab906483 remove deprecated 'qcomment' feature; unused since 2012 2018-01-18 17:02:59 -08:00
zotlabs
6943960f99 Merge branch 'dev' of https://github.com/dawnbreak/hubzilla 2018-01-18 16:08:27 -08:00
zotlabs
858a6270d5 simplify webserver logic flow, remove obsolete $a from router 2018-01-18 15:36:46 -08:00
Klaus Weidenbach
8a60bb4619 Change dsn port handling in dba_pdo. 2018-01-18 23:46:49 +01:00
zotlabs
03d3cbdbf8 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2018-01-18 14:17:48 -08:00
zotlabs
89aa882c95 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2018-01-18 14:17:33 -08:00
zotlabs
0fba1bb868 simplify interactions with the get_features hook by calling it before any filtering takes place 2018-01-18 14:11:15 -08:00
Einer von Vielen
fad381586c How to use CalDAV and CardDAV with Androids DAVDroid 2018-01-18 22:39:17 +01:00
Mario Vavti
a0e1a8e0a2 Merge remote-tracking branch 'mike/master' into dev 2018-01-18 13:20:23 +01:00
Mario Vavti
a486c90686 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev 2018-01-18 12:44:57 +01:00
Mario Vavti
53e353abf2 consolidate navbar tucson and some javascript cleanup 2018-01-18 12:44:40 +01:00
git-marijus
dd45d0a8b2
Merge pull request #957 from einervonvielen/homeinstall-fix-cron-dev
Fixed poller. Use Master.php
2018-01-18 11:39:23 +01:00
Mario Vavti
23a20ba6a5 raise the queue threshold default from 300 to 3000 2018-01-18 11:30:33 +01:00
Mario Vavti
299b9e9014 bump version 2018-01-18 11:25:59 +01:00
Mario Vavti
21d081e175 implement notifications name filter and slightly change the way we load notification to the ui 2018-01-18 11:22:30 +01:00
zotlabs
eb86ffefbf provide local pubstream option (content from this site only). 2018-01-17 21:30:19 -08:00
zotlabs
f1afb0ddfe simplify dir_tagadelic dramatically 2018-01-17 20:10:49 -08:00
zotlabs
561372e203 use mid/parent_mid to trigger $top_level_post 2018-01-17 18:28:13 -08:00
zotlabs
66f48847c9 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2018-01-17 18:28:02 -08:00
zotlabs
62e3083f23 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2018-01-17 18:27:45 -08:00
zotlabs
c331e585b8 remove sendzid core code from core (put in plugin where it belongs) 2018-01-17 15:25:30 -08:00
zotlabs
05de59d4ad initial z6 delivery 2018-01-16 20:08:10 -08:00
zotlabs
2de1285121 z6 deliver 2018-01-16 18:15:58 -08:00
Mario Vavti
647a9b2740 section-content-info-wrapper for register text 2018-01-16 22:10:52 +01:00
Mario Vavti
9aadcb0bd4 Merge remote-tracking branch 'mike/master' into dev 2018-01-16 08:55:42 +01:00
zotlabs
82306682c6 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2018-01-15 21:49:48 -08:00
zotlabs
05f9f0a393 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2018-01-15 21:49:28 -08:00
zotlabs
03f692f24f surface the article feature 2018-01-15 21:46:27 -08:00
zotlabs
014a1f0158 add summary bbcode tag 2018-01-15 20:47:32 -08:00
Mario Vavti
746ea5a369 fix some regressions with permission roles 2018-01-15 11:34:42 +01:00
Mario Vavti
d868ebe4ba Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev 2018-01-15 08:56:41 +01:00
Mario Vavti
b49e09939a Merge remote-tracking branch 'mike/master' into dev 2018-01-15 08:56:15 +01:00
zotlabs
91db66b32d move markdown-in-posts/comments feature to plugin 2018-01-14 18:22:58 -08:00
zotlabs
f0faa7f9b0 support tables in markdown posts/comments (but not table alignment); and do not support iframes from html source. 2018-01-14 16:45:33 -08:00
Andrew Manning
ef11b3eb2b Added minimum registration age to /admin/site settings page 2018-01-14 15:02:43 -05:00
Einer von Vielen
3ab92ba9d9 Fixed poller. Use Master.php 2018-01-14 18:33:08 +01:00
Mario Vavti
8970d30c93 Merge remote-tracking branch 'mike/master' into dev 2018-01-14 07:42:58 +01:00
zotlabs
75285fd452 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2018-01-13 15:55:04 -08:00
zotlabs
76c8bbf7b8 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2018-01-13 15:54:45 -08:00
zotlabs
eb3e43feec cleanup of last fix 2018-01-13 14:08:15 -08:00
zotlabs
08bea83c03 unexpected openssl result 2018-01-13 13:45:33 -08:00
zotlabs
8892568652 improve owa logging 2018-01-13 12:24:55 -08:00
Mario Vavti
ce10a44e72 Merge remote-tracking branch 'mike/master' into dev 2018-01-12 22:44:59 +01:00
Mario Vavti
0f5bc00586 update league/html-to-markdown via composer 2018-01-12 22:32:42 +01:00