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
Philipp
900fe158f5
Merge pull request #7076 from MrPetovan/bug/fix-proxy-router
...
Fix Proxy module routes
2019-05-03 07:31:30 +02:00
Michael Vogel
56d2df04f0
Don't switch Friendica contacts to AP
2019-05-03 07:10:02 +02:00
Michael Vogel
6c34196264
Cleaning confirm
2019-05-03 06:17:26 +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
d60edb5056
Merge pull request #7073 from MrPetovan/task/7047-theme-error-page
...
Remove usage of non-existent Module\Special\HTTPException::rawContent return value
2019-05-02 23:36:33 +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
Hypolite Petovan
5b1fe458d9
Merge pull request #7070 from nupplaphil/task/mod_old_routing
...
Remove old BaseModule routing
2019-05-02 16:51:58 -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
Hypolite Petovan
08ef4c23d7
Replace last references to removed HTTPException->httpcode property
2019-05-02 13:08:06 -04: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
ba3cd1334a
Fix Api and BaseObject tests
2019-05-02 11:37:09 -04: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
