Commit graph

4481 commits

Author SHA1 Message Date
nobody
420de7eb75 Merge branch 'dev' of /home/macgirvin/z into dev 2021-11-03 15:12:32 -07:00
nobody
bd13b8fc64 change comment 2021-11-03 12:55:52 -07:00
nobody
aee208155d refactor defperms (unused in Zap) and add support for Friendica's re-interpretation of ActivityPub Accept headers. 2021-11-02 16:14:11 -07:00
nobody
f910f7ae93 Merge branch 'dev' of /home/macgirvin/z into dev 2021-11-01 14:54:27 -07:00
nobody
e1b0bb8911 Merge branch 'dev' of ../p3 into dev 2021-11-01 14:53:38 -07:00
nobody
06d622df88 backward compatibility for import files from later protocol variants 2021-11-01 14:50:39 -07:00
nobody
b9d381cade Merge branch 'dev' of ../p3 into dev 2021-11-01 02:07:14 -07:00
nobody
2dfd49370b reports that save button was visible for uid=0. 2021-11-01 02:06:23 -07:00
nobody
41ede5749a Merge branch 'dev' of /home/macgirvin/z into dev 2021-10-31 13:08:00 -07:00
nobody
52c7ed6352 Merge branch 'dev' of ../p3 into dev 2021-10-31 13:03:16 -07:00
nobody
9af1a1fca3 comment permissions redo 2021-10-31 13:00:28 -07:00
nobody
7527c0f9f0 Merge branch 'dev' of /home/macgirvin/z into dev 2021-10-30 12:46:46 -07:00
nobody
d206538135 Merge branch 'dev' of ../p3 into dev 2021-10-30 12:46:20 -07:00
nobody
5852c45618 add Pleroma's "acceptsJoins" flag to Group actors. 2021-10-30 12:45:06 -07:00
nobody
a24f990a88 Merge branch 'dev' of /home/macgirvin/z into dev 2021-10-30 02:47:21 -07:00
nobody
3faaf00e78 suggestions pagination 2021-10-30 02:46:48 -07:00
nobody
0c5f4b5be1 Merge branch 'dev' of /home/macgirvin/z into dev 2021-10-29 02:02:53 -07:00
nobody
6099203cf1 Merge branch 'dev' of ../p3 into dev 2021-10-29 02:02:36 -07:00
nobody
d8ad1aa140 Recent work to allow adding default apps failed to consider the project pushing new apps or changing them. This has been corrected, 2021-10-29 02:00:48 -07:00
nobody
84f77b8d19 Merge branch 'dev' of /home/macgirvin/z into dev 2021-10-28 15:15:35 -07:00
nobody
c6bfcd68bf Merge branch 'dev' of ../p3 into dev 2021-10-28 15:13:24 -07:00
nobody
2f4b38ddf9 default app management, cont. 2021-10-28 15:12:43 -07:00
nobody
6867115d9b Merge branch 'dev' of /home/macgirvin/z into dev 2021-10-27 18:43:07 -07:00
nobody
8aaea14612 make channel exports forward and backward compatible 2021-10-27 18:42:16 -07:00
nobody
74ce9ceed9 missing paren 2021-10-26 14:40:53 -07:00
nobody
8832f4e16a cleanup earlier changes - we'll now reference purl.org/nomad instead of purl.org/macgirvin/nomad 2021-10-26 14:37:39 -07:00
nobody
98c03815f8 time to move forward again 2021-10-26 13:27:34 -07:00
nobody
158f5f2b58 Merge branch 'dev' of /home/macgirvin/z into dev 2021-10-26 13:18:31 -07:00
nobody
5d69b2c1fe Merge branch 'dev' of ../p3 into dev 2021-10-26 12:49:55 -07:00
nobody
259574d924 typo 2021-10-26 12:49:18 -07:00
nobody
729faf6058 use app 2021-10-24 14:45:20 -07:00
nobody
fbfb4fd220 Merge branch 'dev' of ../p3 into dev 2021-10-24 14:39:12 -07:00
nobody
bc7e8f1866 zap issue 51 2021-10-24 14:38:47 -07:00
nobody
78f6ffb969 Merge branch 'dev' of ../p3 into dev 2021-10-24 13:24:36 -07:00
nobody
895ae64e10 zap issue 52 2021-10-24 13:23:50 -07:00
nobody
51441b8b4f Merge branch 'dev' of ../p3 into dev 2021-10-18 13:47:50 -07:00
nobody
1eef00cdbf actor protocol discovery per hubzilla 2021-10-18 13:26:33 -07:00
nobody
c764ff8306 Merge branch 'dev' of /home/macgirvin/z into dev 2021-10-17 15:23:50 -07:00
nobody
58a1fb50e8 Merge branch 'dev' of ../p3 into dev 2021-10-17 13:29:41 -07:00
nobody
a0ad40d3d6 re-arrange code to make it easier to read/understand 2021-10-17 13:28:42 -07:00
nobody
b2c7827ffd revision, strings 2021-10-16 15:28:57 -07:00
nobody
a06dd1fc37 allow remote connections without owa 2021-10-16 14:56:36 -07:00
nobody
20184af323 Merge branch 'dev' of /home/macgirvin/z into dev 2021-10-15 18:45:11 -07:00
nobody
99165275f3 typo in function name 2021-10-15 18:43:40 -07:00
nobody
060928f67c Merge branch 'dev' of /home/macgirvin/z into dev 2021-10-15 14:22:21 -07:00
nobody
23e319980b fix loading flag 2021-10-15 14:21:15 -07:00
nobody
d7c6c4feb9 found the issue... Revert "Revert "use a different mechanism for passing state from Update module to conversational modules""
This reverts commit 32d1bfb282.
2021-10-15 14:19:20 -07:00
nobody
32d1bfb282 Revert "use a different mechanism for passing state from Update module to conversational modules"
This reverts commit f6744da509.
2021-10-15 14:15:35 -07:00
nobody
01d066105f Merge branch 'dev' of /home/macgirvin/z into dev 2021-10-15 13:50:17 -07:00
nobody
f6744da509 use a different mechanism for passing state from Update module to conversational modules 2021-10-14 22:43:17 -07:00