Merge remote-tracking branch 'origin/3.2.5' into 3.2.5

This commit is contained in:
Lagacé Mathieu
2020-01-22 12:04:39 -05:00
28 changed files with 2606 additions and 231 deletions

View File

@@ -15,6 +15,9 @@ use Illuminate\Support\Facades\Storage;
/* Basic Auth Route */
Auth::routes();
Route::get('logout', 'Auth\LoginController@logout')->name('logout');
Route::get("/test/{id}",'ScheduleEditorController@getEventTemplate');
Route::get("/test/{id}",'ScheduleEditorController@getEventTemplate');
Route::get('/ocom/create','OCOMController@create');
@@ -27,10 +30,6 @@ Route::get('/activity/{id}', 'ComplementaryActivityController@show');
Route::get('/picture/{id}', 'PictureController@show');
Route::get('/pictures', 'PictureController@index');
Route::get('/test',function(){
clog('add','success','Test');
});
Route::middleware(['auth'])->group(function () {
/* Espace Administration Route */