Commit graph

2362 commits

Author SHA1 Message Date
nobody
732a2ef195 Merge branch 'dev' of /home/macgirvin/z into dev 2020-11-25 20:59:20 -08:00
nobody
fe8db82c6e revision 2020-11-25 17:39:28 -08:00
nobody
a752db34c7 more work on comment control 2020-11-24 19:22:59 -08:00
nobody
ef7b3a338d Merge branch 'dev' of /home/macgirvin/z into dev 2020-11-22 14:22:33 -08:00
nobody
74ebbdf3b4 revision 2020-11-22 14:18:25 -08:00
nobody
a8fbb086e4 whitespace 2020-11-19 18:42:11 -08:00
nobody
ec9996e66a add xchan_created, quote message blocks added to (mostly) invisible activities 2020-11-18 20:09:05 -08:00
nobody
911f3ca47b Merge branch 'dev' of ../p3 into dev 2020-11-14 16:13:54 -08:00
nobody
04817523cc tagging issues 2020-11-14 16:13:23 -08:00
nobody
bfb0a52ca8 revision 2020-11-14 12:02:10 -08:00
nobody
50c7dd18be Merge branch 'dev' of /home/macgirvin/z into dev 2020-11-10 18:52:23 -08:00
nobody
8aa0e232a7 Merge branch 'dev' of ../p3 into dev 2020-11-10 17:12:48 -08:00
nobody
0f696c6d19 revision 2020-11-10 17:12:30 -08:00
nobody
2d6db55961 federate categories 2020-11-10 17:11:19 -08:00
nobody
eaa2675a1a version 2020-11-06 13:03:52 -08:00
nobody
89776640e7 revision 2020-11-01 15:25:36 -08:00
nobody
a246942ea5 Issue with pleroma unfollow and follow again, wherein using the same id as last time for follow and accept (based on abook_id) is ignored as a duplicate. 2020-10-29 19:41:00 -07:00
nobody
a3ba276728 Merge branch 'dev' of /home/macgirvin/z into dev 2020-10-27 18:04:54 -07:00
nobody
3232b245ba Merge branch 'dev' of ../p3 into dev 2020-10-26 19:54:43 -07:00
nobody
6fd6bf0701 cleanup deprecated directory code 2020-10-26 19:51:59 -07:00
nobody
e89a70b0af icon files for local projects - fix redmatrix icons (edges cutoff) 2020-10-26 16:17:53 -07:00
nobody
df723ce76a Merge branch 'dev' of /home/macgirvin/z into dev 2020-10-25 18:18:50 -07:00
nobody
d699b2a4b8 revision 2020-10-25 18:16:34 -07:00
nobody
15030b0c26 more work on site indexing 2020-10-22 17:28:05 -07:00
nobody
2d7b02e327 version, add debug to daemon_convo to find out why it isn't working correctly in some cases 2020-10-20 17:57:34 -07:00
nobody
488de79c06 Merge branch 'dev' of /home/macgirvin/z into dev 2020-10-18 15:45:24 -07:00
nobody
ef98bb8acb version 2020-10-18 15:42:23 -07:00
nobody
a5755872ea fix ordered lists 2020-10-15 18:00:23 -07:00
nobody
7d928f655c Merge branch 'dev' of /home/macgirvin/z into dev 2020-10-13 19:18:49 -07:00
nobody
29857253bc version 2020-10-13 19:16:18 -07:00
nobody
75169ede9b issue with activity_filter widget and virtual lists 2020-10-11 22:31:30 -07:00
nobody
c53ed534c1 Merge branch 'dev' of /home/macgirvin/z into dev 2020-10-07 22:40:26 -07:00
nobody
d9e15d32cd add optional startup file that's loaded before anything else 2020-10-07 22:38:43 -07:00
nobody
3de7c78a07 Merge branch 'dev' of /home/macgirvin/z into dev 2020-10-06 22:42:28 -07:00
nobody
aa4d36173c revision 2020-10-05 22:41:38 -07:00
nobody
fb229a641e remove pcre.jit setting 2020-10-05 22:39:55 -07:00
nobody
7fadfbbbf4 Merge branch 'dev' of /home/macgirvin/z into dev 2020-09-27 17:30:27 -07:00
nobody
56baf0e0b5 revup 2020-09-27 17:14:48 -07:00
nobody
3778e7be2c Merge branch 'dev' of /home/macgirvin/z into dev 2020-09-24 15:32:19 -07:00
nobody
0170a7ae6c revision 2020-09-24 15:24:14 -07:00
nobody
dbce2a6f50 preparing for another release after lots of minor and several major updates... 2020-09-23 19:36:40 -07:00
nobody
18da73fb1b version and strings update after recent work 2020-09-22 04:19:48 -07:00
nobody
a096517a30 add pronouns to profile 2020-09-18 15:34:53 -07:00
nobody
50c2566679 Merge branch 'dev' of /home/macgirvin/z into dev 2020-09-16 21:35:48 -07:00
nobody
8d684f4ec7 release 2020-09-16 21:32:43 -07:00
nobody
68fce837af wrong icon 2020-09-16 18:03:14 -07:00
nobody
9e08e3d336 Merge branch 'dev' of /home/macgirvin/z into dev 2020-09-15 18:03:54 -07:00
nobody
b92e109bf3 updates 2020-09-14 20:27:20 -07:00
nobody
b1b9ee7d60 Merge branch 'dev' of /home/macgirvin/z into dev 2020-09-10 02:05:26 -07:00
nobody
857c953a8a revision 2020-09-09 21:04:19 -07:00