Commit graph

2227 commits

Author SHA1 Message Date
zotlabs
74b59450f8 rev update 2019-04-07 18:09:07 -07:00
zotlabs
8f4a3723da the rest of the stuff to support collections 2019-04-03 16:22:03 -07:00
Mike Macgirvin
e875a2b6a7 fix version 2019-04-02 06:28:11 +11:00
Mike Macgirvin
691ecb4c0b Merge branch 'master' of https://gitlab.com/macgirvin/zap 2019-03-31 10:01:29 +11:00
Mike Macgirvin
c00f5118a0 Merge branch 'dev' of https://gitlab.com/macgirvin/zap 2019-03-31 10:00:19 +11:00
zotlabs
5bcf392816 add hierarchy to channels for collection support and other purposes 2019-03-29 13:27:23 -07:00
zotlabs
4a98388904 rev update 2019-03-27 21:18:02 -07:00
zotlabs
26f31b9926 Merge branch 'dev' 2019-03-27 21:17:30 -07:00
zotlabs
4d48f5e7bf make moderation notifications go to the right place 2019-03-27 19:20:35 -07:00
zotlabs
1595bdc2aa cleanup/remove unused xchan fields 2019-03-24 18:40:33 -07:00
zotlabs
dd2c86aaf9 Merge branch 'dev' 2019-03-19 15:25:32 -07:00
zotlabs
b9c0c4e282 rev update 2019-03-17 17:34:57 -07:00
zotlabs
d4e1c9943b Merge branch 'dev' 2019-03-17 17:27:38 -07:00
zotlabs
a1af668815 more work to support collections 2019-03-05 17:27:16 -08:00
zotlabs
1aa56aa76b add moderated permission 2019-02-28 15:14:22 -08:00
zotlabs
725f7e18ed bump version 2019-02-25 15:44:31 -08:00
zotlabs
25037b579c bump version 2019-02-25 15:43:50 -08:00
zotlabs
ef078665a0 Merge branch 'dev' 2019-02-25 15:42:28 -08:00
zotlabs
c5b267a21e rev update 2019-02-24 15:15:44 -08:00
zotlabs
466de65b35 add item uuid 2019-02-19 14:59:22 -08:00
zotlabs
bbee00d47a update for 2.4RC 2019-02-17 21:07:21 -08:00
zotlabs
8b5bc7303f more work zot+ 2019-02-13 19:55:36 -08:00
zotlabs
23a67081d9 misc fixes from the logs and upstream 2019-02-05 19:01:17 -08:00
zotlabs
75cb386eb6 rev update 2019-01-18 13:18:47 -08:00
zotlabs
bf39206518 store item_level to avoid a lot of recursion during rendering 2019-01-14 14:47:05 -08:00
zotlabs
ff4b1331db reset system apps 2018-12-29 14:40:10 -08:00
zotlabs
ad5381545a affinity slider issues after approving connections 2018-12-17 01:59:17 -08:00
zotlabs
7e4fc5c438 completion of crypto cleanup 2018-12-16 20:37:43 -08:00
zotlabs
4deda0c9fe rev update 2018-12-09 14:16:23 -08:00
zotlabs
67ebc86812 config updates 2018-11-20 19:15:15 -08:00
zotlabs
8f6b1c1239 comment delivery issue 2018-11-18 21:53:09 -08:00
zotlabs
0adf2f3290 rev update 2018-11-11 17:49:38 -08:00
zotlabs
fc63913421 Mastodon notification issues 2018-11-07 18:24:22 -08:00
zotlabs
6378cb8f27 miscellaneous fixes, unset project icon, onepoll feed failure 2018-10-20 02:03:31 -07:00
zotlabs
b40115111d rev update 2018-10-16 20:59:54 -07:00
zotlabs
4c758c73aa define platform_name after reading htconfig 2018-10-03 19:23:59 -07:00
zotlabs
bd5d6158a1 zap/osada repo merger 2018-10-03 19:10:52 -07:00
zotlabs
290b8b58ec rename groups and group_members tables 2018-09-25 17:50:59 -07:00
zotlabs
6f6d54d378 cleanup 2018-09-25 17:50:12 -07:00
zotlabs
cd8150f20d push version 2018-09-23 18:23:28 -07:00
zotlabs
551314201c Merge branch 'zap' into dev 2018-09-19 20:48:14 -07:00
zotlabs
d6f3867c06 ACTIVITY_CREATE defined twice 2018-09-19 20:45:42 -07:00
Mike Macgirvin
8b18c99058 reset version 2018-09-20 12:35:16 +10:00
zotlabs
cfbb7960c7 revert change to std_version after merging from master 2018-09-14 14:48:29 -07:00
zotlabs
96b713eb26 version 2018-09-12 22:33:17 -07:00
zotlabs
3bf479ac68 version 2018-09-12 22:21:43 -07:00
zotlabs
44df4d785e Merge branch 'zap' into dev 2018-09-09 23:23:42 -07:00
zotlabs
b837f0b8fc Merge branch 'red' into dev 2018-09-09 20:59:13 -07:00
zotlabs
be3b630474 important hyperdrive component 2018-09-09 20:53:20 -07:00
zotlabs
3ff96239f6 typo 2018-09-06 17:00:42 -07:00
zotlabs
7b492d2bd3 federated emoji support 2018-09-06 16:40:13 -07:00
zotlabs
44ca674937 Merge branch 'red' into dev 2018-09-05 21:18:14 -07:00
zotlabs
c2c9e45f1c rev update 2018-09-05 16:58:27 -07:00
zotlabs
a33638281e version 2018-09-05 16:55:47 -07:00
zotlabs
696d5fc350 version 2018-09-05 16:48:59 -07:00
zotlabs
b90495f95d RC candidate 2018-09-05 16:37:06 -07:00
Mario Vavti
75e8aa8aee bump version 2018-09-05 12:19:52 +02:00
zotlabs
9282a6a40b Merge branch 'zap' 2018-08-30 21:30:46 -07:00
zotlabs
fc6f5fc320 Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap 2018-08-30 21:29:21 -07:00
zotlabs
d00648f3e1 Merge branch 'red' 2018-08-30 21:27:20 -07:00
Mario Vavti
42093aedcf db update to get rid of bogus activitypub xchans which got created due to a bug in the pubcrawl addon 2018-08-29 13:57:36 +02:00
zotlabs
1ec12c6a04 Merge branch 'zap' 2018-08-26 23:44:01 -07:00
zotlabs
8e24ee9471 Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap 2018-08-26 23:42:29 -07:00
zotlabs
9beda708de Change main router request variable from 'q' to 'req'. This is necessary to implement search in the twitter api addon, because twitter requires use of the variable 'q'. 2018-08-26 23:35:29 -07:00
zotlabs
403312140c Merge branch 'zap' 2018-08-23 17:35:04 -07:00
zotlabs
ed0f780231 Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap 2018-08-23 17:33:51 -07:00
zotlabs
29f809f078 clean up the admin summary page 2018-08-23 17:31:41 -07:00
zotlabs
9ce94bd414 product name 2018-08-22 17:53:17 -07:00
zotlabs
bc06233d10 Merge branch 'red' 2018-08-20 22:24:44 -07:00
zotlabs
066febdf40 Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge 2018-08-20 20:20:57 -07:00
zotlabs
57e75d9332 add affinity app and start some serious refactoring of mod_photos 2018-08-16 23:01:31 -07:00
zotlabs
e5529938ea Suppress duplicate info() messages. This was done long for notice(), but info() was overlooked at that time. 2018-08-16 12:35:57 -07:00
Mario Vavti
10c5b46e3b Merge remote-tracking branch 'mike/master' into dev 2018-08-14 13:04:37 +02:00
M. Dent
94393d27c8 Override helpfiles 2018-08-14 13:03:26 +02:00
zotlabs
f15c1c4e54 hubloc DB changes needed for z6 2018-08-13 21:18:20 -07:00
zotlabs
248d20c347 Merge branch 'red' 2018-08-13 20:36:40 -07:00
M.Dent
b436c4a94c Add support for overriding the default template location and individual templates via .htconfig.php 2018-08-12 19:47:10 -04:00
zotlabs
aeb9d5cd90 create alter_pdl hook 2018-08-05 23:19:33 -07:00
zotlabs
8e9d076216 ability for addons to create .pdl files and load them automatically 2018-08-04 13:50:49 -07:00
zotlabs
d908f53607 add app_options field 2018-08-02 22:49:30 -07:00
zotlabs
a87d5aa730 Merge branch 'red' into red_merge 2018-07-30 18:22:25 -07:00
zotlabs
1def8da7bc fix unsanitised xchan_name 2018-07-29 17:36:05 -07:00
zotlabs
5ec73e6862 Revert "Merge branch 'red'"
This reverts commit 159f24afe3, reversing
changes made to dd899418c1.
2018-07-29 17:17:33 -07:00
zotlabs
159f24afe3 Merge branch 'red' 2018-07-29 16:48:14 -07:00
Mario Vavti
643b6f0aa3 version 2018-07-29 07:00:30 +02:00
zotlabs
9701516228 fix unsanitised xchan_name 2018-07-28 17:17:12 -07:00
zotlabs
07e526693e update the zot api (xchan store), plus a couple of typos 2018-07-19 17:14:37 -07:00
zotlabs
5d94cfba4a Merge branch 'red' 2018-07-19 13:48:32 -07:00
zotlabs
6adbb93f0a fix the filtered query string so it can potentially be re-used as is. 2018-07-19 13:42:57 -07:00
zotlabs
13d19d42cb Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge 2018-07-18 19:14:21 -07:00
zotlabs
f8ed09b3fa Merge branch 'red' 2018-07-18 18:55:28 -07:00
zotlabs
ec852b0c8d typo 2018-07-18 17:51:10 -07:00
zotlabs
a05c8ff66b query filter was a bit greedy 2018-07-18 17:48:23 -07:00
Mario Vavti
c2e819771f version 3.7 2018-07-18 11:56:26 +02:00
Mario Vavti
5fd1674d50 version 3.6RC 2018-07-18 11:39:22 +02:00
zotlabs
6baf4441e0 get rid of the deprecated location message type 2018-07-17 17:26:26 -07:00
zotlabs
731e9b9dad update site import 2018-07-16 20:04:47 -07:00
zotlabs
444de76ee6 Merge branch 'red' 2018-07-15 18:47:55 -07:00
M. Dent
38cc88c861 Hookable csp mr 2018-07-13 09:34:48 +02:00
zotlabs
b3b6b813f2 upstream/downstream comment work 2018-07-11 18:02:25 -07:00
zotlabs
47e1c1a7dd move articles to addons, allow addons to provide module pdl files. 2018-07-08 18:33:55 -07:00
zotlabs
cf4a12b173 Merge branch 'dev' 2018-07-04 19:18:05 -07:00
zotlabs
18dbc490fe remove broken include path hack 2018-07-03 18:26:34 -07:00
zotlabs
1b1d9e502c Merge branch 'red' 2018-06-25 21:02:44 -07:00
Mario Vavti
bb786b1f61 version 2018-06-25 14:30:52 +02:00
zotlabs
13d6b254ff Merge branch 'red' 2018-06-13 21:41:11 -07:00
zotlabs
0830fc3a6f whitespace 2018-06-13 21:38:07 -07:00
Mario Vavti
afaa8012c8 bump version 2018-06-09 11:04:56 +02:00
zotlabs
e4649648d1 upgrade the rest of my_perms 2018-06-07 20:17:30 -07:00
zotlabs
38a2493ed0 Merge branch 'red' 2018-06-07 18:44:05 -07:00
Mario Vavti
b3928f3d2a escape query string 2018-06-07 22:45:07 +02:00
Mario Vavti
4e1c32e610 remove gravizot.de from directory fallback servers due to owners request 2018-06-06 17:59:13 +02:00
zotlabs
4524d241a2 Merge branch 'master' into zapp 2018-06-03 17:58:24 -07:00
Mario Vavti
8189408190 finalize filters and forum notifications 2018-06-02 22:11:11 +02:00
zotlabs
191edfdaa1 more heavy lifting 2018-05-31 21:05:09 -07:00
zotlabs
fd4ea47503 move libzot to class 2018-05-31 19:42:13 -07:00
zotlabs
e0a35392f7 more commits 2018-05-29 23:30:18 -07:00
zotlabs
111bb93462 basic communication 2018-05-29 21:08:52 -07:00
zotlabs
b88a683127 zot communications 2018-05-28 19:42:40 -07:00
zotlabs
aa57887dd5 Merge branch 'master' into zapp 2018-05-26 15:13:57 -07:00
Mario Vavti
eb04dbc5ce DB update to fix wrong hubloc_url for activitypub hublocs 2018-05-26 21:15:22 +02:00
zotlabs
21230fb39a Merge branch 'master' into zapp 2018-05-20 20:44:20 -07:00
Mario
469809183d update oauth related tables to use bigint/int(10) for user_id column. this is to be more consistent with the rest of the tables and fixes issue #1180 2018-05-20 22:42:47 +02:00
Mario Vavti
55e1026c98 improve abconfig queries 2018-05-20 20:48:52 +02:00
Mario Vavti
7e99931733 implement jot reset button 2018-05-20 09:23:44 +02:00
Mario Vavti
620e8f2f0b version 2018-05-18 21:30:58 +02:00
zotlabs
060cb1749d update boot 2018-05-18 03:50:04 -07:00
zotlabs
b1629db876 checkin lots of recent zap/zot6 work 2018-05-18 03:09:38 -07:00
zotlabs
e55eb26544 Merge branch 'master' into zapp 2018-05-17 19:33:58 -07:00
zotlabs
c8fc3ad7cd refactor the 'where does the register link point?' logic 2018-05-14 19:19:25 -07:00
Mario Vavti
83f8a03964 bump version 2018-05-13 23:10:13 +02:00
zotlabs
5e6f6e2c3e minor change to test something 2018-05-06 18:10:43 -07:00
Mario Vavti
0895756658 Merge remote-tracking branch 'mike/master' into dev 2018-05-05 10:03:57 +02:00
zotlabs
c6e65ec6da support '@' paths 2018-05-05 00:39:53 -07:00
Mario Vavti
76e644e18a bump version 2018-05-04 12:00:59 +02:00
Mario Vavti
998dd58206 switch DIRECTORY_FALLBACK_MASTER to https://zotadel.net 2018-05-04 09:37:22 +02:00
zotlabs
e26bfd76da Merge branch 'master' into zapp 2018-04-28 13:55:03 -07:00
Mario Vavti
4e389b474a version 2018-04-26 15:41:54 +02:00
Mario Vavti
d5c3363909 bump version 2018-04-25 14:16:47 +02:00
zotlabs
c5fde34192 start to implement the zotinfo detail for zot6 2018-04-22 22:58:28 -07:00
zotlabs
af909f66a7 fix any misconfigured channel permission limits 2018-04-20 15:03:16 -07:00
Mario Vavti
16dcbc1e67 bump version 2018-04-18 08:52:10 +02:00
Mario Vavti
19782655e6 version bump and strings 2018-04-18 08:39:43 +02:00
zotlabs
43e55eb9a6 Active channels information is a bit imprecise. Provide a higher accuracy method. This will require a transition period 2018-04-16 21:40:43 -07:00
Mario Vavti
7543e27eae version and strings update 2018-04-13 22:11:08 +02:00
zotlabs
739a612824 poll responses: start treating them as hidden activities now so that when this feature gets finished it will work flawlessly for versions greater than today. 2018-04-11 21:51:57 -07:00
Mario Vavti
fee258edbe allow to toggle visibility of likes/dislikes in notifications 2018-04-11 11:49:33 +02:00
Mario Vavti
5228462363 bump version 2018-04-09 13:19:22 +02:00
Mario Vavti
aca719ac74 do not use punify() in get_baseurl() due to performance issues 2018-04-04 15:01:16 +02:00
zotlabs
4915a4efbb OAuth2 integration 2018-04-03 21:08:40 -07:00