1
0
Fork 0
Commit graph

23810 commits

Author SHA1 Message Date
6f3019ecdd Revert PR 7158 since it breaks umlauts 2019-05-19 09:34:49 +00:00
7a13582c67
Merge pull request #7159 from nupplaphil/task/mod_notice
Move mod/notice to src/Module/Notice
2019-05-18 22:16:35 -04:00
ec5c123f41
Merge pull request #7163 from nupplaphil/task/mod_starred
Move mod/starred to src/Module/Starred
2019-05-18 22:16:21 -04:00
596e95917e
Merge pull request #7164 from nupplaphil/task/mod_randprof
Move mod/randprof to src/Module/RandomProfile
2019-05-18 22:16:06 -04:00
Philipp Holzer
5f068b07f9
some improvements 2019-05-19 03:12:22 +02:00
Philipp Holzer
82e271589f
Move mod/starred to src/Module/Starred 2019-05-19 03:07:44 +02:00
d3a4ed0111
Merge pull request #7162 from nupplaphil/task/mod_view
Move mod/view to src/Module/Theme
2019-05-18 21:07:27 -04:00
Philipp Holzer
725984eb08
change route 2019-05-19 03:05:21 +02:00
Philipp Holzer
d91b3bb59c
remove unused dependencies 2019-05-19 02:53:36 +02:00
Philipp Holzer
d81c1d81b3
correct notice redirect 2019-05-19 02:53:35 +02:00
Philipp Holzer
ce3b121064
rename rawContent() to content() 2019-05-19 02:53:35 +02:00
Philipp Holzer
9092cb1beb
Move mod/notice to src/Module/Notice 2019-05-19 02:53:31 +02:00
33ec3d8051
Merge pull request #7161 from nupplaphil/task/mod_toggle_mobile
Move mod/toggle_mobile to src/Module/ToggleMobile
2019-05-18 20:14:27 -04:00
30945784c3
Merge pull request #7157 from nupplaphil/task/mod_notify
Move mod/notify to src/Module/Notify
2019-05-18 17:49:01 -04:00
Philipp Holzer
8bb85b1da7
Move mod/randprof to src/Module/RandomProfile 2019-05-18 22:17:57 +02:00
Philipp Holzer
d1d7fa394a
Move mod/view to src/Module/View 2019-05-18 21:23:12 +02:00
Philipp Holzer
295d90d496
Move mod/toggle_mobile to src/Module/ToggleMobile 2019-05-18 21:13:19 +02:00
Philipp Holzer
1483cd3fb4
rearrange content/init 2019-05-18 20:34:11 +02:00
Philipp Holzer
68fdc7215e
rearrange rawContent / content 2019-05-18 20:16:08 +02:00
Philipp
67a4a80076
Merge pull request #7158 from MrPetovan/bug/7150-unescape-xml-entities
Replace htmlspecialchars_decode with html_entity_decode in XML::unescape
2019-05-18 19:53:25 +02:00
8fb9722cdc Replace htmlspecialchars_decode with html_entity_decode in XML::unescape
- Replace htmlspecialchars with htmlentities in XML::escape
- This allows for converting all entities from Diaspora messages to regular characters
2019-05-18 13:15:51 -04:00
Philipp Holzer
2906a9031b
Removed mod/notify 2019-05-18 19:04:33 +02:00
Philipp Holzer
56bd395b8a
Move mod/notify to src/Module/Notify 2019-05-18 18:59:41 +02:00
cff4577cc5
Merge pull request #7155 from nupplaphil/task/mod_opensearch
Move mod/opensearch to src/Module/OpenSearch
2019-05-18 12:46:54 -04:00
fc312e4c98
Merge pull request #7153 from annando/ap-mail-delivery
Fix receiver list for mails
2019-05-18 11:50:10 -04:00
Philipp Holzer
9f13ae6e73
Move mod/opensearch to src/Module/OpenSearch 2019-05-18 17:43:58 +02:00
Michael Vogel
69e38c2bbd Missing arrrrr! 2019-05-18 17:34:44 +02:00
d252598821
Merge pull request #7152 from annando/fix-ap-mail
Fix for receiving direct messages from Mastodon
2019-05-18 08:28:51 -04:00
Michael Vogel
f3c2eb5b11 Fix receiver list for mails / only deliver mail via DFRN to legacy contacts 2019-05-18 11:09:13 +02:00
490e850b48 Fix for receiving direct messages from Mastodon 2019-05-18 07:00:57 +00:00
6cc376020e
Merge pull request #7151 from annando/ap-mail-mastodon
Make AP "direct messages" more compatible to Mastodon
2019-05-17 14:59:07 -04:00
d81b7c840e Adding missing spaces 2019-05-17 18:00:00 +00:00
f6fc70c4e2 Make AP "direct messages" more compatible to Mastodon 2019-05-17 17:58:42 +00:00
3f0aef9c72
Merge pull request #7147 from annando/fix-structure
Fix database structure definition, primary keys must be marked as this
2019-05-17 08:22:42 -04:00
Philipp
8011c844c7
Merge pull request #7148 from MrPetovan/bug/fatal-errors
Allow null $tags parameter in ActivityPub\Processor::constructTagString
2019-05-17 13:19:58 +02:00
f0c1f3e7f1
Merge pull request #7149 from tobiasd/20190517-cs
CS translation update THX Aditoo
2019-05-17 00:44:15 -04:00
dd08a6432c CS translation update THX Aditoo 2019-05-17 06:42:29 +02:00
1cf9a1ab7c Allow null $tags parameter in ActivityPub\Processor::constructTagString 2019-05-16 18:10:42 -04:00
48ffed78d7 Fix database structure definition, primary keys must be marked as this 2019-05-16 19:53:07 +00:00
Philipp
9519ad2174
Merge pull request #7145 from MrPetovan/task/7141-contact-block-reason
Add node-wide contact block reason
2019-05-16 15:39:11 +02:00
8b3592b08c Revert renaming variable in Console\GlobalCommunityBlock 2019-05-16 08:42:07 -04:00
064c0cd5ff
Merge pull request #7146 from annando/ap-mail2
AP: We can now receive "direct messages" (aka "mails") as well
2019-05-16 08:06:06 -04:00
3f55f93606 AP: We can now receive "direct messages" (aka "mails") as well 2019-05-16 05:44:59 +00:00
dbedcdbf69 Add reason editing to console globalcommunityblock command 2019-05-15 19:30:48 -04:00
0c63f8aa42 Add contact block reason form and display in admin page 2019-05-15 19:30:13 -04:00
79cb5b1bae Add block reason editing in Model\Contact 2019-05-15 19:28:00 -04:00
dd90fa9789 Database Structure Version 1313 2019-05-15 19:27:36 -04:00
2caf95f481
Merge pull request #7144 from MrPetovan/task/two-factor-authentication
Exclude /api and /proxy from 2fa check
2019-05-15 16:21:05 +02:00
8fe3c57015
Merge pull request #7143 from ben-utzer/patch-1
Update paths to images in README.md
2019-05-15 15:06:34 +02:00
7f0036239f Update translation strings 2019-05-15 08:56:24 -04:00