Commit graph

4496 commits

Author SHA1 Message Date
nobody
9de4784437 Merge branch 'dev' of /home/macgirvin/roadhouse into dev 2021-11-01 14:54:56 -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
ab13ec68c6 bug - array terminated early 2021-10-31 13:27:51 -07:00
nobody
301884f2b9 Merge branch 'dev' of /home/macgirvin/roadhouse into dev 2021-10-31 13:11:30 -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
a619556778 theming issues in admin pages 2021-10-30 13:48:32 -07:00
nobody
c01f6e085b Merge branch 'dev' of /home/macgirvin/roadhouse into dev 2021-10-30 12:47:02 -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
9bada093ba more streams work 2021-10-30 02:49:06 -07:00
nobody
f6e6c5ec11 Merge branch 'dev' of /home/macgirvin/roadhouse into dev 2021-10-30 02:47:35 -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
b7c78f6ed2 fix themability of mod_apporder 2021-10-29 21:40:26 -07:00
nobody
b6f4e2219a widgetise the profile vcard and xchan vcard 2021-10-29 21:22:32 -07:00
nobody
64eebbe695 federation fixes after last dev push 2021-10-29 21:06:08 -07:00
nobody
559d88d8ac mop up and go home 2021-10-29 12:20:05 -07:00
nobody
79efd95dfd Merge branch 'dev' of /home/macgirvin/roadhouse into dev 2021-10-29 02:03:40 -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
4b6fb66936 Merge branch 'dev' of /home/macgirvin/roadhouse into dev 2021-10-28 15:15:55 -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
979699ebfa re-order webfinger results so that protocols are naturally discovered in order of our preferences: 1. nomad, 2. zot6, 3. activitypub 2021-10-28 13:44:32 -07:00
nobody
c01775799f update more x-zot stuff to x-nomad 2021-10-28 13:02:31 -07:00
nobody
8dd7159cd5 zot_revision > 10 is considered nomad compliant. 2021-10-28 01:55:09 -07:00
nobody
59ebf15782 Merge branch 'dev' of /home/macgirvin/roadhouse into dev 2021-10-27 18:43:19 -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
d48683bc33 branding 2021-10-27 17:47:17 -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