e1474194db 
								
							 
						 
						
							
							
								
								Added responsive functionality to tri-layout view.  
							
							
							
						 
						
							2018-12-08 23:34:06 +00:00  
				
					
						
							
							
								 
						
							
								4c574c22a8 
								
							 
						 
						
							
							
								
								Implemented functionality to make books sort function  
							
							... 
							
							
							
							Also changed public user settings to be stored in session rather than DB.
Cleaned existing list view type logic. 
							
						 
						
							2018-12-07 18:33:53 +00:00  
				
					
						
							
							
								 
						
							
								0b976d9f91 
								
							 
						 
						
							
							
								
								Added list sorting styles, Yet to add functionality  
							
							
							
						 
						
							2018-12-01 21:28:21 +00:00  
				
					
						
							
							
								 
						
							
								2a882a43ff 
								
							 
						 
						
							
							
								
								Updated books listing to three column layout design  
							
							
							
						 
						
							2018-12-01 20:28:17 +00:00  
				
					
						
							
							
								 
						
							
								aabd4c0412 
								
							 
						 
						
							
							
								
								Started looking at the books listing design  
							
							
							
						 
						
							2018-12-01 16:29:57 +00:00  
				
					
						
							
							
								 
						
							
								4df11701e7 
								
							 
						 
						
							
							
								
								Updated book-tree design and abstracted breadcrumb template  
							
							
							
						 
						
							2018-11-11 13:11:36 +00:00  
				
					
						
							
							
								 
						
							
								c356612612 
								
							 
						 
						
							
							
								
								Added sidebar layout size tweaks  
							
							
							
						 
						
							2018-11-04 14:41:52 +00:00  
				
					
						
							
							
								 
						
							
								0e395b1e21 
								
							 
						 
						
							
							
								
								Started reworking of page-show design  
							
							... 
							
							
							
							- Updated core toolbar & breadcrumb design 
							
						 
						
							2018-10-21 20:05:11 +01:00  
				
					
						
							
							
								 
						
							
								89be30ff0e 
								
							 
						 
						
							
							
								
								Started on a design update  
							
							... 
							
							
							
							- Added base of new grid system.
- Added new margin/padding/visiblity helpers.
- Made header collapse to overflow menu on mobile. 
							
						 
						
							2018-10-16 18:49:56 +01:00  
				
					
						
							
							
								 
						
							
								9dc26a8c52 
								
							 
						 
						
							
							
								
								Prevented TinyMCE clear-color option having scrollbar  
							
							... 
							
							
							
							Was covering the option if showing and prevented the option being pressed.
Fixes  #999  
							
						 
						
							2018-09-22 23:12:39 +01:00  
				
					
						
							
							
								 
						
							
								be4f3d62cd 
								
							 
						 
						
							
							
								
								Merge branch 'fix/ru-locale' of git://github.com/mullinsmikey/BookStack into mullinsmikey-fix/ru-locale  
							
							
							
						 
						
							2018-09-22 22:29:03 +01:00  
				
					
						
							
							
								 
						
							
								0931ff38e9 
								
							 
						 
						
							
							
								
								Tried to make chapter toggles a little smoother in FF  
							
							
							
						 
						
							2018-09-22 16:36:35 +01:00  
				
					
						
							
							
								 
						
							
								a441faf65c 
								
							 
						 
						
							
							
								
								Only show codeblock copy icon on hover  
							
							... 
							
							
							
							Fixes  #980  
						
							2018-09-22 14:55:33 +01:00  
				
					
						
							
							
								 
						
							
								1cb6ae39c8 
								
							 
						 
						
							
							
								
								Added base RTL support  
							
							... 
							
							
							
							For #939 
- Adds way to check if current language is RTL via config system.
- Made TinyMCE default direction be based on current language text
direction.
- Fixed bullet points to be RTL compatible.
- Set page content body to have direction based on content. 
							
						 
						
							2018-09-22 13:18:26 +01:00  
				
					
						
							
							
								 
						
							
								131fcae4c7 
								
							 
						 
						
							
							
								
								Merge pull request  #947  from BookStackApp/bookshelves  
							
							... 
							
							
							
							Bookshelves 
							
						 
						
							2018-09-21 15:29:52 +01:00  
				
					
						
							
							
								 
						
							
								0c8b6b7324 
								
							 
						 
						
							
							
								
								Final tweaks after code review and fixing failing test cases.  
							
							
							
						 
						
							2018-09-16 01:12:36 +05:30  
				
					
						
							
							
								 
						
							
								714c7bbd3a 
								
							 
						 
						
							
							
								
								Adds code to delete the revision.  
							
							... 
							
							
							
							Signed-off-by: Abijeet <abijeetpatro@gmail.com> 
							
						 
						
							2018-09-15 15:15:42 +05:30  
				
					
						
							
							
								 
						
							
								e0b479efef 
								
							 
						 
						
							
							
								
								UTF-8 slugs & UI fixes  
							
							
							
						 
						
							2018-09-11 22:42:25 +04:00  
				
					
						
							
							
								 
						
							
								b89411c108 
								
							 
						 
						
							
							
								
								Copied book content, Added create routes  
							
							... 
							
							
							
							Added view control
Added pivot table for books relation
Added control to assign books 
							
						 
						
							2018-08-27 14:18:09 +01:00  
				
					
						
							
							
								 
						
							
								af6f4e6c8c 
								
							 
						 
						
							
							
								
								Updated pagination to use theme colour  
							
							
							
						 
						
							2018-07-29 15:44:10 +01:00  
				
					
						
							
							
								 
						
							
								69a0f8d502 
								
							 
						 
						
							
							
								
								Prevented error notification being visible on load  
							
							... 
							
							
							
							Fixes  #897 
Also made design a little more compact 
						
							2018-07-29 15:34:54 +01:00  
				
					
						
							
							
								 
						
							
								f668bee88b 
								
							 
						 
						
							
							
								
								Merge branch 'master' into feature/edit-link-headers  
							
							
							
						 
						
							2018-07-14 09:36:14 +01:00  
				
					
						
							
							
								 
						
							
								fb29f4119d 
								
							 
						 
						
							
							
								
								Fixes issue with code not wrapping on revision page.  
							
							... 
							
							
							
							Closes  #888 
Signed-off-by: Abijeet <abijeetpatro@gmail.com> 
						
							2018-06-30 09:49:55 +05:30  
				
					
						
							
							
								 
						
							
								6c4c1ccb58 
								
							 
						 
						
							
							
								
								Changed the way we were displaying the edit icon.  
							
							... 
							
							
							
							Signed-off-by: Abijeet <abijeetpatro@gmail.com> 
							
						 
						
							2018-06-10 17:06:23 +05:30  
				
					
						
							
							
								 
						
							
								b3cc3130f0 
								
							 
						 
						
							
							
								
								Added copy button to codemirror-rendered code blocks  
							
							... 
							
							
							
							Closes  #858  
						
							2018-06-09 10:41:01 +01:00  
				
					
						
							
							
								 
						
							
								134a96fa32 
								
							 
						 
						
							
							
								
								Adds edit icon to each header in the page.  
							
							... 
							
							
							
							Towards #618 
Signed-off-by: Abijeet <abijeetpatro@gmail.com> 
							
						 
						
							2018-06-03 13:47:07 +05:30  
				
					
						
							
							
								 
						
							
								d886c6a32e 
								
							 
						 
						
							
							
								
								Removed old ng tags, Fixed header spacing  
							
							... 
							
							
							
							Also prevent pointer error on custom home page 
							
						 
						
							2018-05-28 10:33:38 +01:00  
				
					
						
							
							
								 
						
							
								f399e60910 
								
							 
						 
						
							
							
								
								Made header link spacing a little more even  
							
							
							
						 
						
							2018-05-27 20:32:06 +01:00  
				
					
						
							
							
								 
						
							
								173eaf1c98 
								
							 
						 
						
							
							
								
								Made comments section more subtle  
							
							... 
							
							
							
							Also removed spacing from within details above active restrictions 
							
						 
						
							2018-05-27 20:20:13 +01:00  
				
					
						
							
							
								 
						
							
								64eabaf882 
								
							 
						 
						
							
							
								
								Fixed search icon overalapping input in header  
							
							... 
							
							
							
							Fixes  #859  
						
							2018-05-27 19:51:32 +01:00  
				
					
						
							
							
								 
						
							
								6b84a76af1 
								
							 
						 
						
							
							
								
								Merge branch 'drawing_updates'  
							
							
							
						 
						
							2018-05-27 19:42:25 +01:00  
				
					
						
							
							
								 
						
							
								6e7adcc095 
								
							 
						 
						
							
							
								
								Embedded SVG icons in css/js files  
							
							... 
							
							
							
							Allows removal of hacky /icon endpoint solution.
Fixes PDF exports with WKHTML and allows the icon to show in HTML
exports.
Fixes  #796  
							
						 
						
							2018-05-20 11:55:23 +01:00  
				
					
						
							
							
								 
						
							
								6cdb943916 
								
							 
						 
						
							
							
								
								Started work on revisions in image manager  
							
							
							
						 
						
							2018-05-19 18:44:40 +01:00  
				
					
						
							
							
								 
						
							
								d5b922aa50 
								
							 
						 
						
							
							
								
								Started work on drawing revisions  
							
							... 
							
							
							
							Improved sidebar and selection styling of image manager.
Allowed image manager imageType to be changed on open.
Created models for image revisions. 
							
						 
						
							2018-05-13 12:07:38 +01:00  
				
					
						
							
							
								 
						
							
								b6bb078e0a 
								
							 
						 
						
							
							
								
								removed some added CSS as it was causing unintended sideffects.  
							
							... 
							
							
							
							Signed-off-by: Abijeet <abijeetpatro@gmail.com> 
							
						 
						
							2018-05-12 17:28:10 +05:30  
				
					
						
							
							
								 
						
							
								2e4863edb1 
								
							 
						 
						
							
							
								
								Added an option to set books as the default homepage.  
							
							... 
							
							
							
							Signed-off-by: Abijeet <abijeetpatro@gmail.com> 
							
						 
						
							2018-05-09 08:26:49 +05:30  
				
					
						
							
							
								 
						
							
								624c568008 
								
							 
						 
						
							
							
								
								Revamped tag styling  
							
							
							
						 
						
							2018-04-30 14:35:15 +01:00  
				
					
						
							
							
								 
						
							
								58a0a59d7e 
								
							 
						 
						
							
							
								
								Cleaned details sidebar box and merged with permissions  
							
							
							
						 
						
							2018-04-30 13:53:04 +01:00  
				
					
						
							
							
								 
						
							
								93f92e9e16 
								
							 
						 
						
							
							
								
								Updated the TinyMCE to version 4.7.9.  
							
							... 
							
							
							
							Added some code to remove the box-shadow around the TinyMCE toolbar.
Signed-off-by: Abijeet <abijeetpatro@gmail.com> 
							
						 
						
							2018-04-14 18:30:34 +05:30  
				
					
						
							
							
								 
						
							
								d92efd4edc 
								
							 
						 
						
							
							
								
								Adds the media plugin to TinyMCE to allow insertion of videos.  
							
							... 
							
							
							
							Fixes  #266 
Signed-off-by: Abijeet <abijeetpatro@gmail.com> 
						
							2018-04-14 18:30:28 +05:30  
				
					
						
							
							
								 
						
							
								582158f70e 
								
							 
						 
						
							
							
								
								Added tags to chapters and books  
							
							... 
							
							
							
							Closes  #121  
						
							2018-03-30 14:09:51 +01:00  
				
					
						
							
							
								 
						
							
								4f788384f0 
								
							 
						 
						
							
							
								
								Updated icons with height  
							
							... 
							
							
							
							Fixes issues within IE 
							
						 
						
							2018-03-25 15:52:48 +01:00  
				
					
						
							
							
								 
						
							
								0335f58478 
								
							 
						 
						
							
							
								
								Merge branch 'master' into bug/image-upload  
							
							
							
						 
						
							2018-03-18 23:44:33 +05:30  
				
					
						
							
							
								 
						
							
								380e2ff668 
								
							 
						 
						
							
							
								
								Updated outline button styles for svg icons  
							
							
							
						 
						
							2018-03-18 15:35:04 +00:00  
				
					
						
							
							
								 
						
							
								ecdeb545e0 
								
							 
						 
						
							
							
								
								Cleaned some form styling  
							
							... 
							
							
							
							Removed uppercasing of labels to make a little friendlier.
Extracted out toggleswitch JS into own component.
Improved basic code input for html-head-input area. 
							
						 
						
							2018-03-18 15:13:46 +00:00  
				
					
						
							
							
								 
						
							
								83d830fd7d 
								
							 
						 
						
							
							
								
								Fixes the icons not being aligned properly in attached items section for the page.  
							
							... 
							
							
							
							Also formatting.
Signed-off-by: Abijeet <abijeetpatro@gmail.com> 
							
						 
						
							2018-03-18 18:58:04 +05:30  
				
					
						
							
							
								 
						
							
								d859be3a12 
								
							 
						 
						
							
							
								
								Fixes a number of issues with the image uploader. Read below,  
							
							... 
							
							
							
							- Added a remove link to remove files that have an error.
- Error will appear below the progress bar.
- Hovering on dz-image or dz-details will display the error message. Otherwise error message was covering the remove link as well.
- Removed styling around the file size.
- Removed gradient effect in accordance with BookStack styling.
- Dropzone filenae will not overflow the container element. Also done for page attachments
- Added a 'uploaded' error message. this error was being thrown when the file size exceeded the server configured file size. (https://stackoverflow.com/a/42934387/903324 )
Towards #741 
Signed-off-by: Abijeet <abijeetpatro@gmail.com> 
							
						 
						
							2018-03-18 18:44:11 +05:30  
				
					
						
							
							
								 
						
							
								8b27ce3296 
								
							 
						 
						
							
							
								
								Fixed large content previews and improved mobile styles  
							
							... 
							
							
							
							Listing content previews no longer pre-wrap and instead simply break
correctly.
Updated titles to ensure they break on mobile devices.
Reduced spacing and font sizes on mobile to better adjust content to
screen size.
Fixes  #739  
							
						 
						
							2018-03-18 12:23:48 +00:00  
				
					
						
							
							
								 
						
							
								8828adfc9c 
								
							 
						 
						
							
							
								
								Fixed up notification styling a little  
							
							
							
						 
						
							2018-03-18 11:58:45 +00:00  
				
					
						
							
							
								 
						
							
								d44e0b7964 
								
							 
						 
						
							
							
								
								Prevented markdown editor pushing out toolbar  
							
							
							
						 
						
							2018-03-18 11:46:08 +00:00  
				
					
						
							
							
								 
						
							
								0372efa89a 
								
							 
						 
						
							
							
								
								Merge branch 'patch-1' of git://github.com/BackwardSpy/BookStack into BackwardSpy-patch-1  
							
							
							
						 
						
							2018-03-18 11:40:38 +00:00  
				
					
						
							
							
								 
						
							
								b42b07179f 
								
							 
						 
						
							
							
								
								Updated exports to use DejaVu font  
							
							... 
							
							
							
							Provides potentially better language font coverage. 
							
						 
						
							2018-03-17 17:12:01 +00:00  
				
					
						
							
							
								 
						
							
								1c8a8acb3d 
								
							 
						 
						
							
							
								
								fix markdown editor resizing with long strings  
							
							
							
						 
						
							2018-02-26 11:31:11 +00:00  
				
					
						
							
							
								 
						
							
								81fa021083 
								
							 
						 
						
							
							
								
								Finished migrated from icon-font to SVG  
							
							
							
						 
						
							2018-02-17 19:49:00 +00:00  
				
					
						
							
							
								 
						
							
								5ab39bfd5a 
								
							 
						 
						
							
							
								
								Started migration to SVG icons  
							
							
							
						 
						
							2018-02-17 13:30:52 +00:00  
				
					
						
							
							
								 
						
							
								2d43ab8a1b 
								
							 
						 
						
							
							
								
								Fixed text overflow in various views  
							
							... 
							
							
							
							Fixes  #669  
						
							2018-02-11 14:28:26 +00:00  
				
					
						
							
							
								 
						
							
								bed7ba78d3 
								
							 
						 
						
							
							
								
								Updated grid view to use CSS grid and flexbox  
							
							... 
							
							
							
							Provides a cleaner height-matched design.
Closes  #701  
							
						 
						
							2018-02-11 11:36:51 +00:00  
				
					
						
							
							
								 
						
							
								1d49b65c2e 
								
							 
						 
						
							
							
								
								Fixed code block wrapping on export  
							
							... 
							
							
							
							Now wraps instead of running off the page.
Fixed  #676  
							
						 
						
							2018-02-04 17:35:01 +00:00  
				
					
						
							
							
								 
						
							
								1d5440493c 
								
							 
						 
						
							
							
								
								Set markdown editor preview width to 100%  
							
							... 
							
							
							
							Fixes  #658  
						
							2018-01-28 18:14:02 +00:00  
				
					
						
							
							
								 
						
							
								bd711d69e4 
								
							 
						 
						
							
							
								
								Adapted code insert area and language select for mobile  
							
							
							
						 
						
							2018-01-28 14:19:54 +00:00  
				
					
						
							
							
								 
						
							
								98d4bf4486 
								
							 
						 
						
							
							
								
								Merge branch 'bug-650' of git://github.com/Abijeet/BookStack into Abijeet-bug-650  
							
							
							
						 
						
							2018-01-28 14:15:31 +00:00  
				
					
						
							
							
								 
						
							
								9bbef3a3dd 
								
							 
						 
						
							
							
								
								Added drawio abilities to markdown editor  
							
							
							
						 
						
							2018-01-20 20:40:21 +00:00  
				
					
						
							
							
								 
						
							
								34782fbc91 
								
							 
						 
						
							
							
								
								Merge branch 'master' into draw.io  
							
							
							
						 
						
							2018-01-20 14:01:56 +00:00  
				
					
						
							
							
								 
						
							
								f2c62765ca 
								
							 
						 
						
							
							
								
								Adds overflow:auto to popup content to allow it to scroll in lower res.  
							
							... 
							
							
							
							Fixes  #650 
Signed-off-by: Abijeet <abijeetpatro@gmail.com> 
						
							2018-01-06 01:41:06 +05:30  
				
					
						
							
							
								 
						
							
								937d2cd55c 
								
							 
						 
						
							
							
								
								Adds font-size to ol to ensure that they are uniform.  
							
							... 
							
							
							
							Fixes  #643 
Signed-off-by: Abijeet <abijeetpatro@gmail.com> 
						
							2017-12-28 22:32:24 +05:30  
				
					
						
							
							
								 
						
							
								0dc1f0b07f 
								
							 
						 
						
							
							
								
								Started draw.io integration  
							
							
							
						 
						
							2017-12-24 14:28:35 +00:00  
				
					
						
							
							
								 
						
							
								3ed5426315 
								
							 
						 
						
							
							
								
								Moved book cover image input into collapsible section  
							
							... 
							
							
							
							Prevent extra friction when creating a new book and makes it easier to
skip if grid view is not in use 
							
						 
						
							2017-12-10 13:46:50 +00:00  
				
					
						
							
							
								 
						
							
								ac7e3977de 
								
							 
						 
						
							
							
								
								Fixed WYSIWYG fullscreen mode on firefox  
							
							... 
							
							
							
							Prevented overlapping sidebar and collapsed content.
Fixes  #605  
							
						 
						
							2017-12-09 12:38:30 +00:00  
				
					
						
							
							
								 
						
							
								d7edc389a6 
								
							 
						 
						
							
							
								
								Enabled custom HTML head content to work within editors  
							
							... 
							
							
							
							Closes  #562  
						
							2017-12-08 11:52:43 +00:00  
				
					
						
							
							
								 
						
							
								6063ac4a11 
								
							 
						 
						
							
							
								
								Merge branch 'master' of git://github.com/Abijeet/BookStack  
							
							
							
						 
						
							2017-12-07 18:47:07 +00:00  
				
					
						
							
							
								 
						
							
								261e57fc4e 
								
							 
						 
						
							
							
								
								Converted books view setting to user setting  
							
							... 
							
							
							
							Also cleaned up/moved new CSS and removed redundant new book methods. 
							
						 
						
							2017-12-06 16:34:26 +00:00  
				
					
						
							
							
								 
						
							
								bc1302a8d8 
								
							 
						 
						
							
							
								
								Merge branch 'BookStackApp-master' of git://github.com/OsmosysSoftware/BookStack into OsmosysSoftware-BookStackApp-master  
							
							
							
						 
						
							2017-12-06 15:52:54 +00:00  
				
					
						
							
							
								 
						
							
								8378f06889 
								
							 
						 
						
							
							
								
								Highlights all headings currently visible. Also fixes extra scrollbar appearing in Firefox.  
							
							
							
						 
						
							2017-11-14 23:54:25 +05:30  
				
					
						
							
							
								 
						
							
								1031c61d0c 
								
							 
						 
						
							
							
								
								Fixes   #466 . Adds support for header highlighting using intersection observer.  
							
							
							
						 
						
							2017-11-02 01:14:06 +05:30  
				
					
						
							
							
								 
						
							
								3bf7cac030 
								
							 
						 
						
							
							
								
								Prevented flexbox contains overflowing page  
							
							... 
							
							
							
							Fixes  #552  
						
							2017-10-15 18:34:37 +01:00  
				
					
						
							
							
								 
						
							
								247e6dba85 
								
							 
						 
						
							
							
								
								Fixed some design issues around cards  
							
							... 
							
							
							
							Reverted drop shadow change.
Fixed header line-height when linked.
Fixed overflowing paragraph text. Fixes  #533 . 
							
						 
						
							2017-10-01 17:59:51 +01:00  
				
					
						
							
							
								 
						
							
								87339e4cd0 
								
							 
						 
						
							
							
								
								Added missing codemirror theme class  
							
							... 
							
							
							
							Fixes  #535  
						
							2017-09-30 13:48:38 +01:00  
				
					
						
							
							
								 
						
							
								a3557d5bb2 
								
							 
						 
						
							
							
								
								Tweaked shadows on cards  
							
							
							
						 
						
							2017-09-24 18:47:34 +01:00  
				
					
						
							
							
								 
						
							
								9a3bc27ef4 
								
							 
						 
						
							
							
								
								Fixed bullet styles and added code highlight on comments  
							
							
							
						 
						
							2017-09-10 16:14:04 +01:00  
				
					
						
							
							
								 
						
							
								c1627a1468 
								
							 
						 
						
							
							
								
								Fixed sidebar scroll on mobile  
							
							
							
						 
						
							2017-09-10 13:19:47 +01:00  
				
					
						
							
							
								 
						
							
								576a59a693 
								
							 
						 
						
							
							
								
								Fixed line-height difference in tinymce  
							
							
							
						 
						
							2017-09-10 13:08:12 +01:00  
				
					
						
							
							
								 
						
							
								fec6c65b78 
								
							 
						 
						
							
							
								
								Fixed quick save shortcut in wysiwyg editor  
							
							... 
							
							
							
							Fixes  #467  
						
							2017-09-10 13:01:48 +01:00  
				
					
						
							
							
								 
						
							
								0275d2ad58 
								
							 
						 
						
							
							
								
								Added loading icons, Added comment activity  
							
							
							
						 
						
							2017-09-09 17:06:30 +01:00  
				
					
						
							
							
								 
						
							
								41f56e659d 
								
							 
						 
						
							
							
								
								Added comment reply and delete confirmation.  
							
							... 
							
							
							
							Also fixed local_id bug
Added component helpers
Added global scroll & Highlight helpers 
							
						 
						
							2017-09-09 15:56:24 +01:00  
				
					
						
							
							
								 
						
							
								c1a1bc0135 
								
							 
						 
						
							
							
								
								Books grid view  
							
							
							
						 
						
							2017-09-04 20:27:52 +05:30  
				
					
						
							
							
								 
						
							
								fea5630ea4 
								
							 
						 
						
							
							
								
								Made some changes to the comment system  
							
							... 
							
							
							
							Changed to be rendered server side along with page content.
Changed deletion to fully delete comments from the database.
Added 'local_id' to comments for referencing.
Updated reply system to be non-nested (Incomplete)
Made database comment format entity-agnostic to be more future proof.
Updated designs of comment sections. 
							
						 
						
							2017-09-03 16:37:51 +01:00  
				
					
						
							
							
								 
						
							
								70ee28ee13 
								
							 
						 
						
							
							
								
								Fixed long attachment names breaking outer boxes  
							
							... 
							
							
							
							Closes  #460  
						
							2017-09-02 15:21:05 +01:00  
				
					
						
							
							
								 
						
							
								1c9ecc3edd 
								
							 
						 
						
							
							
								
								Reformatted sortable toolbox components  
							
							
							
						 
						
							2017-09-02 15:06:52 +01:00  
				
					
						
							
							
								 
						
							
								1e41ccbc7a 
								
							 
						 
						
							
							
								
								Added ability to override codemirror theme  
							
							... 
							
							
							
							Also cleaned codemirror file while there.
In referece to #455  
							
						 
						
							2017-09-02 13:34:37 +01:00  
				
					
						
							
							
								 
						
							
								6200948eec 
								
							 
						 
						
							
							
								
								Merge branch 'master' of git://github.com/BookStackApp/BookStack into BookStackApp-master  
							
							... 
							
							
							
							Conflicts:
	app/Http/Controllers/BookController.php
	resources/lang/en/common.php
	resources/views/books/create.blade.php
	resources/views/books/form.blade.php
	resources/views/books/index.blade.php
	resources/views/users/edit.blade.php
	tests/Entity/EntityTest.php 
							
						 
						
							2017-08-29 12:19:00 +05:30  
				
					
						
							
							
								 
						
							
								55759bd22a 
								
							 
						 
						
							
							
								
								Added ability to set a page to view on the homepage.  
							
							... 
							
							
							
							Relates to #372  and #126  
							
						 
						
							2017-08-28 13:38:32 +01:00  
				
					
						
							
							
								 
						
							
								d8e1f52ddd 
								
							 
						 
						
							
							
								
								Made new sidebar layout responsive  
							
							
							
						 
						
							2017-08-27 15:16:51 +01:00  
				
					
						
							
							
								 
						
							
								4cb4c9e568 
								
							 
						 
						
							
							
								
								Updated remaining views to 2017 design update.  
							
							... 
							
							
							
							Also fixed issue with duplicate confirmation email. 
							
						 
						
							2017-08-26 17:17:04 +01:00  
				
					
						
							
							
								 
						
							
								36f524a354 
								
							 
						 
						
							
							
								
								Updated page view styles to align with 2017 update  
							
							
							
						 
						
							2017-08-26 15:41:33 +01:00  
				
					
						
							
							
								 
						
							
								5187d3fa78 
								
							 
						 
						
							
							
								
								Updated chapter views with new design  
							
							
							
						 
						
							2017-08-26 14:36:48 +01:00  
				
					
						
							
							
								 
						
							
								8fcbe44d3e 
								
							 
						 
						
							
							
								
								Updated styles for auth and books views.  
							
							... 
							
							
							
							Also added sourcemaps to gulp sass build 
							
						 
						
							2017-08-26 13:24:55 +01:00  
				
					
						
							
							
								 
						
							
								7f902e41c7 
								
							 
						 
						
							
							
								
								Resolved conflicts  
							
							
							
						 
						
							2017-08-24 12:21:43 +05:30  
				
					
						
							
							
								 
						
							
								3da8c01c1f 
								
							 
						 
						
							
							
								
								Rolled out new design further  
							
							
							
						 
						
							2017-08-20 13:57:25 +01:00  
				
					
						
							
							
								 
						
							
								295f520f21 
								
							 
						 
						
							
							
								
								Started design update  
							
							
							
						 
						
							2017-08-19 18:32:24 +01:00  
				
					
						
							
							
								 
						
							
								fba7ae923d 
								
							 
						 
						
							
							
								
								Darkened a few cm code styles for improved legibility  
							
							
							
						 
						
							2017-08-19 15:51:51 +01:00