Commit graph

2070 commits

Author SHA1 Message Date
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
44ca674937 Merge branch 'red' into dev 2018-09-05 21:18:14 -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
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
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
29f809f078 clean up the admin summary page 2018-08-23 17:31:41 -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