Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-22 01:35:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
22705 commits 7 branches 31 tags 160 MiB
Commit graph

649 commits

Author SHA1 Message Date
zotlabs
b16e5716b7 Merge branch '1.0' 2018-09-17 22:53:19 -07:00
zotlabs
5c21236dc1 Merge branch 'dev' into 1.0 2018-09-17 22:53:04 -07:00
zotlabs
f2c99480f0 generate better photo and event activities 2018-09-17 22:51:27 -07:00
zotlabs
30154b0f0b Merge branch 'zap' into dev 2018-09-16 22:07:35 -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
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
a8f4091551 Merge branch 'zap' into dev 2018-09-16 18:42:07 -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
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
zotlabs
ca752cfb1f Merge branch 'zap' into dev 2018-09-14 14:38:23 -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
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
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
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
Mario Vavti
56f88f2e30 move chat from feature to apps 2018-09-13 11:32:43 +02:00
zotlabs
4a8de535e2 Merge branch 'master' of https://framagit.org/macgirvin/zap 2018-09-12 22:29:29 -07:00
zotlabs
1d9c5eb821 Merge branch 'zap' into dev 2018-09-11 22:23:48 -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
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
zotlabs
04a5ebf8c0 Merge branch 'zap' into dev 2018-09-10 18:39:15 -07:00
zotlabs
f2e8d9f032 more hyperdrive 2018-09-10 18:36:52 -07:00
zotlabs
44df4d785e Merge branch 'zap' into dev 2018-09-09 23:23:42 -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
abfb17ef33 hyperdrive work 2018-09-09 20:55:51 -07:00
zotlabs
e1b0570690 assorted fixes 2018-09-09 18:28:13 -07: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
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
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
b77eac2ae8 move xchan_photo processing to background 2018-09-06 17:36:35 -07:00
zotlabs
acad5df5dc typo 2018-09-06 17:01:16 -07:00
zotlabs
3ff96239f6 typo 2018-09-06 17:00:42 -07:00
zotlabs
91d629fb8e typo 2018-09-06 16:59:19 -07:00
zotlabs
7b492d2bd3 federated emoji support 2018-09-06 16:40:13 -07:00
zotlabs
b38625aef6 Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into dev 2018-09-05 21:23:49 -07:00
zotlabs
44ca674937 Merge branch 'red' into dev 2018-09-05 21:18:14 -07:00
zotlabs
efab473ee2 add comment_policy 2018-09-05 16:30:46 -07:00
zotlabs
46c3a2f196 Merge branch 'zap' 2018-09-04 23:44:56 -07:00
zotlabs
ccf0df2602 set the default profile photo before fetching one, in case the process gets killed. 2018-09-04 23:42:06 -07:00
zotlabs
68634ec02e Merge branch 'zap' 2018-09-04 19:07:06 -07:00
zotlabs
a4cfb0558a set default profile photo is nothing was found 2018-09-04 19:06:19 -07:00
zotlabs
27a982249b Merge branch 'zap' 2018-09-04 18:48:48 -07:00
zotlabs
bd1fa5c360 stream order widget 2018-09-04 18:44:02 -07:00
zotlabs
0aa9c35d0c announce improvements 2018-09-04 04:06:50 -07:00
zotlabs
fb068ac9f7 more tweaks 2018-09-03 21:30:39 -07:00
zotlabs
e2e4dd6f2c more small fixes 2018-09-03 18:23:31 -07:00
zotlabs
6ef4abacb1 more fine tuning 2018-09-03 18:22:31 -07:00
zotlabs
675914c6a5 Merge branch 'zap' 2018-09-02 23:13:30 -07:00
zotlabs
5e47e9d258 use activity url 2018-09-02 23:12:53 -07:00
zotlabs
95c38bcf62 incorrect object reference 2018-09-02 22:59:08 -07:00
zotlabs
3a6df2b12f sync likes and shares 2018-09-02 22:58:30 -07:00
zotlabs
19e06edec8 Merge branch 'zap' 2018-09-02 20:52:00 -07:00
zotlabs
45135e7953 fix the retweet icon 2018-09-02 20:51:17 -07:00
zotlabs
cf2604d104 Merge branch 'zap' 2018-09-02 20:46:40 -07:00
zotlabs
97cc4a2479 attach content missing 2018-09-02 20:45:53 -07:00
zotlabs
ed00b9957b indicate repeated posts 2018-09-02 20:44:15 -07:00
zotlabs
143241a45e Merge branch 'zap' 2018-09-02 20:17:52 -07:00
zotlabs
11a836cf83 sharing changes 2018-09-02 20:16:33 -07:00
zotlabs
931e0b5445 changes to sharing 2018-09-02 20:16:04 -07:00
zotlabs
9b2ae5396e Merge branch 'zap' 2018-09-01 15:56:15 -07:00
zotlabs
8e7fb44896 local compatibility fixes 2018-09-01 15:52:28 -07:00
zotlabs
0954afb321 compatibility fixes 2018-09-01 15:51:44 -07:00
zotlabs
9282a6a40b Merge branch 'zap' 2018-08-30 21:30:46 -07:00
zotlabs
d00648f3e1 Merge branch 'red' 2018-08-30 21:27:20 -07:00
zotlabs
adb1f58b59 some edge cases 2018-08-30 19:19:32 -07:00
zotlabs
2b0c512087 re-parent by default unless there's a "go out on the web and find a parent for this post" plugin. 2018-08-30 18:50:21 -07:00
zotlabs
62e2df4c96 add conversation element and more logging 2018-08-29 23:54:13 -07:00
zotlabs
c48aae55af more debugging 2018-08-29 22:22:06 -07:00
zotlabs
89d1be0343 better format of like/dislike text, grab object['id'] if inreplyto missing for these activities 2018-08-29 20:02:27 -07:00
zotlabs
ed4aa90338 connect perms 2018-08-29 02:19:32 -07:00
zotlabs
cf8e787427 issues uncovered in federation tests 2018-08-28 19:49:30 -07:00
zotlabs
896d25d7ae ap discovery issues 2018-08-28 18:37:21 -07:00
zotlabs
25466def83 Merge branch 'zap' 2018-08-27 19:14:53 -07:00
zotlabs
aeffec1a99 typo 2018-08-27 19:13:55 -07:00
zotlabs
17ed268f9e Merge branch 'zap' 2018-08-27 19:12:46 -07:00
zotlabs
199026bf6d typo 2018-08-27 19:12:00 -07:00
zotlabs
bc167e80ee Merge branch 'zap' 2018-08-27 18:59:52 -07:00
zotlabs
b8ee94c00a id linkage 2018-08-27 18:58:47 -07:00
Mario
4c1944a08d Merge branch 'extend-convitems-dropdown' into 'dev' 
Extend cog dropdown & temp fix for feed display of corrupt mids

See merge request hubzilla/core!1265
 2018-08-27 10:02:58 +02:00
zotlabs
1ec12c6a04 Merge branch 'zap' 2018-08-26 23:44:01 -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
M.Dent
a0c2bbac9d Add hook to extend conv_item cog dropdown menu 2018-08-26 23:26:10 -04:00
Max Kostikov
e78a4d61d8 Update NativeWikiPage.php 2018-08-25 21:25:26 +02:00
Max Kostikov
67a9dd8497 Update NativeWikiPage.php 2018-08-25 21:20:00 +02:00
zotlabs
81193100d7 cleanup 2018-08-23 23:20:04 -07:00
zotlabs
dd0bd65021 move activitypub functions to their own class 2018-08-23 16:50:00 -07:00
zotlabs
301d79b4e2 For Osada, move activitypub into core. 2018-08-22 23:04:37 -07:00
zotlabs
0896061e89 better handling for calendar events 2018-08-22 18:45:53 -07:00
zotlabs
d55e5bbe75 typos and photo fixes 2018-08-22 17:52:22 -07:00
Mario
5d2ac10073 Merge branch 'patch-17' into 'master' 
Add missed app 'Order Apps'

See merge request hubzilla/core!1258

(cherry picked from commit 85aa4957414c98fb6f44c0c2b79ef9d198e963a7)

6086a70e Add missed app 'Order Apps'
 2018-08-21 13:13:23 +02:00
zotlabs
bc06233d10 Merge branch 'red' 2018-08-20 22:24:44 -07:00
zotlabs
c4328b9090 osada updates 2018-08-19 20:39:23 -07:00
zotlabs
57e75d9332 add affinity app and start some serious refactoring of mod_photos 2018-08-16 23:01:31 -07:00
zotlabs
f230c07ba5 possible fixes for can_comment_on_post(), provide wiki_list on wiki sidebar 2018-08-15 17:00:37 -07:00
zotlabs
248d20c347 Merge branch 'red' 2018-08-13 20:36:40 -07:00
zotlabs
d95a1a34dd put photo updated timestamp into actor record 2018-08-13 17:27:46 -07:00
zotlabs
166879b8b0 bring some Zot6 libraries and interfaces to red/hubzilla 2018-08-06 17:43:22 -07:00
zotlabs
e9ccc4bc9a make Activity::encode_person() pluggable 2018-08-05 18:41:33 -07:00
zotlabs
18ffded92a handle tombstones 2018-08-03 19:26:16 -07:00
zotlabs
d908f53607 add app_options field 2018-08-02 22:49:30 -07:00
zotlabs
c6f34c7f80 more spring cleaning 2018-08-02 01:56:34 -07:00
zotlabs
082cd3953c sync and directory issues 2018-08-01 17:58:54 -07:00
zotlabs
54bf5d32bb import announce activities from pure ActivityStreams sources 2018-07-31 20:15:00 -07:00
zotlabs
2062c154d1 more announce 2018-07-31 19:55:27 -07:00
zotlabs
4ccf54c3e9 handle announce decode better 2018-07-31 19:50:39 -07:00
zotlabs
680a7dd6b8 typo 2018-07-31 19:43:54 -07:00
zotlabs
7e723f9e79 better handling of announce 2018-07-31 19:39:50 -07:00
zotlabs
88f3ce6736 cleanup unnecessary functions 2018-07-31 17:27:50 -07:00
zotlabs
a9c3af298b prep work for converting mail 2018-07-30 23:55:09 -07:00
zotlabs
28819baa72 sort out some setup issues 2018-07-30 19:25:35 -07:00
zotlabs
a87d5aa730 Merge branch 'red' into red_merge 2018-07-30 18:22:25 -07:00
zotlabs
66ab6831cb cleanup 2018-07-29 23:49:37 -07:00
zotlabs
b97ac5acd4 missing encryption on sync 2018-07-29 23:12:05 -07:00
zotlabs
b374a6f911 more channel sync debugging 2018-07-29 22:13:43 -07:00
zotlabs
9c479be7df communication testing 2018-07-29 20:19:02 -07:00
zotlabs
d3686ffee4 missing namespace 2018-07-29 19:19:28 -07:00
zotlabs
9744d35a5c clone issues 2018-07-29 18:58:33 -07:00
zotlabs
d67f335ce8 set directory to master if no fallbacks present 2018-07-29 18:25:11 -07:00
zotlabs
ee08b67bb6 zot6 discovery sanitisation 2018-07-29 17:54:53 -07:00