1036 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dan Brown	1e015af3c9	Fixed incorrect search logic in last commit ... Incorrect cross-entity pagination could lead to hidden entities.	2018-03-24 19:05:56 +00:00
Dan Brown	f101c1a622	Made search more efficient and tweaked weighting ... Added per-entity weighting changes. Now Books score higher than chapters which score higher than pages. Reduced queries required on search by only searching once but at a higher count to see if there's another page.	2018-03-24 18:46:31 +00:00
Dan Brown	3df7d828eb	Fixed failing tests ... Fixed syntax error in french translations. Removed 'required' on image validation which was breaking tests	2018-03-24 15:25:13 +00:00
Dan Brown	5ad9c5d319	Merge branch 'bug/gif-image-740' of git://github.com/Abijeet/BookStack ... Also removed console.logs in dropzone.js	2018-03-24 14:54:50 +00:00
Dan Brown	9fead9890b	Merge branch 'Abijeet-bug/image-upload'	2018-03-24 14:45:10 +00:00
Dan Brown	746684ec8c	Merge branch 'bug/image-upload' of git://github.com/Abijeet/BookStack into Abijeet-bug/image-upload	2018-03-24 14:39:57 +00:00
Dan Brown	2ede273ef3	Merge pull request #753 from Alwaysin/master ... Update french language	2018-03-24 14:36:12 +00:00
Dan Brown	6882bd3c62	Merge pull request #752 from Alwaysin/patch-1 ... Update entities.php for french language	2018-03-24 14:35:04 +00:00
Dan Brown	1061946858	Merge pull request #761 from msaus/hotfix/japanese_translation ... update japanese translation	2018-03-24 14:32:34 +00:00
Soseki Masao	696ef3ff33	fix entities.php	2018-03-23 18:20:44 +09:00
Soseki Masao	2d1567ea30	update japanese translation	2018-03-23 17:35:21 +09:00
Abijeet	2cfcbe0a3c	Fixes an issue with handling of large image files. ... Signed-off-by: Abijeet <abijeetpatro@gmail.com>	2018-03-19 02:09:01 +05:30
Abijeet	bf8dddd99c	Not resizing gif images. ... See - https://github.com/Intervention/image/issues/176 Fixes #223 Signed-off-by: Abijeet <abijeetpatro@gmail.com>	2018-03-19 01:44:33 +05:30
Abijeet Patro	0335f58478	Merge branch 'master' into bug/image-upload	2018-03-18 23:44:33 +05:30
Abijeet	3a5c20c17e	Removing the selected image and clearing the dropdzone on dialog close. ... Towards #741 Signed-off-by: Abijeet <abijeetpatro@gmail.com>	2018-03-18 23:38:37 +05:30
Dan Brown	380e2ff668	Updated outline button styles for svg icons	2018-03-18 15:35:04 +00:00
Dan Brown	c6844324d0	Use autodiscover for dev packages ... Allows installation with `composer install --no-dev` Fixed #742	2018-03-18 15:27:15 +00:00
Dan Brown	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
Dan Brown	2c8d7da885	Updated webpack SCSS extract to provide sourcemaps	2018-03-18 14:47:43 +00:00
Alwaysin	35c7e00203	Update entities.php	2018-03-18 14:46:56 +01:00
Abijeet	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
Alwaysin	accd936781	Update settings.php	2018-03-18 14:24:39 +01:00
Alwaysin	880987f15c	Update components.php	2018-03-18 14:23:42 +01:00
Alwaysin	018084a951	Update common.php	2018-03-18 14:23:08 +01:00
Alwaysin	098b594104	Update auth.php	2018-03-18 14:21:11 +01:00
Alwaysin	bb7fab1dc0	Update activities.php	2018-03-18 14:20:20 +01:00
Abijeet	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
Dan Brown	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
Dan Brown	8828adfc9c	Fixed up notification styling a little	2018-03-18 11:58:45 +00:00
Dan Brown	d44e0b7964	Prevented markdown editor pushing out toolbar	2018-03-18 11:46:08 +00:00
Dan Brown	0372efa89a	Merge branch 'patch-1' of git://github.com/BackwardSpy/BookStack into BackwardSpy-patch-1	2018-03-18 11:40:38 +00:00
Dan Brown	d2eec4fbce	Markdown editor image paste sets cursor correctly ... Now sets cursor to alt text rather than end of placeholder image. Fixed #751	2018-03-18 11:33:30 +00:00
Dan Brown	b42b07179f	Updated exports to use DejaVu font ... Provides potentially better language font coverage.	2018-03-17 17:12:01 +00:00
Dan Brown	1ad6fe1cbd	Added togglable script escaping to page content ... Configurable via 'ALLOW_CONTENT_SCRIPTS' env variable. Fixes #575	2018-03-17 15:52:42 +00:00
Dan Brown	0a1546daea	Moved jQuery to use NPM and fixed some asset refs	2018-03-17 15:20:15 +00:00
Dan Brown	b64940be82	Merge branch 'master' of github.com:BookStackApp/BookStack	2018-03-17 13:05:37 +00:00
Dan Brown	2ff2c0b257	Merge branch 'webpack-2018'	2018-03-17 13:05:25 +00:00
Dan Brown	ced4e58137	Finished off intitial conversion to webpack	2018-03-17 13:03:13 +00:00
Abijeet	f42d355fd7	Fixes issue with the validation message not being translated. ... Signed-off-by: Abijeet <abijeetpatro@gmail.com>	2018-03-13 09:10:23 +05:30
Dan Brown	28a5bd24b0	Merge pull request #743 from cipi1965/master ... Update Italian translation	2018-03-12 19:33:21 +00:00
Matteo Piccina	85605ab570	Update Italian translation	2018-03-12 16:43:19 +01:00
Dan Brown	5e41933773	Merge branch 'master' of github.com:BookStackApp/BookStack	2018-03-11 16:35:14 +00:00
Dan Brown	f6f44c9de8	Reorganised dev-deps and updated moment	2018-03-11 16:34:58 +00:00
Dan Brown	e52bfc0c24	Attempted move to webpack again	2018-03-11 16:16:30 +00:00
Dan Brown	c44c42103c	Merge pull request #711 from duncanbarnes/master ... Added ability to configure email sender name	2018-03-10 17:45:16 +00:00
Dan Brown	1e98759722	Merge pull request #717 from owcz/patch-1 ... typo in readme.md	2018-03-10 17:43:10 +00:00
Dan Brown	bf4b95f929	Merge pull request #714 from pataar/patch-1 ... Add CACHE_PREFIX to the .env.example file	2018-03-10 17:42:39 +00:00
Dan Brown	a4072365e3	Merge pull request #718 from artur-trzesiok/master ... add missing polish translations for comments	2018-03-05 20:26:26 +00:00
Dan Brown	2bd977b7d7	Merge pull request #709 from leomartinez/master ... Updated 'Spanish Argentina' translation.	2018-03-05 20:22:26 +00:00
Pieter	496289ad94	Update .env.example	2018-03-05 13:10:59 +01:00