From: Dan Brown <redacted>
Date: Sat, 20 Jan 2018 14:01:56 +0000 (+0000)
Subject: Merge branch 'master' into draw.io
X-Git-Tag: v0.20.0~1^2~21^2~7
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/34782fbc912f0a2e5d8329953905d13c601f8d21?ds=inline;hp=-c

Merge branch 'master' into draw.io
---

34782fbc912f0a2e5d8329953905d13c601f8d21
diff --combined routes/web.php
index 266e297f3,5ddb3fb94..08c919e26
--- a/routes/web.php
+++ b/routes/web.php
@@@ -86,16 -86,13 +86,16 @@@ Route::group(['middleware' => 'auth'], 
          Route::get('/user/all/{page}', 'ImageController@getAllForUserType');
          // Standard get, update and deletion for all types
          Route::get('/thumb/{id}/{width}/{height}/{crop}', 'ImageController@getThumbnail');
 +        Route::get('/base64/{id}', 'ImageController@getBase64Image');
          Route::put('/update/{imageId}', 'ImageController@update');
 +        Route::post('/drawing/upload', 'ImageController@uploadDrawing');
 +        Route::put('/drawing/upload/{id}', 'ImageController@replaceDrawing');
          Route::post('/{type}/upload', 'ImageController@uploadByType');
          Route::get('/{type}/all', 'ImageController@getAllByType');
          Route::get('/{type}/all/{page}', 'ImageController@getAllByType');
          Route::get('/{type}/search/{page}', 'ImageController@searchByType');
          Route::get('/gallery/{filter}/{page}', 'ImageController@getGalleryFiltered');
 -        Route::delete('/{imageId}', 'ImageController@destroy');
 +        Route::delete('/{id}', 'ImageController@destroy');
      });
  
      // Attachments routes
@@@ -149,6 -146,7 +149,7 @@@
          Route::get('/users', 'UserController@index');
          Route::get('/users/create', 'UserController@create');
          Route::get('/users/{id}/delete', 'UserController@delete');
+         Route::patch('/users/{id}/switch-book-view', 'UserController@switchBookView');
          Route::post('/users/create', 'UserController@store');
          Route::get('/users/{id}', 'UserController@edit');
          Route::put('/users/{id}', 'UserController@update');