Commit Graph

412 Commits

Author SHA1 Message Date
zotlabs
eda7c5369c event attendance testing continued (now works at a basic level from one direction, more testing needed) 2019-01-16 21:09:04 -08:00
zotlabs
e9f709301c more z6 event work 2019-01-16 17:32:16 -08:00
zotlabs
7e29bd10b6 Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge 2019-01-16 16:52:21 -08:00
zotlabs
20eea2184b more work on z6 events 2019-01-16 16:50:44 -08:00
zotlabs
eaa375936f more z6 compatibility fixes 2019-01-16 15:28:30 -08:00
Mario Vavti
a1ac507a94 change logic for consistency 2019-01-16 10:02:13 +01:00
Mario Vavti
ad6eb15eac fix legacy zot dreport not passing the is_storable check 2019-01-15 22:36:01 +01:00
Mario Vavti
df4b6f0376 Merge remote-tracking branch 'mike/master' into dev 2019-01-09 10:25:04 +01:00
zotlabs
39de8e28da make Apps::get_base_apps() pluggable 2019-01-08 14:14:55 -08:00
DM42.Net (Matt Dent)
563a5088be Tweak to deal with changes that may happen within the same second. 2019-01-07 19:48:14 -05:00
zotlabs
7a55dd512a reverse activity mapping improvements 2018-12-19 20:03:31 -08:00
zotlabs
a33ed05bec fix default values for affinity tool and other information which could be lost when approving a connection without the entire form provided by connedit. 2018-12-17 11:32:59 -08:00
zotlabs
6464099364 regression: the ability to order apps messed up since adding pinned apps to the ordering 2018-12-12 19:11:30 -08:00
zotlabs
42aeb19562 partial solution for obj|tgt multiple (zot and zot6) encodings; the zot6 version will be stored under $item['obj']['asld'] 2018-12-03 20:09:57 -08:00
zotlabs
ffc3dba682 Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge 2018-12-03 19:19:31 -08:00
zotlabs
1acc5ceb5f more merging 2018-12-03 19:18:20 -08:00
zotlabs
7d694dca07 more work on z6 commenting 2018-12-03 18:50:45 -08:00
Mario Vavti
237c6eed50 fallback to url if we have not got an addr
(cherry picked from commit a3ba7f0788)
2018-12-02 11:39:04 +01:00
zotlabs
c6acb6191c allow notification filtering by name or addr 2018-11-30 19:03:14 -08:00
zotlabs
c5a9b00eae Organization actor type was missing 2018-11-23 12:25:05 -08:00
zotlabs
ea235c0c67 no mention notifications from mastodon (and pleroma) 2018-11-21 20:03:58 -08:00
zotlabs
6481c9dca1 use this form instead 2018-11-19 15:20:28 -08:00
zotlabs
7aaa1973f4 push recent changes 2018-11-19 15:04:08 -08:00
zotlabs
b0689614bf datetime_convert wrong args 2018-11-15 21:14:14 -08:00
zotlabs
39d914c9df add item.uuid to relevant places 2018-11-15 16:34:09 -08:00
zotlabs
b11858bcac separate by network 2018-11-14 20:34:00 -08:00
zotlabs
ab2376f8d8 fix dreport link 2018-11-14 17:42:02 -08:00
zotlabs
cfc43f6dea Merge branch 'master' into zvi 2018-11-13 20:37:52 -08:00
zotlabs
770fdb2b7d dreport updates 2018-11-12 16:08:22 -08:00
zotlabs
4a6b45cf04 enotify::format hook for superblock 2018-11-12 11:13:36 -08:00
zotlabs
da452decf6 more z6 debugging 2018-11-11 15:12:01 -08:00
zotlabs
d2aa2c080f Merge branch 'master' into zvi 2018-11-07 01:43:43 -08:00
zotlabs
bb8b3b9291 this is brutal 2018-11-06 20:44:40 -08:00
zotlabs
fabcf841c9 z6 work 2018-11-05 19:34:10 -08:00
Mario
d6523c67a6 Merge branch 'patch-20181028a' into 'dev'
Add timestamp to pconfig

See merge request hubzilla/core!1355
2018-11-05 10:40:29 +01:00
zotlabs
73d2719330 debug zot6 discovery 2018-11-04 19:35:55 -08:00
M.Dent
0060f88c45 Add tracking of deleted pconfig variables 2018-10-29 23:04:13 -04:00
M.Dent
1241e778f9 Fix to set update time in pconfig on update 2018-10-28 17:30:22 -04:00
M.Dent
3ab0ef1902 Add timestamp and associated logic to pconfig 2018-10-28 17:23:31 -04:00
Mario Vavti
3588c4ab99 allow to undelete deleted base apps 2018-10-15 15:43:55 +02:00
M.Dent
bad4ea6e65 Add wiki_preprocess hook and documentation 2018-10-10 22:46:00 -04:00
Mario Vavti
d29caa099a fix some more wiki issues 2018-10-10 10:39:28 +02:00
M.Dent
709665846e Rework Wiki encoding scheme. 2018-10-08 13:35:18 -04:00
M.Dent
93a310582f Implement custom escaping 2018-10-08 13:35:18 -04:00
Mario Vavti
5acd166d18 Merge remote-tracking branch 'mike/master' into dev 2018-10-07 08:39:29 +02:00
Mario Vavti
96277372d5 rename grid to network (for consistency) and activity to stream (as seen in osada) because it makes much more sense. 2018-10-06 16:40:30 +02:00
Mario Vavti
453ce4df3b admin should not be an app imho - we can not install/delete admin abilities. Remove suggest channels from base apps. 2018-10-06 15:12:13 +02:00
Mario Vavti
9850d18420 gallery is not a core app 2018-10-06 15:00:28 +02:00
Mario Vavti
c2c891723f bookmark app 2018-10-06 14:48:12 +02:00
zotlabs
835e222af0 minor app cleanup 2018-10-05 16:27:50 -07:00