Commit graph

21405 commits

Author SHA1 Message Date
zotlabs
c034fab4da annual license update 2018-01-22 20:59:33 -08:00
zotlabs
4cfd7b65fb siteinfo embellishments 2018-01-22 20:07:08 -08:00
zotlabs
5967360991 hubzilla issue #920 - unable to delete permission groups with space in name 2018-01-22 16:49:45 -08:00
zotlabs
deede8e2dd Merge branch 'dev' 2018-01-22 11:58:12 -08:00
zotlabs
f85c6d76de better notifications for edit post/comments which may have been originally posted long ago 2018-01-22 11:54:53 -08:00
mrjive
131baa9f45
Merge pull request #10 from redmatrix/dev
Dev
2018-01-22 09:34:08 +01:00
zotlabs
629c915f36 ensure filter words are not empty 2018-01-21 23:30:08 -08:00
zotlabs
c994f26dbd preserve reverse date sort in mod_search after changes 2018-01-21 18:11:04 -08:00
zotlabs
886a1a5381 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2018-01-21 17:09:12 -08:00
zotlabs
d4c81d8e0e Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2018-01-21 17:08:39 -08:00
zotlabs
a4588af0f8 mod_search: fix the group by mess 2018-01-21 17:06:38 -08:00
Mario Vavti
1709dbd376 make sure we deal with lowercase string in all situations 2018-01-21 10:27:50 +01:00
Mario Vavti
9937fea2e7 css fix 2018-01-20 08:14:16 +01:00
Mario Vavti
d6fc85f460 use var instead of this 2018-01-19 21:14:32 +01:00
Mario Vavti
db25f2024e wrong class 2018-01-19 20:55:54 +01:00
Mario Vavti
395cf86607 make sure we deal with strings 2018-01-19 20:53:22 +01:00
Mario Vavti
4fb9989b4f input event is catching more situations than keyup 2018-01-19 13:32:08 +01:00
Mario Vavti
40a8e50471 only show clear button if there is something to clear 2018-01-19 12:24:03 +01:00
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
mrjive
8e475810a7
Merge pull request #8 from redmatrix/dev
section-content-info-wrapper for register text
2018-01-18 10:40:15 +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
mrjive
e81949bb09
Merge pull request #7 from redmatrix/dev
Dev
2018-01-16 11:45:01 +01:00