UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-12-23 13:33:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1404 from pixelfed/frontend-ui-refactor

Browse source 
Frontend ui refactor
This commit is contained in:
daniel 2019-06-16 16:42:36 -06:00 committed by GitHub
commit 1fec262a8c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/pixelfed.php
View file

@ -246,7 +246,7 @@ return [
| |
*/ */
'user_invites' => [ 'user_invites' => [
'enabled' => env('PF_USER_INVITES', false), 'enabled' => false, //env('PF_USER_INVITES', false),
'limit' => [ 'limit' => [
'total' => (int) env('PF_USER_INVITES_TOTAL_LIMIT', 0), 'total' => (int) env('PF_USER_INVITES_TOTAL_LIMIT', 0),
'daily' => (int) env('PF_USER_INVITES_DAILY_LIMIT', 0), 'daily' => (int) env('PF_USER_INVITES_DAILY_LIMIT', 0),

7
routes/web.php
View file

@ -225,6 +225,7 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact
'2fa/recovery-codes', '2fa/recovery-codes',
'SettingsController@securityTwoFactorRecoveryCodesRegenerate' 'SettingsController@securityTwoFactorRecoveryCodesRegenerate'
); );
}); });
Route::get('applications', 'SettingsController@applications')->name('settings.applications')->middleware('dangerzone'); Route::get('applications', 'SettingsController@applications')->name('settings.applications')->middleware('dangerzone');
@ -238,10 +239,16 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact
Route::get('labs', 'SettingsController@labs')->name('settings.labs'); Route::get('labs', 'SettingsController@labs')->name('settings.labs');
Route::post('labs', 'SettingsController@labsStore'); Route::post('labs', 'SettingsController@labsStore');
Route::get('accessibility', 'SettingsController@accessibility')->name('settings.accessibility');
Route::post('accessibility', 'SettingsController@accessibilityStore');
Route::group(['prefix' => 'relationships'], function() { Route::group(['prefix' => 'relationships'], function() {
Route::redirect('/', '/settings/relationships/home'); Route::redirect('/', '/settings/relationships/home');
Route::get('home', 'SettingsController@relationshipsHome')->name('settings.relationships'); Route::get('home', 'SettingsController@relationshipsHome')->name('settings.relationships');
}); });
Route::get('invites/create', 'UserInviteController@create')->name('settings.invites.create');
Route::post('invites/create', 'UserInviteController@store');
Route::get('invites', 'UserInviteController@show')->name('settings.invites');
}); });
Route::group(['prefix' => 'site'], function () { Route::group(['prefix' => 'site'], function () {