Commit graph

24663 commits

Author SHA1 Message Date
nobody
aa556fa290 Merge branch 'dev' of /home/macgirvin/z into dev 2021-02-28 16:43:41 -08:00
nobody
11de7c31da cleanup gprobe, update strings and version 2021-02-28 16:33:20 -08:00
zot
54d190b400 Merge pull request 'Update Spanish' (#21) from mjfriaza/zap:dev into dev
Reviewed-on: https://codeberg.org/zot/zap/pulls/21
2021-02-26 21:39:50 +01:00
mjfriaza
3a650e51d8 Update Spanish 2021-02-26 13:23:02 +01:00
nobody
65b6a41bd7 friendica import testing 2021-02-25 20:04:49 -08:00
nobody
d0a904ffe4 Merge branch 'dev' of /home/macgirvin/z into dev 2021-02-25 17:55:11 -08:00
nobody
2b75971c57 typo 2021-02-25 17:17:07 -08:00
nobody
dab065ead1 more work on Friendica import 2021-02-25 17:14:09 -08:00
nobody
c16663c67b Merge branch 'dev' of /home/macgirvin/z into dev 2021-02-25 00:38:33 -08:00
nobody
0c4751543f incorrect variable 2021-02-25 00:35:36 -08:00
nobody
df1d045c28 add friendica importer 2021-02-24 17:52:32 -08:00
nobody
36d7889e14 Merge branch 'dev' of /home/macgirvin/z into dev 2021-02-24 16:21:09 -08:00
nobody
111b2d61b0 more string issues 2021-02-24 15:23:10 -08:00
nobody
542dbde03c Merge branch 'dev' of /home/macgirvin/z into dev 2021-02-24 15:17:34 -08:00
nobody
aaaab46790 plural string issue 2021-02-24 14:28:35 -08:00
nobody
5455759627 too many parameters 2021-02-23 20:01:21 -08:00
nobody
44edbcec6a some items not appearing in mod_display when they should - iteration 498866735 or something like that 2021-02-23 19:57:59 -08:00
nobody
e7815abb5d Merge branch 'dev' of ../p3 into dev 2021-02-23 19:40:54 -08:00
nobody
6564f3e216 try once more to ignore deprecated #^ bookmark tags coming from Hubzilla 2021-02-23 19:39:45 -08:00
nobody
b11b48e65d deprecate extension matching when rendering video/audio elements 2021-02-23 19:06:51 -08:00
nobody
adcc0404b4 typo 2021-02-23 17:44:28 -08:00
nobody
f67493ab32 more work on purification of complex imported objects 2021-02-23 17:40:25 -08:00
nobody
c167e1ab55 Merge branch 'dev' of /home/macgirvin/z into dev 2021-02-23 16:13:24 -08:00
nobody
4ae24c8a9a looks like some content fields found in the wild are actually arrays 2021-02-23 15:36:39 -08:00
nobody
414c2be024 don't try to purify an array 2021-02-23 15:22:30 -08:00
nobody
0afb443758 off by one 2021-02-23 15:09:46 -08:00
nobody
23cd74d281 Friendica-style bbcode img tags with alt text create bad attachment links 2021-02-23 15:06:59 -08:00
nobody
5aa15eb757 Merge branch 'dev' of /home/macgirvin/z into dev 2021-02-22 18:38:59 -08:00
nobody
28f697d22b release 2021-02-22 18:38:05 -08:00
nobody
da0e82c2a9 Merge branch 'dev' of ../p3 into dev 2021-02-22 18:37:39 -08:00
nobody
646536e986 low hanging php8 stuff 2021-02-22 18:36:54 -08:00
nobody
70e0e05e05 don't apply htmlspecialchars to content fields of imported items, use purify_html instead 2021-02-22 17:12:41 -08:00
nobody
0c1db8c95f Remove collection support for roadhouse. 2021-02-22 15:12:39 -08:00
nobody
0d18d08408 Merge branch 'dev' of /home/macgirvin/z into dev 2021-02-21 17:41:09 -08:00
nobody
3c99fa2056 code review 2021-02-21 17:39:48 -08:00
nobody
e0ddd04b06 Merge branch 'dev' of /home/macgirvin/z into dev 2021-02-21 16:53:29 -08:00
nobody
f2ba2fb44b multiple attachments in body 2021-02-21 16:40:14 -08:00
nobody
07ef41ab00 Merge branch 'dev' of /home/macgirvin/z into dev 2021-02-21 15:38:08 -08:00
nobody
9d6e8dcb64 release 2021-02-21 15:34:47 -08:00
nobody
2a1cc06f40 fix unknown permission roles imported from hubzilla, add missing geo information to posts (and profiles) and use Mario's rendering of crypt content for alternate networks rather than leaving the bbcode intact - although I believe this may suppress the key hint and I haven't verified the availability of the algorithm. 2021-02-20 12:58:42 -08:00
nobody
b9fdfda56d Merge branch 'dev' of ../p3 into dev 2021-02-18 21:41:14 -08:00
nobody
51dda4ad8f hz->zap migration testing 2021-02-18 21:40:22 -08:00
nobody
c283317bac hz compatibility stuff 2021-02-18 17:55:51 -08:00
nobody
997176fadf migration testing 2021-02-17 19:44:31 -08:00
nobody
1e2307a9c7 I'm hesitant to merge pull request 20 for a number of reasons, but the Accept-header based module handlers have to be re-ordered in any case so the wrong one doesn't answer prematurely if a request contains more than one of Zot6 or ActivityPub in the Accept headers. So we'll do that while I'm thinking about the best way forward. This creates a policy mess because in this case AP has to have priority over Zot. Elsewhere, we always prioritise Zot first.
The problem will always be future developers who don't understand that the precise order of Accept-header based module handlers in the code will be critical to proper functioning if I let this go forward.
2021-02-16 19:10:47 -08:00
nobody
bc9dfce07d support recursive embedded shares 2021-02-16 17:53:22 -08:00
nobody
844b181dd7 Merge branch 'dev' of /home/macgirvin/z into dev 2021-02-14 14:41:45 -08:00
nobody
5bf308f750 another release(?) 2021-02-14 14:28:37 -08:00
nobody
96c5b7b93e Merge branch 'dev' of /home/macgirvin/z into dev 2021-02-13 14:40:51 -08:00
nobody
5da6b86ee9 some patches from upstream, plus zot fetch conversation was only checking for zot authors and missing AP authors resulting in 'author not found' even though the record existed. 2021-02-13 14:38:31 -08:00