Commit graph

2688 commits

Author SHA1 Message Date
Mario Vavti
2f6cb764a4 prepare submodule to interact with route 2018-09-17 10:30:47 +02:00
zotlabs
30154b0f0b Merge branch 'zap' into dev 2018-09-16 22:07:35 -07:00
zotlabs
ea2db5d7aa Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-16 22:07:18 -07:00
zotlabs
dad5039b09 Merge branch 'dev' 2018-09-16 22:04:54 -07:00
zotlabs
6ccbb9a14d Merge branch 'dev' into 1.0 2018-09-16 22:04:44 -07:00
zotlabs
cf64349379 usort : use class function 2018-09-16 22:04:11 -07:00
zotlabs
0eb1752ed5 duplicate 2018-09-16 21:45:44 -07:00
zotlabs
f0266b4837 Merge branch 'zap' into dev 2018-09-16 21:43:20 -07:00
zotlabs
8d565a8305 Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-16 21:43:06 -07:00
zotlabs
943edb4c14 simplify AP discovery 2018-09-16 21:42:41 -07:00
zotlabs
e9f862b2d6 Merge branch 'dev' 2018-09-16 21:42:28 -07:00
zotlabs
488cf522ed Merge branch 'dev' into 1.0 2018-09-16 21:42:16 -07:00
zotlabs
0aaaa882ad simplify activitypub discovery 2018-09-16 21:41:24 -07:00
zotlabs
c3a74b3ece setup and channel sync fixes from upstream 2018-09-16 20:01:53 -07:00
M.Dent
a0cf2b53e0 Add hook to allow addons to filter the list returned by app_list 2018-09-16 23:01:17 -04:00
zotlabs
593a5072d9 Some improvements to setup checks: image library and pdo support 2018-09-16 20:00:20 -07:00
zotlabs
27617efbfb Merge branch 'dev' 2018-09-16 19:05:12 -07:00
zotlabs
a8f4091551 Merge branch 'zap' into dev 2018-09-16 18:42:07 -07:00
zotlabs
ee8cdafd92 Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-16 18:41:56 -07:00
zotlabs
f3d8730f42 resolve naming dispute over network app 2018-09-16 18:37:15 -07:00
zotlabs
4005a0217f resolve naming dispute over network app 2018-09-16 18:37:02 -07:00
zotlabs
29f4230474 resolve naming dispute over network app 2018-09-16 18:35:43 -07:00
zotlabs
347e391e51 Merge branch 'dev' into 1.0 2018-09-16 17:07:35 -07:00
zotlabs
3c3f395d24 Merge branch 'zap' into dev 2018-09-16 17:06:34 -07:00
zotlabs
72f098e1c0 Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-16 17:05:54 -07:00
zotlabs
1856d39237 correct owner attribution 2018-09-16 17:05:39 -07:00
zotlabs
d476b46fcf correct owner attribution 2018-09-16 17:04:47 -07:00
Mario Vavti
07cd1d1272 appification of the lang module 2018-09-16 09:30:07 +02:00
Mario Vavti
791ff25d52 appify poke 2018-09-15 11:09:16 +02:00
Mario Vavti
299eb469f8 appify mood 2018-09-15 11:00:41 +02:00
Mario Vavti
0f9a8a43e4 appify invite 2018-09-15 10:48:51 +02:00
Mario Vavti
7856f5882b appify cdav stuff. WARNING: if you use caldav or carddav from a client or the webinterface you will need to enable those apps to make things work again 2018-09-15 10:10:43 +02:00
zotlabs
ca752cfb1f Merge branch 'zap' into dev 2018-09-14 14:38:23 -07:00
zotlabs
d725f9d97f Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-14 14:38:10 -07:00
zotlabs
d6a68b8f8c Merge commit '6734fea' 2018-09-14 14:37:33 -07:00
zotlabs
6734feaa81 Merge commit '3bc079e' into 1.0 2018-09-14 14:37:07 -07:00
zotlabs
3bc079e69e zap issue #3 cannot post to public forum using tag mentions 2018-09-14 14:33:39 -07:00
zotlabs
3bd1df52bf Merge branch 'zap' into dev 2018-09-14 02:19:23 -07:00
zotlabs
097a0e5adc Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-14 02:19:05 -07:00
zotlabs
2542617471 zot6 import authors in hyperdrive mode 2018-09-14 02:18:17 -07:00
zotlabs
8505ae4ab2 zot6 import authors in hyperdrive mode 2018-09-14 02:18:07 -07:00
zotlabs
273a9b12f0 zot6 import authors in hyperdrive mode 2018-09-14 02:16:42 -07:00
zotlabs
c16fa755a8 Merge branch 'zap' into dev 2018-09-13 22:40:23 -07:00
zotlabs
4b7770f28c Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-13 22:40:11 -07:00
zotlabs
f2c7e7bb01 Merge branch 'dev' 2018-09-13 22:39:44 -07:00
zotlabs
048c5f65e2 old protocol string still showing 2018-09-13 22:39:05 -07:00
zotlabs
26e419e032 hardwire group widget = enabled 2018-09-13 21:25:37 -07:00
zotlabs
2b39a93e0f Merge branch 'zap' into dev 2018-09-13 18:44:24 -07:00
zotlabs
980ccf0876 Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-13 18:44:05 -07:00
zotlabs
57d7c81c31 missing call to actor_store 2018-09-13 18:43:23 -07:00
zotlabs
767d1f9889 missing call to actor_store 2018-09-13 18:42:29 -07:00
zotlabs
5cee677014 Merge branch 'zap' into dev 2018-09-13 18:23:00 -07:00
zotlabs
71cc526f7d Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-13 18:22:43 -07:00
zotlabs
9febf8643e chanview not redirecting properly for z6 2018-09-13 18:20:59 -07:00
zotlabs
abeb19416e chanview not redirecting properly for z6 2018-09-13 18:19:54 -07:00
Mario Vavti
869534fafa remove network_tabs() which has been deprecated and replaced by activity_{order, filters} widgets 2018-09-13 11:53:59 +02:00
Mario Vavti
56f88f2e30 move chat from feature to apps 2018-09-13 11:32:43 +02:00
Mario Vavti
a1d5ce3716 remove profile_tabs() which has been deprecated and replaced by channel_apps() 2018-09-13 10:59:37 +02:00
zotlabs
4a8de535e2 Merge branch 'master' of https://framagit.org/macgirvin/zap 2018-09-12 22:29:29 -07:00
Mario Vavti
2651eae663 mpre feature to app transition 2018-09-12 11:08:53 +02:00
zotlabs
1d9c5eb821 Merge branch 'zap' into dev 2018-09-11 22:23:48 -07:00
zotlabs
3fdb9f3cfd Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-11 22:23:32 -07:00
zotlabs
73ae895e5c abook sync issue 2018-09-11 22:21:31 -07:00
zotlabs
fda9a36505 Merge branch 'zap' into dev 2018-09-11 17:41:22 -07:00
zotlabs
eb3a5349db Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-11 17:37:54 -07:00
zotlabs
f9b344ac4d runtime errors 2018-09-11 17:35:31 -07:00
zotlabs
66cd2dc7e4 cleanup 2018-09-11 16:58:26 -07:00
zotlabs
67ae00ae2f it's alive 2018-09-11 03:36:31 -07:00
Mario Vavti
28e4977c33 include item.title in /network and /channel search 2018-09-11 11:16:58 +02:00
zotlabs
adc164b825 Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge 2018-09-10 22:11:26 -07:00
zotlabs
04a5ebf8c0 Merge branch 'zap' into dev 2018-09-10 18:39:15 -07:00
zotlabs
e45583c794 Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-10 18:37:51 -07:00
zotlabs
f2e8d9f032 more hyperdrive 2018-09-10 18:36:52 -07:00
Mario Vavti
c6abe87ec2 move cards from features to apps 2018-09-10 13:34:05 +02:00
zotlabs
c960c91a8d wrong mimetype 2018-09-09 23:29:14 -07:00
zotlabs
44df4d785e Merge branch 'zap' into dev 2018-09-09 23:23:42 -07:00
zotlabs
ddb50b8de4 Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-09 23:17:23 -07:00
zotlabs
44af74af3b tweaks 2018-09-09 23:16:58 -07:00
zotlabs
c4dc8b9cca hyperdrive stuff 2018-09-09 23:15:59 -07:00
zotlabs
b837f0b8fc Merge branch 'red' into dev 2018-09-09 20:59:13 -07:00
zotlabs
abfb17ef33 hyperdrive work 2018-09-09 20:55:51 -07:00
zotlabs
be3b630474 important hyperdrive component 2018-09-09 20:53:20 -07:00
zotlabs
e1b0570690 assorted fixes 2018-09-09 18:28:13 -07:00
Mario Vavti
9607bb29fd missing text 2018-09-07 14:58:16 +02:00
Mario Vavti
d29415a6e2 provide a noscript_content switch for mod channel and display 2018-09-07 14:23:16 +02:00
zotlabs
20520b2ecc merge from downstream 2018-09-07 04:47:53 -07:00
zotlabs
39d295462e merge from downstream 2018-09-07 04:46:57 -07:00
zotlabs
0a36bc3eab like parents 2018-09-07 04:44:49 -07:00
Mario Vavti
54fa28441c install bootstrap via composer 2018-09-07 11:26:02 +02:00
Mario Vavti
bb42ec2bfc apps: change page title to available/installed, display install action label in button and use different icons for installable and updateable apps 2018-09-07 10:39:15 +02:00
zotlabs
5079b44d08 undeclared var 2018-09-06 22:52:48 -07:00
zotlabs
235c0a2865 signature changes 2018-09-06 21:55:30 -07:00
zotlabs
6f2284ba18 missing observer 2018-09-06 21:51:52 -07:00
zotlabs
667f8ed920 delivery optimisations 2018-09-06 21:24:56 -07:00
zotlabs
00eeb680d9 set a process timeout for fetching remote xchan photos 2018-09-06 18:33:27 -07:00
zotlabs
61165cbb37 merge 2018-09-06 17:50:45 -07:00
zotlabs
a1cf08ac36 Merge branch 'zap' into dev 2018-09-06 17:44:12 -07:00
zotlabs
4005c484c1 Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-06 17:42:01 -07:00
zotlabs
551e7b332a move xchan_photo import to background 2018-09-06 17:37:09 -07:00
zotlabs
b77eac2ae8 move xchan_photo processing to background 2018-09-06 17:36:35 -07:00