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