Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-11 15:42:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
23896 commits 3 branches 64 tags 246 MiB
Commit graph

3561 commits

Author SHA1 Message Date
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