Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-24 13:20:15 +00:00
Code Issues Projects Releases Packages Wiki Activity
24342 commits 3 branches 64 tags 237 MiB
Commit graph

3843 commits

Author SHA1 Message Date
Michael
ecf809c7ae The delivery counter now counts only successful deliveries 2019-06-01 06:54:47 +00:00
Philipp
25433e79d5
Merge pull request #7211 from MrPetovan/bug/7209-admin-forbidden 
Add themed themed error page or login page for /admin[/*]
 2019-05-31 11:49:40 +02:00
Hypolite Petovan
f0de19dd8a
Merge pull request #7208 from nupplaphil/bug/6916-filetag 
Adding null checks before FileTag method (fix fatal)
 2019-05-31 01:47:52 -04:00
Hypolite Petovan
4b4a319af9 Add themed themed error page or login page for /admin[/*] 2019-05-31 00:23:30 -04:00
Hypolite Petovan
a9e534ea79
Merge pull request #7210 from annando/diaspora-edit 
Fix edited messages for Diaspora
 2019-05-30 15:25:29 -04:00
Michael
19e95ebdda Fix edited messages for Diaspora 2019-05-30 18:56:31 +00:00
Hypolite Petovan
ac294be746
Merge pull request #7207 from nupplaphil/bug/6917-php_warnings 
Add hexadecimal check (fix warnings)
 2019-05-30 09:31:50 -04:00
Philipp Holzer
c76258c370
catching nulls for FileTag 2019-05-30 13:54:35 +02:00
Philipp Holzer
4c5dd9f47c
Add more Strings::isHex() checks to photos 2019-05-30 10:30:15 +02:00
Philipp Holzer
694cd82d0e
Bugfix - author-network (adding to unset list during insert) 2019-05-29 21:48:03 +02:00
Philipp Holzer
7334be803d
Bugfix - item_id 2019-05-29 21:40:21 +02:00
Philipp Holzer
3de540d1d1
Adding hexadecimal check for photos 
see https://github.com/friendica/friendica/issues/6917#issuecomment-492798238
 2019-05-29 20:28:25 +02:00
Philipp Holzer
766a10b3b6
Adding author-network to ITEM::ITEM_FIELDLIST 
see https://github.com/friendica/friendica/issues/6918#issuecomment-493515358
 2019-05-29 20:09:20 +02:00
Philipp Holzer
15ffb70c5f
Adding item_id to Item::ITEM_FIELDLIST 
see https://github.com/friendica/friendica/issues/6918#issuecomment-493515358
 2019-05-29 20:08:21 +02:00
Philipp Holzer
5002bda5fc
Checking the existence of '-' before array operation 
See https://github.com/friendica/friendica/issues/6918#issuecomment-491490533
 2019-05-29 20:07:53 +02:00
Philipp
dc0978141c
Merge pull request #7202 from MrPetovan/bug/fatal-errors 
Prevent fatal error in ACL::getFullSelectorHTML when accessing a profile as a remote visitor
 2019-05-29 07:05:05 +02:00
Michael Vogel
64f51d337f
Merge pull request #7204 from MrPetovan/bug/notices 
Check for array index existence
 2019-05-29 07:04:46 +02:00
Philipp
9245942a0c
Merge pull request #7199 from MrPetovan/bug/7171-filer-network 
Allow commas in saved folder names
 2019-05-29 07:03:44 +02:00
Michael
824d35774b Fix "Undefined index: protocol" 2019-05-29 04:30:01 +00:00
Hypolite Petovan
8a0c568fe1 Check for href existence for links in Protocol\PortableContact 
See https://github.com/friendica/friendica/issues/6918#issuecomment-495198587
 2019-05-28 21:27:13 -04:00
Hypolite Petovan
5414d51d4c Prevent fatal error in ACL::getFullSelectorHTML when accessing a profile as a remote visitor 
See https://github.com/friendica/friendica/issues/6916#issuecomment-495724811
 2019-05-28 21:09:06 -04:00
Philipp
e557457158
Merge pull request #7201 from annando/mail-db-error 
Fix Issue 7196
 2019-05-28 20:02:39 +02:00
Philipp
32b8c6f65e
Merge pull request #7200 from annando/tag-process 
Process incoming tag add requests
 2019-05-28 19:43:23 +02:00
Michael
ae940755c7 Fix Issue 7196 2019-05-28 17:39:26 +00:00
Philipp
bae4a5e406
Merge pull request #7187 from MrPetovan/bug/7023-emailer-hooks 
Enable addon using emailer hooks to skip default call to mail()
 2019-05-28 08:02:48 +02:00
Philipp
be3d7759f0
Merge pull request #7198 from MrPetovan/task/6861-to-plaintext 
Simplify BBCode::toPlaintext and HTML::toPlaintext
 2019-05-28 07:49:25 +02:00
Hypolite Petovan
ed768c71ee Remove "f=&" nonsense from network module 
- Fixes wrong redirect when using the sidebar filters
 2019-05-27 17:45:27 -04:00
Hypolite Petovan
0fadc7730c Replace deprecated string-bases Model\FileTag calls with array-based ones 2019-05-27 17:40:08 -04:00
Hypolite Petovan
6de3449cae Add new fileToArray and arrayToFile methods to Module\FileTag 2019-05-27 17:38:36 -04:00
Hypolite Petovan
96402e306a Fix formatting of Model\FileTag 
- Normalize indent style
- Remove extraneous new lines after ifs/foreachs
 2019-05-27 17:38:32 -04:00
Hypolite Petovan
5d2bf73517 Add Babel result screen for compact HTML::toPlaintext 2019-05-27 12:02:28 -04:00
Hypolite Petovan
5f9fb1f14f Simplify BBCode::toPlaintext 
- Keep white spaces after tags
 2019-05-27 12:02:12 -04:00
Hypolite Petovan
596b5b0982 Simplify HTML::toPlaintext 
- Keep new lines in plain text output
 2019-05-27 12:01:48 -04:00
Hypolite Petovan
3c7e4b474b
Merge pull request #7193 from nupplaphil/bug/uimport_datetime 
Fix NULL datetime for uimport/uexport
 2019-05-27 09:13:01 -04:00
Hypolite Petovan
4e207ef786 Enable addon using emailer hooks to skip default call to mail() 2019-05-26 21:36:09 -04:00
Hypolite Petovan
01e71254d9 Replace defaults() calls on $_SESSION by Core\Session calls 
- Replace direct calls to $_SESSION by Core\Session calls in Module\Login
 2019-05-26 21:26:59 -04:00
Philipp Holzer
26d4214c19
added suggestions 2019-05-26 21:53:24 +02:00
Hypolite Petovan
e99e8096bf
Merge pull request #7191 from nupplaphil/bug/logfile_permission 
Fixing logfile permission denied exceptions
 2019-05-26 15:19:26 -04:00
Philipp Holzer
220f8f0862
friendica-6950 uimport doesn't support "pwdreset_time":null 2019-05-26 15:49:44 +02:00
Philipp
57f6086fcd
Merge pull request #7189 from MrPetovan/bug/7183-archives-profile-widget 
Ensures Widget::postedByYear uid parameter is integer in Module\Profile
 2019-05-26 14:42:25 +02:00
Philipp Holzer
b56b56ccb6
friendica-6379 Monolog - logfile permission denied 2019-05-26 14:33:09 +02:00
Hypolite Petovan
cc6a17d27a Ensures Widget::postedByYear uid parameter is integer in Module\Profile 2019-05-26 08:18:59 -04:00
Michael
ecf4789cc4 Process incoming tag add requests 2019-05-26 11:20:03 +00:00
Philipp
ea218438d2
Merge pull request #7186 from MrPetovan/bug/7183-archives-profile-widget 
Restore profile archives widget
 2019-05-26 08:16:54 +02:00
Philipp
6ceb74c365
Merge pull request #7184 from annando/add-tag 
AP: We now transmit "add tag" activity
 2019-05-26 08:14:18 +02:00
Hypolite Petovan
50e44f46ae Add profile archive URL pattern to Router 2019-05-25 19:08:43 -04:00
Hypolite Petovan
d27d4d8927 Move posted date widget to Content\Widget 2019-05-25 19:08:15 -04:00
Michael
32b1f75ece AP: We now transmit "add tag" activity / On Diaspora this is now supressed 2019-05-25 19:33:58 +00:00
Philipp
5c2cca432f
Merge pull request #7170 from MrPetovan/bug/6981-contact-request-blocked 
Contact requests blocked
 2019-05-25 20:20:36 +02:00
Philipp
bd0c536736
Merge pull request #7156 from MrPetovan/task/add-relationship-filter 
Add contact relationship filter
 2019-05-25 20:17:05 +02:00
Hypolite Petovan
08d7d42f81 Ensures Search methods return an empty ResultList instead of null 
- Addresses https://github.com/friendica/friendica/issues/6916#issuecomment-494876901
 2019-05-24 08:13:36 -04:00
Hypolite Petovan
0dae4f9492
Fix typo in Module\Contact 
Follow-up to #7154, thanks to @AlfredSK
 2019-05-23 13:01:40 -04:00
Hypolite Petovan
40ca25f4f7 Fix SQL error in Module\Admin\Summary 2019-05-21 17:01:15 -04:00
Michael
30143aa5b1 Identifier have to be escaped different than values 2019-05-21 05:34:41 +00:00
Michael
1f6f588872 Fix table name sanitation / enable table schemes 2019-05-20 20:38:18 +00:00
Hypolite Petovan
14a78807d7 Use self::isBlocked and self:isBlockedByUser in Model\Contact::addRelationship 2019-05-20 16:34:17 -04:00
Hypolite Petovan
7bbaf0757f Revert sending ActivityPub follow reject on Model\Contact::addRelationship failure 2019-05-20 16:33:09 -04:00
Hypolite Petovan
62dfcbb074 Prevent contact relationships with node- or user-level blocked contacts 2019-05-20 15:29:20 -04:00
Hypolite Petovan
ea77f214d7 Add return value to Model\Contact::addRelationship to remove protocol-specific code from it 2019-05-20 15:29:20 -04:00
Hypolite Petovan
10dfe4347b Ensure follow reject/accept object IDs are strings to avoid JsonLD normalize errors in ActivityPub\Transmitter 2019-05-20 15:29:20 -04:00
Hypolite Petovan
3114754f4b Refactor Model\Contact::addRelationship 
- Remove unused parameter $item
- Replace q() call with DBA::insert
- Update check on $contact that can only be an array now
- Add moethod doc block
 2019-05-20 15:29:20 -04:00
Hypolite Petovan
956ae6241d Add exception message chain, string trace and original object to JsonLD normalize error logging 2019-05-20 15:28:54 -04:00
Hypolite Petovan
bebff3271b Remove obsolete TODO comment in Module\Profile\Contacts 2019-05-20 15:10:34 -04:00
Hypolite Petovan
c65faecc8c Add current tab parameter to Model\Profile::getTabs 2019-05-20 15:09:33 -04:00
Hypolite Petovan
709eba6ce3 Move /viewcontacts to /profile/{nickname}/contacts[/{type}] 
- Add contact relationship filter to profile contacts page
- Include feed contacts in contacts page and contact widget
 2019-05-20 14:50:09 -04:00
Hypolite Petovan
e6742af65c Add contact relationship filter to /contact module 2019-05-20 14:50:09 -04:00
Hypolite Petovan
862159c712
Merge pull request #7165 from nupplaphil/task/mod_dirfind 
Move mod/dirfind to src/Module/Search/Directory
 2019-05-20 14:45:19 -04:00
Hypolite Petovan
0c9b76a585
Merge pull request #7173 from nupplaphil/task/mod_newmember 
Move mod/newmember to src/Module/Welcome
 2019-05-20 14:14:58 -04:00
Philipp Holzer
f97b72eb9f
Move mod/newmember to src/Module/Welcome 2019-05-20 20:12:20 +02:00
Philipp Holzer
3d67987cbc
simplification 2019-05-20 19:27:53 +02:00
Philipp Holzer
5e79d3fc82
Fixing method signature 2019-05-20 19:19:57 +02:00
Philipp Holzer
2bb2bb19fd
refactor method signature 2019-05-20 19:15:47 +02:00
Philipp Holzer
059b813090
Add PhpDoc / Code Standards 2019-05-20 19:14:39 +02:00
Philipp Holzer
58c8959da0
Add search types 2019-05-20 19:13:37 +02:00
Philipp Holzer
83fd03b124
Add PhpDoc 2019-05-20 18:44:44 +02:00
Philipp Holzer
1e36c68e48
Moving Search to Core, Refactor Objects 2019-05-20 18:42:27 +02:00
Hypolite Petovan
1cd7d50939
Merge pull request #7172 from nupplaphil/task/mod_notice_rm 
Remove src/Module/Notice
 2019-05-20 12:26:28 -04:00
Philipp Holzer
853f5cb92f
Remove src/Module/Notice 
see https://github.com/friendica/friendica/pull/7159#issuecomment-493744623
 2019-05-20 18:22:34 +02:00
Hypolite Petovan
325ba20141 Improve Diaspora raw text support in /babel module 2019-05-19 18:52:01 -04:00
Hypolite Petovan
3395f56036 Add Unicode support to autolink regular expression 
- Explicitly exclude non-breaking spaces from URLs as \s doesn't include them
 2019-05-19 18:51:55 -04:00
Hypolite Petovan
6f0c6e8926
Merge pull request #7160 from nupplaphil/task/mod_probe 
Move mod/probe to src/Module/Probe
 2019-05-19 15:06:13 -04:00
Hypolite Petovan
3ca64185a6
Merge pull request #7169 from annando/send-suggest 
Sending contact suggestions does work again
 2019-05-19 14:59:28 -04:00
Hypolite Petovan
58d5c6610c
Merge pull request #7168 from annando/suggest-receive 
Suggestions can be processed again
 2019-05-19 14:58:30 -04:00
Philipp
a758671a1b
Merge pull request #7154 from MrPetovan/task/refactor-widgets 
Refactor widgets
 2019-05-19 20:52:00 +02:00
Michael
a6cf036db2 Sending contact suggestions does work again 2019-05-19 17:59:37 +00:00
Michael Vogel
a3c95eeaab Suggestions can be processed again 2019-05-19 19:58:20 +02:00
Michael
6f3019ecdd Revert PR 7158 since it breaks umlauts 2019-05-19 09:34:49 +00:00
Philipp Holzer
419cc81ef1
renaming 2019-05-19 05:13:06 +02:00
Philipp Holzer
a7aae9603a
Split Directory Search as a base for further changes 2019-05-19 05:06:02 +02:00
Philipp Holzer
5b44fdc202
Split Directory Search as a base for further changes 2019-05-19 05:01:46 +02:00
Philipp Holzer
2520286b1f
some small improvements 2019-05-19 04:43:09 +02:00
Philipp Holzer
34a1e923dd
dependency lowering 2019-05-19 04:38:35 +02:00
Philipp Holzer
e00f110ef1
Move mod/dirfind to src/Module/DirFind 2019-05-19 04:28:16 +02:00
Philipp Holzer
492d7abe92
Renamed Diagnostic to Debug and deleted ItemSource (already defined) 2019-05-19 04:24:56 +02:00
Philipp Holzer
48bba87abe
Move mod/probe to src/Module/Probe 2019-05-19 04:24:18 +02:00
Hypolite Petovan
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
Hypolite Petovan
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
Hypolite Petovan
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
Hypolite Petovan
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
Hypolite Petovan
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
Hypolite Petovan
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
Hypolite Petovan
c3d545987a Remove /contact/all path 2019-05-18 13:18:47 -04:00
Hypolite Petovan
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
56bd395b8a
Move mod/notify to src/Module/Notify 2019-05-18 18:59:41 +02:00
Hypolite Petovan
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
Hypolite Petovan
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
Hypolite Petovan
71ae8d07a6 Refactor widgets 
- Move widget templates to subfolder
- Add new generic filter widget templates to replace category, network and filer filters
- Update styles
 2019-05-18 11:33:35 -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
Michael
490e850b48 Fix for receiving direct messages from Mastodon 2019-05-18 07:00:57 +00:00
Michael
d81b7c840e Adding missing spaces 2019-05-17 18:00:00 +00:00
Michael
f6fc70c4e2 Make AP "direct messages" more compatible to Mastodon 2019-05-17 17:58:42 +00:00
Hypolite Petovan
1cf9a1ab7c Allow null $tags parameter in ActivityPub\Processor::constructTagString 2019-05-16 18:10:42 -04: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
Hypolite Petovan
8b3592b08c Revert renaming variable in Console\GlobalCommunityBlock 2019-05-16 08:42:07 -04:00
Hypolite Petovan
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
Michael
3f55f93606 AP: We can now receive "direct messages" (aka "mails") as well 2019-05-16 05:44:59 +00:00
Hypolite Petovan
dbedcdbf69 Add reason editing to console globalcommunityblock command 2019-05-15 19:30:48 -04:00
Hypolite Petovan
0c63f8aa42 Add contact block reason form and display in admin page 2019-05-15 19:30:13 -04:00
Hypolite Petovan
79cb5b1bae Add block reason editing in Model\Contact 2019-05-15 19:28:00 -04:00
Hypolite Petovan
bf82736522 Exclude /api and /proxy from 2fa check 2019-05-15 08:56:02 -04:00
Hypolite Petovan
969b7744c9
Merge pull request #7139 from annando/ap-mail 
Sending direct messages via AP does work now - receiving is pending
 2019-05-14 14:38:42 -04:00
Michael
87b98b8249 Sending direct messages via AP does work now - receiving is pending 2019-05-14 17:50:45 +00:00
Philipp
5e85bdecd0
Merge pull request #7135 from MrPetovan/task/two-factor-authentication 
Add native two-factor authentication support
 2019-05-14 07:07:03 +02:00
Hypolite Petovan
4161f5ebe0
Merge pull request #7136 from nupplaphil/bug/7112-missing_basepath 
Missing basepath fix
 2019-05-13 16:27:31 -04:00
Michael
9e31b1b486 Don't attach images to the body if it was from a Friendica system 2019-05-13 19:56:46 +00:00
Hypolite Petovan
78b651d2e8 Revert Use Contact::select() instead of DBA::select(‘contact) in Core\Session 2019-05-13 14:07:02 -04:00
Hypolite Petovan
e077f30d51 Use Contact::select() instead of DBA::select(‘contact) in Core\Session 
- Replace remaining occurrences of $_SESSION with Session methods
 2019-05-13 13:33:20 -04:00
Hypolite Petovan
a14f868134 Make Module\TwoFactorRecoveryCode::markUsedForUser return false for already used code 
- Add PHP Doc in Module\TwoFactorRecoveryCode
 2019-05-13 13:32:21 -04:00
Hypolite Petovan
5c59c57b14 Improve template args visual alignment in two-factor modules 2019-05-13 13:31:08 -04:00
Philipp Holzer
076370631f
Friendica-7112 - Missing basepath fix 2019-05-13 19:30:03 +02:00
Hypolite Petovan
8e885f5b97 Add two-factor authentication settings 
- Add settings aside menu entry
- Add two-factor authentication documentation
 2019-05-13 01:52:01 -04:00
Hypolite Petovan
d7e9b91181 Add two-factor authentication 
- Add 2FA login interception in Session::setAuthenticatedForUser
- Add 2fa session variable holding the last auth code
 2019-05-13 01:52:01 -04:00
Hypolite Petovan
a7feb4bf9f Add Two-factor recovery code model 
- [DBA] Add NULL value handling in condition array
 2019-05-13 01:52:00 -04:00
Hypolite Petovan
c2062fe594 Fix undefined $a variable in Module\Help 2019-05-13 01:51:59 -04:00
Hypolite Petovan
6071fe81b4 Move Authentication::setAuthenticatedSessionForUser to Session::setAuthenticatedForUser 2019-05-13 01:51:59 -04:00
Michael
55557a8f18 Contacts with protocol = AP are now delivered only via AP 2019-05-11 05:58:22 +00:00
Michael
f04bb820ad Magic links should work again 2019-05-10 07:38:10 +00:00
Hypolite Petovan
860338a675
Merge pull request #7124 from annando/mail-reply 
Mail: Set the "reply" value when it is a reply
 2019-05-09 16:57:19 -04:00
Michael
d9f6a58229 Mail: Set the "reply" value when it is a reply 2019-05-09 20:52:52 +00:00
Philipp
7bd1a34bf8
Merge pull request #7116 from MrPetovan/task/improve-addon-admin 
Improve addon admin
 2019-05-09 16:49:38 +02:00
Philipp
7c3a19be59
Merge pull request #7120 from friendica/MrPetovan-patch-7119 
Break redirection loop during install
 2019-05-08 15:51:17 +02:00
Hypolite Petovan
0cbb9b6d37
Merge pull request #7118 from valvin1/patch-1 
add new disallowed path for robots.txt
 2019-05-08 09:19:09 -04:00
Hypolite Petovan
4740ebcf9b
Merge pull request #7117 from annando/mail 
Mail storing is now centralized
 2019-05-08 09:17:22 -04:00
Hypolite Petovan
123c4610e7
Break redirection loop during install 2019-05-08 08:30:59 -04:00
Valvin
0b1c271837
add new disallowed path for robots.txt 2019-05-08 13:08:34 +02:00
Michael
b8a23369b6 Mail storing is now centralized 2019-05-08 05:44:22 +00:00
Hypolite Petovan
5ff5325e14 Uninstall addon when it wasn't found when accessed from admin aside 2019-05-08 00:46:42 -04:00
Hypolite Petovan
f0f44dbd84 Delete all addon hooks by default on uninstall 2019-05-08 00:46:13 -04:00
Philipp Holzer
9ff0d56e03
Add contact/batch route 2019-05-07 21:15:22 +02:00
Michael
ad6f23b105 Make 7113 really work - now the query does contain AP 2019-05-06 20:53:22 +00:00
Michael
c46a9595cd Update every AP contact once a week 2019-05-06 20:28:40 +00:00
Philipp
7c62a4e02b
Merge pull request #7104 from annando/separated-confirm 
The follow confirmation process is now separated
 2019-05-06 21:40:11 +02:00
Michael
626709159f Some cleaning up 2019-05-06 18:46:30 +00:00
Hypolite Petovan
afb0c7b8fd
Remove remaining disallowed vertical bar in Router 2019-05-06 13:41:48 -04:00
Hypolite Petovan
41642061d7
Merge pull request #7107 from nupplaphil/bug/mod_fix_routes 
Fix contact/group routes
 2019-05-06 13:15:29 -04:00
Philipp Holzer
f497261ec0
added 'updateprofile' 2019-05-06 19:08:15 +02:00
Philipp Holzer
53d13f4e4a
Fix contact routes 2019-05-06 18:57:50 +02:00
Hypolite Petovan
20c9d5fe1d
Merge pull request #7103 from nupplaphil/task/mod_smilies 
Move mod/smilies to src/Module/Smilies
 2019-05-06 12:53:45 -04:00
Philipp Holzer
97f02c2670
Move Smilies::getList() into if 2019-05-06 18:46:37 +02:00
Tobias Diekershoff
959054f2f2 Add subject to DB Update email 2019-05-06 11:13:38 +02:00
Philipp Holzer
23158bc3c8
add feedback 2019-05-06 08:27:57 +02:00
Michael
37f9af2f24 Merge remote-tracking branch 'upstream/develop' into separated-confirm 2019-05-06 05:54:51 +00:00
Michael
5da3e17a12 The follow confirmation process is now separated between DFRN and the rest 2019-05-06 05:46:13 +00:00
Philipp
14d8c12130
Merge pull request #7092 from MrPetovan/task/7047-theme-error-page 
Add style to exception page
 2019-05-06 07:33:42 +02:00
Hypolite Petovan
bd604d1cfb
Merge pull request #7084 from nupplaphil/task/mod_removetag 
Move mod/filerm to src/Module/Filer/RemoveTag
 2019-05-05 20:36:38 -04:00
Hypolite Petovan
fbf36d6e7f
Merge pull request #7086 from nupplaphil/task/mod_maintenance 
Move mod/maintenance to src/Module/Maintenance
 2019-05-05 20:36:12 -04:00
Hypolite Petovan
b79201beaf
Merge pull request #7102 from nupplaphil/task/mod_pretheme 
Move mod/pretheme to src/Module/ThemeDetails
 2019-05-05 20:33:21 -04:00
Hypolite Petovan
1e6affada1
Merge pull request #7101 from nupplaphil/task/mod_viewsrc 
Move mod/viewsrc to src/Module/ItemBody
 2019-05-05 20:32:42 -04:00
Hypolite Petovan
bb8d297ae4
Merge pull request #7097 from nupplaphil/task/mod_after_PR_fixing 
Fixings for Mod-Refactorings
 2019-05-05 20:28:57 -04:00
Hypolite Petovan
12b6ab9943
Merge pull request #7100 from nupplaphil/task/mod_robots_txt 
Move mod/robots_txt to src/Module/RobotsTxt
 2019-05-05 14:23:10 -04:00
Hypolite Petovan
8af0ae171e
Merge pull request #7083 from nupplaphil/task/mod_friendica 
Move mod/friendica to src/Module/Friendica
 2019-05-05 14:19:57 -04:00
Michael Vogel
fb563e0495
Merge pull request #7099 from nupplaphil/task/mod_modexp 
Move mod/modexp to src/Module/PublicRSAKey
 2019-05-05 19:49:51 +02:00
Philipp Holzer
e90876cd86
Move mod/smilies to src/Module/Smilies 2019-05-05 19:39:02 +02:00
Philipp Holzer
3f71a51d21
Move mod/pretheme to src/Module/ThemeDetails 2019-05-05 19:24:10 +02:00
Philipp Holzer
49a3179578
Move mod/viewsrc to src/Module/ItemBody 2019-05-05 19:15:33 +02:00
Philipp Holzer
510c150156
Move mod/robots_txt to src/Module/RobotsTxt 2019-05-05 19:06:51 +02:00
Philipp Holzer
9f0bbd96be
Move mod/modexp to src/Module/PublicRSAKey 2019-05-05 19:02:19 +02:00
Philipp Holzer
039f9490dd
Optimized Profile::searchProfiles & Bugfix Contact::getProbeDataFromDatabase 2019-05-05 18:40:36 +02:00
Philipp Holzer
f6af90fa32
Create XML output for RSD with XML::fromArray() 2019-05-05 18:15:39 +02:00
Philipp Holzer
440d0a3a63
Rename BookMarklet to Bookmarklet 2019-05-05 17:59:57 +02:00
Michael
0244a231d5 Fixes "parent-guid" notice - finally 2019-05-05 15:48:57 +00:00
Michael
f3cae4bf0c Fixes notices 2019-05-05 14:12:43 +00:00
Hypolite Petovan
e17db489ee
Merge pull request #7095 from annando/ap-connect 
Switching from legacy DFRN connect to ActivityPub
 2019-05-05 09:37:43 -04:00
Hypolite Petovan
155d541860
Merge pull request #7093 from nupplaphil/bug/mod_home 
Bugfixing Home
 2019-05-05 08:36:37 -04:00
Hypolite Petovan
c830e4b300
Merge pull request #7091 from nupplaphil/task/mod_rsd 
Move mod/rsd_xml to src/Module/ReallySimpleDiscovery
 2019-05-05 08:30:06 -04:00
Michael
74a25707e1 Filling the protocol on ap contact action 2019-05-05 11:02:19 +00:00
Michael
0efab157c4 Reverted storing the protocol at all the time 2019-05-05 10:36:51 +00:00
Michael Vogel
2365193691 AP: Support of request messages 2019-05-05 11:17:45 +02:00
Philipp Holzer
dc9c9040e5
Bugfixing Home 2019-05-05 10:47:08 +02:00
Philipp Holzer
1a79a741f0
include feedback 2019-05-05 10:09:08 +02:00
Philipp Holzer
9fb111bca2
Rename ServiceUnavailableException & alter maintenance 2019-05-05 10:07:33 +02:00
Philipp Holzer
62fd5375dc
Move mod/maintenance to src/Module/Maintenance 2019-05-05 10:06:50 +02:00
Philipp Holzer
a052b098fc
Move mod/filerm to src/Module/FilerM 2019-05-05 10:02:10 +02:00
Philipp Holzer
9123361d61
added feedback 2019-05-05 10:00:28 +02:00
Hypolite Petovan
0046e62077
Merge pull request #7090 from nupplaphil/task/mod_like 
Move mod/like to src/Module/Like
 2019-05-04 22:02:48 -04:00
Hypolite Petovan
0a8a614608
Merge pull request #7089 from nupplaphil/task/mod_help 
Move mod/help to src/Module/Help
 2019-05-04 22:02:38 -04:00
Hypolite Petovan
c969635bbc Add style to exception page 2019-05-04 21:54:05 -04:00
Hypolite Petovan
3118453fb9
Merge pull request #7088 from nupplaphil/task/mod_invite 
Move mod/invite to src/Module/Invite
 2019-05-04 19:30:13 -04:00
Philipp Holzer
a1f332aaa5
Move mod/rsd_xml to src/Module/ReallySimpleDiscovery 2019-05-04 21:37:32 +02:00
Philipp Holzer
15d0913226
fix quotes 2019-05-04 21:25:16 +02:00
Philipp Holzer
aeae65daf8
Move mod/like to src/Module/Like 2019-05-04 21:20:39 +02:00
Philipp Holzer
1d106762da
Move mod/help to src/Module/Help 2019-05-04 21:06:08 +02:00
Philipp Holzer
bacf9825ff
Move mod/invite to src/Module/Invite 2019-05-04 20:32:31 +02:00
Hypolite Petovan
74fda8f390
Merge pull request #7085 from nupplaphil/task/mod_home 
Move mod/home to src/Module/Home
 2019-05-04 14:09:54 -04:00
Philipp Holzer
35d4daa4f9
Kept the hook, ditched the init 2019-05-04 16:26:32 +02:00
Hypolite Petovan
5e3a55915d
Merge pull request #7078 from nupplaphil/task/mod_fetch 
Move mod/fetch to src/Module/Diaspora/Fetch
 2019-05-04 08:47:23 -04:00
Philipp Holzer
708ffaff51
Move mod/home to src/Module/Home 2019-05-04 13:08:31 +02:00
Philipp Holzer
28d6441d69
add PHP doc 2019-05-04 10:18:41 +02:00
Philipp Holzer
6f787f2422
Move mod/friendica to src/Module/Friendica 2019-05-04 10:14:29 +02:00
Philipp Holzer
6ff3389f6e
add status code to System::externalRedirect 2019-05-04 09:16:37 +02:00
Philipp Holzer
21aa82e064
Add redirect for fetch 2019-05-03 15:08:50 +02:00
Hypolite Petovan
41401bb18d
Merge pull request #7077 from nupplaphil/task/mod_nogroup 
Move mod/nogroup to src/Module/Group
 2019-05-03 08:54:04 -04:00
Philipp Holzer
2b4c710e3f
Move mod/fetch to src/Module/Fetch 2019-05-03 10:42:40 +02:00
Philipp Holzer
1ef4b9c7e4
Move mod/nogroup to src/Module/Group 2019-05-03 08:50:17 +02:00
Philipp
c9cce8492e
Merge pull request #7000 from MrPetovan/task/6999-no-probe-magic-link 
Remove probing in magic link construction
 2019-05-03 08:43:26 +02:00
Michael Vogel
33931ff15e Corrected order 2019-05-03 08:13:02 +02:00
Michael
30a6211d5c Merge branch 'ap-connect' of github.com:annando/friendica into ap-connect 2019-05-03 05:55:19 +00:00
Michael
b1222e174e Ensure that an existing contact isn't archived or pending 2019-05-03 05:54:40 +00:00
Michael Vogel
56d2df04f0 Don't switch Friendica contacts to AP 2019-05-03 07:10:02 +02:00
Michael Vogel
949fd1e8bf Fixes undefined variable 2019-05-03 06:01:01 +02:00
Hypolite Petovan
70bef12fd2 Fix Proxy module routes 
- Fix EOL in view/templates/exception.tpl
 2019-05-02 21:35:37 -04:00
Hypolite Petovan
cd41efe29d
Merge pull request #7071 from nupplaphil/task/mod_bookmarklet 
Move mod/bookmarklet to src/Module/BookMarklet
 2019-05-02 20:03:26 -04:00
Hypolite Petovan
8010ccdc21
Merge pull request #7072 from nupplaphil/task/mod_directory 
Move mod/directory to src/Module/Directory
 2019-05-02 20:03:13 -04:00
Hypolite Petovan
d48b100f78
Merge pull request #7069 from nupplaphil/task/mod_allfriends 
Move mod/allfriends to src/Module/AllFriends
 2019-05-02 20:03:05 -04:00
Hypolite Petovan
4dcdc56e81
Merge pull request #7075 from nupplaphil/task/move_console_namespace 
Move Console namespace one level up
 2019-05-02 18:01:06 -04:00
Philipp
97f723e09e
Merge pull request #7074 from MrPetovan/task/move-display-to-src 
Remove support for defunct Friendica F-Droid app
 2019-05-02 23:55:54 +02:00
Philipp Holzer
83e5fe2539
added url for magic link again 2019-05-02 23:39:20 +02:00
Philipp Holzer
c685ce3db1
Fixed Forbidden message. 2019-05-02 23:35:52 +02:00
Philipp Holzer
43a0f2d8d7
fixed alignment :-) 2019-05-02 23:35:01 +02:00
Philipp Holzer
a5d33444ee
added feedback 2019-05-02 23:32:19 +02:00
Philipp Holzer
a9f701b9d6
merge init() and content() 2019-05-02 23:28:13 +02:00
Philipp Holzer
5879584e15
Remove post() 2019-05-02 23:26:34 +02:00
Philipp Holzer
47d03058d1
Added feedback 2019-05-02 23:26:02 +02:00
Philipp Holzer
d716a3326f
Move Console namespace one level up 2019-05-02 23:17:35 +02:00
Hypolite Petovan
e6bf97777f Remove /display/{nick}/{id} URL structure publishing 
- Remove support for defunct Friendica F-Droid app
 2019-05-02 17:04:17 -04:00
Hypolite Petovan
36996dd422 Remove usage of non-existent Module\Special\HTTPException::rawContent return value 2019-05-02 16:56:34 -04:00
Philipp Holzer
2e9b2d72be
Move mod/directory to src/Module/Directory 2019-05-02 22:49:33 +02:00
Philipp Holzer
b2ff31da74
Move mod/bookmarklet to src/Module/BookMarklet 2019-05-02 22:17:09 +02:00
Philipp Holzer
bbd3071940
Remove old BaseModule routing 2019-05-02 22:05:56 +02:00
Michael
9941c33123 Removing a contact request needn't to be one not approved requests 2019-05-02 20:04:15 +00:00
Philipp Holzer
c5e7abf9c5
Move mod/allfriends to src/Module/AllFriends 2019-05-02 22:03:27 +02:00
Michael
a4dffee5f4 Fix wrong error message when updated a contact 2019-05-02 19:22:43 +00:00
Philipp
2628da422a
Merge pull request #7068 from MrPetovan/task/7047-theme-error-page 
Themed error page redux
 2019-05-02 21:15:29 +02:00
Philipp
774d04cd2f
Merge pull request #7044 from MrPetovan/task/router 
Move mod/admin to src/Module/Admin
 2019-05-02 18:26:30 +02:00
Hypolite Petovan
41f781c52a Replace System::httpExit() by HTTPException throwing 2019-05-02 11:37:09 -04:00
Hypolite Petovan
358baa9f62 Add themed error pages 
- Module init, post and rawContent-triggered HTTPException generate the classic bare HTTP status page
- Module content-triggered HTTPException generate themed error pages
- Trim System::httpExit to the bare minimum
 2019-05-02 11:26:56 -04:00
Hypolite Petovan
8eba329111 Remove code parameter from HTTPException constructor 
- Remove duplicate HTTPException->httpcode class variable
 2019-05-02 11:26:55 -04:00
Philipp
07cb887885
Merge pull request #7067 from MrPetovan/task/remove-app-error 
Remove App->error
 2019-05-02 17:24:56 +02:00
Hypolite Petovan
b4b8c61daf Add @TODO comments per @nupplaphil review in various Admin modules 2019-05-02 10:20:02 -04:00
Hypolite Petovan
92b415bc36 Fix EOL and EOF in Admin modules 2019-05-02 09:55:50 -04:00
Hypolite Petovan
2a035b9b2f Use DBA::fetchFirst instead of DBA::p for aggregate query in Module\Admin\Federation 2019-05-02 09:55:50 -04:00
Hypolite Petovan
451a06a597 Various code inspection items 
- Fix class extension in Module\Admin\Item\Source
- Remove useless condition in Module\Admin\Features
 2019-05-02 09:55:50 -04:00
Hypolite Petovan
6df37afb82 Various feedback items 
- Add logger call on theme install failure
- Add todo in Module\Admin\DBSync
 2019-05-02 09:55:49 -04:00
Hypolite Petovan
71546705f8 Add Model\Contact::select method 2019-05-02 09:55:49 -04:00
Hypolite Petovan
9f4fb4906a Move addon admin list generation to Core\Addon 2019-05-02 09:55:49 -04:00
Hypolite Petovan
9774c95b80 Remove duplicate $baseurl template variable 
- Remove unused $overwriteURL parameter in Renderer::replaceMacros
 2019-05-02 09:55:48 -04:00
Hypolite Petovan
d8125eb3db Make the site admin theme setting link go to the currently selected theme 2019-05-02 09:52:55 -04:00
Hypolite Petovan
3d64ac603e Backport updated Pleroma version number handling 2019-05-02 09:52:54 -04:00
Hypolite Petovan
db5b66e6f1 Update Smarty input field help comment in Admin\Logs\Settings 2019-05-02 09:52:54 -04:00
Hypolite Petovan
fb503e82bf Normalize how we store enabled addons/themes in config value to straight comma-separated list 2019-05-02 09:52:54 -04:00
Hypolite Petovan
2368eacc19 Add remaining non-admin links in admin menu 2019-05-02 09:52:53 -04:00
Hypolite Petovan
fa4b42c6dd Move phpinfo module to src/Module/Admin 2019-05-02 09:52:53 -04:00
Hypolite Petovan
ad02fd140a Move /itemsource to src/Module/Admin 2019-05-02 09:52:53 -04:00
Hypolite Petovan
bc5d1384e1 Move admin/deleteitem to src/Module/Admin 2019-05-02 09:52:52 -04:00
Hypolite Petovan
a201391d11 Move admin/dbsync to src/Module 2019-05-02 09:52:51 -04:00
Hypolite Petovan
df947ba9db Move admin/logs to src/Module 2019-05-02 09:52:51 -04:00
Hypolite Petovan
740723534f Move admin/site to src/Module 
- Replace default theme settings modal with simple link to admin/themes
 2019-05-02 09:52:50 -04:00
Hypolite Petovan
d0b40cda4c Move admin/themes/{theme} to src/Module 
- Remove now unused templates/admin/addon_detail.tpl
- Remove references to themes admin in mod/admin.php
 2019-05-02 09:52:50 -04:00
Hypolite Petovan
a5da0fd98f Add admin/themes/{theme}/embed module 
- This module allows editing the site settings for a theme with a different user theme
 2019-05-02 09:52:49 -04:00
Hypolite Petovan
5a01c53781 Move admin/queue to src/Module 
- Add Module\Admin\Queue class
- Add route for admin/queue[/deferred]
- Add queue admin aside menu entry
- Remove obsolete templates/admin/queue.tpl from base and frio
- Move templates/admin/workerqueue.tpl to templates/admin/queue.tpl
- Remove admin_page_workerqueue and admin_page_workerqueue_post from mod/admin.php
- Update admin/summary.tpl with new queue admin paths
 2019-05-02 09:52:48 -04:00
Hypolite Petovan
5750623b48 Move admin/blocklist/server to src/Module 
- Add Module\Admin\Blocklist\Server class
- Add route for admin/blocklist/server
- Add server blocklist admin aside menu entry
- Move templates/admin/blocklist.tpl to templates/admin/blocklist/server.tpl
- Remove admin_page_blocklist and admin_page_blocklist_post from mod/admin.php
 2019-05-02 09:52:47 -04:00
Hypolite Petovan
cf885841c8 Move admin/blocklist/contact to src/Module 
- Add Module\Admin\ContactBlock\Contact class
- Add route for admin/blocklist/contact
- Add contact blocklist admin aside menu entry
- Move templates/admin/contactblock.tpl to templates/admin/blocklist/contact.tpl in base and frio
- Remove admin_page_contactblock and admin_page_contactblock_post from mod/admin.php
 2019-05-02 09:52:46 -04:00
Hypolite Petovan
446cb905e4 Move admin/features to src/Module 
- Add Module\Admin\Features class
- Add route for admin/features
- Add features admin aside menu entry
- Move templates/admin/settings_features.tpl to templates/admin/features.tpl
- Remove admin_page_features and admin_page_features_post from mod/admin.php
 2019-05-02 09:52:46 -04:00
Hypolite Petovan
f3f055758c Move admin/users to src/Module 
- Add Module\Admin\Users class
- Add route for admin/users[/{action}/{uid}]
- Add users admin aside menu entry
- Remove admin_page_users and admin_page_users_post from mod/admin.php
 2019-05-02 09:52:45 -04:00
Hypolite Petovan
87e51ddd67 Move admin/addons/{addon} to src/Module 
- Add Module\Admin\Addons\Details class
- Add route for admin/addons/{addon}
- Remove addons pages from mod/admin
 2019-05-02 09:52:44 -04:00
Hypolite Petovan
9bbb438534 Move admin/addons to src/Module 
- Add Module\Admin\Addons\Index class
- Add route for admin/addons
- Add addons admin aside menu entry
- Remove unused template admin/addons.tpl from base and frio
- Remove addon list from mod/admin
 2019-05-02 09:52:44 -04:00
Hypolite Petovan
a13bc14933 Move admin/themes to src/Module 
- Add Module\Admin\Themes\Index class
- Add route for admin/themes
- Add themes admin aside menu entry
- Add admin/addons/index.tpl template
- Remove theme list from mod/admin
 2019-05-02 09:52:43 -04:00
Hypolite Petovan
9227aab837 Add system.allowed_themes config key handling in Core\Theme 
- Add Theme::setAllowedList method
- Update the allowed theme list on theme install/uninstall
- Add theme file inclusion on uninstall allowing for theme_uninstall function to be called
- Removing logging from frontend methods
 2019-05-02 09:52:42 -04:00
Hypolite Petovan
488e425416 Move admin/tos to src/Module 
- Add Module\Admin\Tos class
- Add route for admin/tos
- Add admin aside menu entry
- Remove admin_page_tos and admin_page_tos_post from mod/admin.php
 2019-05-02 09:52:42 -04:00
Hypolite Petovan
35d222f95d Move admin/federation to src/Module 
- Add Module\Admin\Federation class
- Add missing abstract keyword in Module\BaseAdminModule
- Add route for admin/federation
- Remove admin_page_federation()  from mod/admin.php
 2019-05-02 09:52:42 -04:00
Hypolite Petovan
6387a77b52 Move admin summary to src/Module 
- Add BaseAdminModule class
- Add Module\Admin\Summary class
- Add Route for Admin\Summary module
- Remove admin_page_summary() in mod/admin
- Remove $showwarning variable from admin/summary.tpl
 2019-05-02 09:52:41 -04:00
Michael
8adf0e6e5c Removed test logging 2019-05-02 13:46:12 +00:00
Michael
28f316b7e4 Replace the legacy DFRN connection process with AP 2019-05-02 13:05:31 +00:00
Philipp
51210af221
Merge branch 'develop' into task/mod_hostxrd 2019-05-02 12:33:53 +02:00
Hypolite Petovan
10114661d4
Merge pull request #7065 from nupplaphil/task/mod_add_routes 
Add routes to all current BaseModules
 2019-05-02 00:04:22 -04:00