ac0b29fb6d 
								
							 
						 
						
							
							
								
								Added view, deletion and permissions for files  
							
							
							
						 
						
							2016-10-10 20:30:27 +01:00  
				
					
						
							
							
								 
						
							
								673c74ddfc 
								
							 
						 
						
							
							
								
								Started work on attachments  
							
							... 
							
							
							
							Created base models and started user-facing controls. 
							
						 
						
							2016-10-09 18:58:22 +01:00  
				
					
						
							
							
								 
						
							
								3b7d223b0c 
								
							 
						 
						
							
							
								
								Updated and added tests for new default user system  
							
							... 
							
							
							
							Closes  #138  
						
							2016-09-29 17:07:58 +01:00  
				
					
						
							
							
								 
						
							
								b662670efc 
								
							 
						 
						
							
							
								
								Prevented guest users creating draft pages.  
							
							
							
						 
						
							2016-09-29 15:56:57 +01:00  
				
					
						
							
							
								 
						
							
								771626b6ec 
								
							 
						 
						
							
							
								
								Started work on making the public role/user configurable  
							
							... 
							
							
							
							Create a new 'public' guest user and made the public
role visible on role setting screens. 
							
						 
						
							2016-09-29 12:43:46 +01:00  
				
					
						
							
							
								 
						
							
								f15cc5bdfa 
								
							 
						 
						
							
							
								
								Separated revision preview and diff & fixed chosen diff html  
							
							... 
							
							
							
							Closes  #8  
						
							2016-09-29 10:10:46 +01:00  
				
					
						
							
							
								 
						
							
								fff5bbcee4 
								
							 
						 
						
							
							
								
								Merge branch 'diff' of git://github.com/younes0/BookStack into younes0-diff  
							
							
							
						 
						
							2016-09-29 09:32:40 +01:00  
				
					
						
							
							
								 
						
							
								42d8e9e5bd 
								
							 
						 
						
							
							
								
								Improved numeric term search capabilities  
							
							... 
							
							
							
							Prevented a quoted term also being added to fuzzy searches
and also added check to see if the term is numeric to check if
an exact match is required.
Closes  #200  
							
						 
						
							2016-09-29 09:13:15 +01:00  
				
					
						
							
							
								 
						
							
								1d681e53e4 
								
							 
						 
						
							
							
								
								Added page navigation and tweaked header styles  
							
							... 
							
							
							
							Changed header selection in editor to be more descriptive and
to provide a wider range of styles.
Closes  #68  
							
						 
						
							2016-09-18 14:49:36 +01:00  
				
					
						
							
							
								 
						
							
								e0235fda8b 
								
							 
						 
						
							
							
								
								Made registration gravatar/email requests fail gracefully  
							
							... 
							
							
							
							* Extracted any email confirmation text into langs.
* Added new notification on confirmation email send fail.
Closes  #187  
							
						 
						
							2016-09-17 21:33:55 +01:00  
				
					
						
							
							
								 
						
							
								9dc9724e15 
								
							 
						 
						
							
							
								
								Laravel 5.3 upgrade ( #189 )  
							
							... 
							
							
							
							* Started move to laravel 5.3
* Started updating login & registration flows for laravel 5.3 update
* Updated app emails to notification system
* Fixed registations bugs and removed email confirmation model
* Fixed large portion of laravel post-upgrade issues
* Fixed and tested LDAP process 
							
						 
						
							2016-09-17 18:22:04 +01:00  
				
					
						
							
							
								 
						
							
								bbd8fff021 
								
							 
						 
						
							
							
								
								Fixed bad image base-urls and forced tinyMCE to use absolute  
							
							... 
							
							
							
							Also ensured image file existance is checked during base64 conversion
during exports.
Closes  #171 . 
							
						 
						
							2016-09-03 19:24:58 +01:00  
				
					
						
							
							
								 
						
							
								ec17bd8608 
								
							 
						 
						
							
							
								
								Improved Exception handling, Removed npm requirement for testing  
							
							
							
						 
						
							2016-09-03 12:08:58 +01:00  
				
					
						
							
							
								 
						
							
								3f81eba13b 
								
							 
						 
						
							
							
								
								Updated travis testing to work with new helper configuration ( #175 )  
							
							... 
							
							
							
							* Updated travis to call phpunit globally rather then booting application first 
							
						 
						
							2016-08-27 11:27:23 +01:00  
				
					
						
							
							
								 
						
							
								7973412c29 
								
							 
						 
						
							
							
								
								Improved sort efficiency by a factor of 10  
							
							... 
							
							
							
							Fixes  #145  
						
							2016-08-26 20:20:58 +01:00  
				
					
						
							
							
								 
						
							
								f83de5f834 
								
							 
						 
						
							
							
								
								Fixed single word quoted search terms  
							
							... 
							
							
							
							Fixes  #170  
						
							2016-08-25 17:17:26 +01:00  
				
					
						
							
							
								 
						
							
								96c074bb56 
								
							 
						 
						
							
							
								
								Merge fixes from branch 'v0.11'  
							
							
							
						 
						
							2016-08-21 15:02:37 +01:00  
				
					
						
							
							
								 
						
							
								f8a299caee 
								
							 
						 
						
							
							
								
								Fixed login 'intended' redirect for custom urls.  
							
							... 
							
							
							
							Also changed social account detach wording. 
							
						 
						
							2016-08-21 14:49:40 +01:00  
				
					
						
							
							
								 
						
							
								437dce7756 
								
							 
						 
						
							
							
								
								Applied baseUrl to login redirect  
							
							
							
						 
						
							2016-08-21 13:48:56 +01:00  
				
					
						
							
							
								 
						
							
								632ecc668f 
								
							 
						 
						
							
							
								
								Applied baseUrl to login redirect  
							
							
							
						 
						
							2016-08-15 15:07:45 +01:00  
				
					
						
							
							
								 
						
							
								92d393537c 
								
							 
						 
						
							
							
								
								Merge branch 'v0.11'  
							
							
							
						 
						
							2016-08-14 13:09:44 +01:00  
				
					
						
							
							
								 
						
							
								43d9d2eba7 
								
							 
						 
						
							
							
								
								Updated all application urls to allow path prefix.  
							
							... 
							
							
							
							Allows BookStack to be installed at a non-root location on a domain.
Closes  #40 . 
							
						 
						
							2016-08-14 12:29:35 +01:00  
				
					
						
							
							
								 
						
							
								baa260a03d 
								
							 
						 
						
							
							
								
								Started work on subdirectory support  
							
							
							
						 
						
							2016-08-13 17:56:25 +01:00  
				
					
						
							
							
								 
						
							
								2d958e88bf 
								
							 
						 
						
							
							
								
								Fixed entities created with blank slugs.  
							
							... 
							
							
							
							Fixes  #156 . 
						
							2016-08-13 13:53:04 +01:00  
				
					
						
							
							
								 
						
							
								42976ca48c 
								
							 
						 
						
							
							
								
								Fixed revision-based redirect on new pages  
							
							
							
						 
						
							2016-07-26 18:16:40 +01:00  
				
					
						
							
							
								 
						
							
								7215392784 
								
							 
						 
						
							
							
								
								Changed when revisions are saved and update changelog input  
							
							... 
							
							
							
							Revisions are now saved when te page content is originally saved whereas before they were saved on the next update to the page. 
							
						 
						
							2016-07-10 12:12:52 +01:00  
				
					
						
							
							
								 
						
							
								c279c6e2af 
								
							 
						 
						
							
							
								
								replace GPL diff lib with MIT lib  
							
							... 
							
							
							
							replace gpl lib with mit lib 
							
						 
						
							2016-07-10 12:01:05 +02:00  
				
					
						
							
							
								 
						
							
								8a9a8dfae5 
								
							 
						 
						
							
							
								
								Merge branch 'summary' of git://github.com/younes0/BookStack into younes0-summary  
							
							
							
						 
						
							2016-07-10 10:42:47 +01:00  
				
					
						
							
							
								 
						
							
								c44314def3 
								
							 
						 
						
							
							
								
								Added check for s3 bucket name to choose shortest url  
							
							
							
						 
						
							2016-07-10 10:28:05 +01:00  
				
					
						
							
							
								 
						
							
								8b899a9cf0 
								
							 
						 
						
							
							
								
								Merge branch 'patch-1' of git://github.com/younes0/BookStack into younes0-patch-1  
							
							
							
						 
						
							2016-07-10 10:15:38 +01:00  
				
					
						
							
							
								 
						
							
								32a06f119b 
								
							 
						 
						
							
							
								
								set uploaded files public visibliity (relevant for S3 storage)  
							
							
							
						 
						
							2016-07-09 15:26:53 +02:00  
				
					
						
							
							
								 
						
							
								ec30864ce5 
								
							 
						 
						
							
							
								
								shorter amazon S3 url  
							
							
							
						 
						
							2016-07-09 14:33:37 +02:00  
				
					
						
							
							
								 
						
							
								6bc72e157a 
								
							 
						 
						
							
							
								
								edit summary  
							
							
							
						 
						
							2016-07-07 20:53:43 +02:00  
				
					
						
							
							
								 
						
							
								9537e2ae95 
								
							 
						 
						
							
							
								
								html diff in revision view  
							
							
							
						 
						
							2016-07-07 19:54:40 +02:00  
				
					
						
							
							
								 
						
							
								a11d5245ec 
								
							 
						 
						
							
							
								
								Cut down homepage queries a little  
							
							
							
						 
						
							2016-07-03 10:42:13 +01:00  
				
					
						
							
							
								 
						
							
								565033e0d4 
								
							 
						 
						
							
							
								
								Fixed bug which hid entities and fixed new chapter priority  
							
							
							
						 
						
							2016-07-03 10:31:20 +01:00  
				
					
						
							
							
								 
						
							
								b0a63ba0cc 
								
							 
						 
						
							
							
								
								Tightened and cleaned some list styles  
							
							
							
						 
						
							2016-07-03 09:58:45 +01:00  
				
					
						
							
							
								 
						
							
								7b6c88f17c 
								
							 
						 
						
							
							
								
								Fixed error on image deletion  
							
							... 
							
							
							
							Also Added tests to cover image upload and deletion.
Fixes  #136 . 
							
						 
						
							2016-07-01 20:13:30 +01:00  
				
					
						
							
							
								 
						
							
								9baa96d41c 
								
							 
						 
						
							
							
								
								Added chapter move actions.  Closes   #86  
							
							
							
						 
						
							2016-06-25 15:31:38 +01:00  
				
					
						
							
							
								 
						
							
								7f99903fdb 
								
							 
						 
						
							
							
								
								Finished off page move functionality  
							
							
							
						 
						
							2016-06-12 12:14:14 +01:00  
				
					
						
							
							
								 
						
							
								97d011ac8e 
								
							 
						 
						
							
							
								
								Started work on page move view and entity selector  
							
							
							
						 
						
							2016-06-11 21:04:18 +01:00  
				
					
						
							
							
								 
						
							
								61596a8e21 
								
							 
						 
						
							
							
								
								Prevent page redirect on draft saving  
							
							... 
							
							
							
							Only an issue when using the non 'mysqlnd' extension.
Fixes  #120  
							
						 
						
							2016-06-10 19:45:53 +01:00  
				
					
						
							
							
								 
						
							
								eec9c05518 
								
							 
						 
						
							
							
								
								Added tag autosuggestion when no input provided  
							
							... 
							
							
							
							Shows the most popular tag names/values.
As requested on #121  
							
						 
						
							2016-06-04 15:37:28 +01:00  
				
					
						
							
							
								 
						
							
								246d1621f5 
								
							 
						 
						
							
							
								
								Limited tag value autosuggestions based on tag name  
							
							... 
							
							
							
							As requested on #121  
							
						 
						
							2016-06-04 14:54:31 +01:00  
				
					
						
							
							
								 
						
							
								947db95d16 
								
							 
						 
						
							
							
								
								Fixed error with similar activity filtering  
							
							
							
						 
						
							2016-05-28 14:02:48 +01:00  
				
					
						
							
							
								 
						
							
								be517de7dc 
								
							 
						 
						
							
							
								
								Added pagination, sorting & searching to users list  
							
							... 
							
							
							
							As requested on #113  
							
						 
						
							2016-05-22 10:44:31 +01:00  
				
					
						
							
							
								 
						
							
								23ab1f0c81 
								
							 
						 
						
							
							
								
								Standardised delete aesthetics regarding roles and users  
							
							... 
							
							
							
							Also added user delete success message.
Fixes  #114  
							
						 
						
							2016-05-22 09:23:41 +01:00  
				
					
						
							
							
								 
						
							
								e80ae76856 
								
							 
						 
						
							
							
								
								Added auto-suggestions to tag names and values  
							
							
							
						 
						
							2016-05-15 20:12:53 +01:00  
				
					
						
							
							
								 
						
							
								eebad3e2a0 
								
							 
						 
						
							
							
								
								Fixed tags not being saved on new pages  
							
							
							
						 
						
							2016-05-15 14:17:25 +01:00  
				
					
						
							
							
								 
						
							
								8d80e7311c 
								
							 
						 
						
							
							
								
								Added tag searching to search interfaces  
							
							
							
						 
						
							2016-05-15 13:41:18 +01:00  
				
					
						
							
							
								 
						
							
								7932069535 
								
							 
						 
						
							
							
								
								Added tags to page display and simplified editing flow  
							
							... 
							
							
							
							Tags now save with the page content data 
							
						 
						
							2016-05-15 10:39:17 +01:00  
				
					
						
							
							
								 
						
							
								78564ec61d 
								
							 
						 
						
							
							
								
								Cleaned up tag edit interface  
							
							
							
						 
						
							2016-05-14 20:02:00 +01:00  
				
					
						
							
							
								 
						
							
								b80184cd93 
								
							 
						 
						
							
							
								
								Renamed attribute to tags & continued interface  
							
							... 
							
							
							
							Also fixed page create route broken in last commit 
							
						 
						
							2016-05-13 21:20:21 +01:00  
				
					
						
							
							
								 
						
							
								1fa079b466 
								
							 
						 
						
							
							
								
								Started the page attributes interface  
							
							
							
						 
						
							2016-05-12 23:12:05 +01:00  
				
					
						
							
							
								 
						
							
								fcfb9470c9 
								
							 
						 
						
							
							
								
								Added further attribute endpoints and added tests  
							
							
							
						 
						
							2016-05-07 14:29:43 +01:00  
				
					
						
							
							
								 
						
							
								c99653f0f2 
								
							 
						 
						
							
							
								
								Fixed bad refactor in the permission service  
							
							
							
						 
						
							2016-05-06 20:44:07 +01:00  
				
					
						
							
							
								 
						
							
								5080b4996e 
								
							 
						 
						
							
							
								
								Started base work on attribute system  
							
							
							
						 
						
							2016-05-06 20:33:08 +01:00  
				
					
						
							
							
								 
						
							
								1903422113 
								
							 
						 
						
							
							
								
								Merge branch 'v0.9'  
							
							
							
						 
						
							2016-05-03 21:30:55 +01:00  
				
					
						
							
							
								 
						
							
								4e8722661f 
								
							 
						 
						
							
							
								
								Added bookstack version in settings  
							
							... 
							
							
							
							Gets the app version via git. Closes  #99  
							
						 
						
							2016-05-03 21:10:05 +01:00  
				
					
						
							
							
								 
						
							
								3a1cda5802 
								
							 
						 
						
							
							
								
								Updated ldap so extension not required in testing  
							
							
							
						 
						
							2016-05-02 11:38:07 +01:00  
				
					
						
							
							
								 
						
							
								5c1015d6fc 
								
							 
						 
						
							
							
								
								Updated social testing compatibility  
							
							
							
						 
						
							2016-05-02 11:26:47 +01:00  
				
					
						
							
							
								 
						
							
								75a4fc905b 
								
							 
						 
						
							
							
								
								Major permission naming refactor and database migration cleanup  
							
							
							
						 
						
							2016-05-01 22:33:56 +01:00  
				
					
						
							
							
								 
						
							
								05666efda9 
								
							 
						 
						
							
							
								
								Added hidden public role to fit with new permissions system  
							
							
							
						 
						
							2016-05-01 19:36:53 +01:00  
				
					
						
							
							
								 
						
							
								59367b3417 
								
							 
						 
						
							
							
								
								Improved permission regen performance by factor of 4  
							
							... 
							
							
							
							Worked around slower eloquent access to speed up permission generation. 
							
						 
						
							2016-04-30 17:16:06 +01:00  
				
					
						
							
							
								 
						
							
								9a31b83b2a 
								
							 
						 
						
							
							
								
								Worked around create permission quirks  
							
							
							
						 
						
							2016-04-26 21:48:17 +01:00  
				
					
						
							
							
								 
						
							
								a81a56706e 
								
							 
						 
						
							
							
								
								Rolled out new permissions system throughout application  
							
							
							
						 
						
							2016-04-24 16:54:20 +01:00  
				
					
						
							
							
								 
						
							
								ada7c83e96 
								
							 
						 
						
							
							
								
								Continued with database work for permissions overhaul  
							
							... 
							
							
							
							Added to the entity_permissions table with further required fields and indexes.
Wrote the code for checking permissions. 
							
						 
						
							2016-04-23 18:14:26 +01:00  
				
					
						
							
							
								 
						
							
								ea287ebf86 
								
							 
						 
						
							
							
								
								Started creation of intermediate permission table  
							
							
							
						 
						
							2016-04-20 21:37:57 +01:00  
				
					
						
							
							
								 
						
							
								043cdeafb3 
								
							 
						 
						
							
							
								
								Merge branch 'master' into add_role_view_permissions  
							
							
							
						 
						
							2016-04-20 20:22:30 +01:00  
				
					
						
							
							
								 
						
							
								8933179017 
								
							 
						 
						
							
							
								
								Prevented drafts from showing up in a book sort  
							
							... 
							
							
							
							Added tests to cover regresssion.
In reference to #100 . 
							
						 
						
							2016-04-15 19:51:27 +01:00  
				
					
						
							
							
								 
						
							
								d6bad01130 
								
							 
						 
						
							
							
								
								Fixed draft time display, Cleaned up some code  
							
							... 
							
							
							
							Cleaned up some comment spacing in book controller and refactored some of the view service functions. 
							
						 
						
							2016-04-09 14:26:42 +01:00  
				
					
						
							
							
								 
						
							
								2e7345f4f0 
								
							 
						 
						
							
							
								
								Localised draft save time display  
							
							... 
							
							
							
							In reference to #83 . 
							
						 
						
							2016-04-09 13:36:32 +01:00  
				
					
						
							
							
								 
						
							
								6e03078de3 
								
							 
						 
						
							
							
								
								Started work towards adding role view permissions  
							
							... 
							
							
							
							Work halted as re-write required.
In reference to #92  
							
						 
						
							2016-04-09 12:40:07 +01:00  
				
					
						
							
							
								 
						
							
								1a7de4c2d6 
								
							 
						 
						
							
							
								
								Fixed and cleaned some permisison/role based components  
							
							
							
						 
						
							2016-04-09 12:37:58 +01:00  
				
					
						
							
							
								 
						
							
								afc3583be8 
								
							 
						 
						
							
							
								
								Made new pages in chapters have a better inital priority  
							
							
							
						 
						
							2016-04-07 19:03:00 +01:00  
				
					
						
							
							
								 
						
							
								cbff2c6035 
								
							 
						 
						
							
							
								
								Added uploaded to book/page filters & search in image manager  
							
							... 
							
							
							
							Also refactored tab styles which affected the settings area.
Closes  #41  
							
						 
						
							2016-04-03 14:59:54 +01:00  
				
					
						
							
							
								 
						
							
								d099885fd1 
								
							 
						 
						
							
							
								
								Fixed some label casing and fixed incorrect notifications  
							
							... 
							
							
							
							Fixed the book & chapter permission update notification stating the 'page permissions' have been updated. 
							
						 
						
							2016-04-03 12:19:44 +01:00  
				
					
						
							
							
								 
						
							
								2bb8c3d914 
								
							 
						 
						
							
							
								
								Made email confirmations work with LDAP auth  
							
							... 
							
							
							
							The email_confirmed user field now actually indicates if an email is confirmed rather than defaulting to true if not checked.
 This ensures toggleing the 'Require email confirmation' setting actually makes all currently unconfirmed users confirm thier emails. 
							
						 
						
							2016-04-03 12:16:54 +01:00  
				
					
						
							
							
								 
						
							
								4caa61fe96 
								
							 
						 
						
							
							
								
								Added a friendlier error for LDAP new user mismatches  
							
							
							
						 
						
							2016-04-03 11:16:49 +01:00  
				
					
						
							
							
								 
						
							
								e9b596d3bc 
								
							 
						 
						
							
							
								
								Merge bugfixes from branch 'v0.8'  
							
							
							
						 
						
							2016-03-30 21:49:25 +01:00  
				
					
						
							
							
								 
						
							
								8b109bac13 
								
							 
						 
						
							
							
								
								Trimmed long names in header  
							
							... 
							
							
							
							Fixes  #87  
						
							2016-03-30 21:28:38 +01:00  
				
					
						
							
							
								 
						
							
								097d9c9f3c 
								
							 
						 
						
							
							
								
								Updated entity restrictions to allow permissions, Not just restrict  
							
							... 
							
							
							
							Also changed wording from 'Restrictions' to 'Permissions' to keep things more familiar and to better reflect what they do.
Referenced in issue #89 . 
							
						 
						
							2016-03-30 20:15:44 +01:00  
				
					
						
							
							
								 
						
							
								e1994ef2cf 
								
							 
						 
						
							
							
								
								Added editor control in admin settings & Fixed some markdown editor bugs  
							
							... 
							
							
							
							Also updated the setting system with a more sane approach to handling default values. (Now done via the setting-defaults config file) 
							
						 
						
							2016-03-29 19:26:13 +01:00  
				
					
						
							
							
								 
						
							
								26965fa08f 
								
							 
						 
						
							
							
								
								Added a markdown editor  
							
							
							
						 
						
							2016-03-25 14:41:15 +00:00  
				
					
						
							
							
								 
						
							
								491f73e0cd 
								
							 
						 
						
							
							
								
								Fixed bug causing permission error on save and fixed non-gallery image save  
							
							
							
						 
						
							2016-03-13 15:37:46 +00:00  
				
					
						
							
							
								 
						
							
								4656c12f6d 
								
							 
						 
						
							
							
								
								Fixed bug causing editing notification to always show  
							
							... 
							
							
							
							Updated tests to prevent happening again 
							
						 
						
							2016-03-13 14:33:43 +00:00  
				
					
						
							
							
								 
						
							
								dbe11c1360 
								
							 
						 
						
							
							
								
								Attached images to pages and added restriction filtering  
							
							... 
							
							
							
							Closes  #79  
						
							2016-03-13 13:30:47 +00:00  
				
					
						
							
							
								 
						
							
								5283919d24 
								
							 
						 
						
							
							
								
								Added new page drafts and started image entity attaching  
							
							... 
							
							
							
							Closes  #80 . 
						
							2016-03-13 12:04:08 +00:00  
				
					
						
							
							
								 
						
							
								30214fde74 
								
							 
						 
						
							
							
								
								Added UI components of page autosaving  
							
							
							
						 
						
							2016-03-12 15:52:19 +00:00  
				
					
						
							
							
								 
						
							
								59ce228c2e 
								
							 
						 
						
							
							
								
								Moved page editing to angular controller and started work on update drafts  
							
							
							
						 
						
							2016-03-09 22:32:07 +00:00  
				
					
						
							
							
								 
						
							
								1d6137f7e2 
								
							 
						 
						
							
							
								
								Added restrictions to user profile lists  
							
							
							
						 
						
							2016-03-06 13:17:46 +00:00  
				
					
						
							
							
								 
						
							
								66c56e9d02 
								
							 
						 
						
							
							
								
								Added settings helper and formatted code in some files  
							
							
							
						 
						
							2016-03-06 12:55:08 +00:00  
				
					
						
							
							
								 
						
							
								e744d4c82c 
								
							 
						 
						
							
							
								
								Changed color picker library and moved color logic to front end  
							
							... 
							
							
							
							Since the old library was GPLv3 i changed the color picker to tiny-color-picker which is MIT.
Also extracted the styles to a shared view and move color calculation logic to javascript side. 
							
						 
						
							2016-03-06 10:52:10 +00:00  
				
					
						
							
							
								 
						
							
								0774ecc89c 
								
							 
						 
						
							
							
								
								Merge branch 'master' into nwalke-update_site_color  
							
							
							
						 
						
							2016-03-06 09:08:20 +00:00  
				
					
						
							
							
								 
						
							
								5e7a4c7fb5 
								
							 
						 
						
							
							
								
								Fixed incorrect recents pages on homescreen  
							
							... 
							
							
							
							Fixed the bug causing the recently updated pages to be exaclty the same as the recently create pages.
Also added in tests to prevent regression. 
							
						 
						
							2016-03-05 22:54:53 +00:00  
				
					
						
							
							
								 
						
							
								76eaf64f94 
								
							 
						 
						
							
							
								
								Fixed errors that occured when merging & refactored entity repositories  
							
							... 
							
							
							
							Also deleted the git '.orig' files that got added in last merge. 
							
						 
						
							2016-03-05 19:00:26 +00:00  
				
					
						
							
							
								 
						
							
								80865b30a5 
								
							 
						 
						
							
							
								
								Merge branch 'custom_role_system'  
							
							... 
							
							
							
							Conflicts:
	app/Repos/BookRepo.php
	app/Repos/ChapterRepo.php
	app/Repos/PageRepo.php 
							
						 
						
							2016-03-05 18:21:44 +00:00  
				
					
						
							
							
								 
						
							
								8e6248f57f 
								
							 
						 
						
							
							
								
								Added restriction tests and fixed any bugs in the process  
							
							... 
							
							
							
							Also updated many styles within areas affected by the new permission and roles system. 
							
						 
						
							2016-03-05 18:09:21 +00:00  
				
					
						
							
							
								 
						
							
								268db6b1d0 
								
							 
						 
						
							
							
								
								Added a whole load of permission & role tests  
							
							
							
						 
						
							2016-03-05 12:09:09 +00:00  
				
					
						
							
							
								 
						
							
								bc2b310638 
								
							 
						 
						
							
							
								
								Updated fulltext search with custom escaped query  
							
							... 
							
							
							
							Changed pdo quoted query to use custom escaping and added like searches when quoted terms are used. 
							
						 
						
							2016-03-04 20:49:35 +00:00