592 Commits

Author	SHA1	Message	Date
Dan Brown	7c8edf5673	Merge pull request #1096 from christophert/add-ldaptlsinsecure ... Add option to disable LDAPS Certificate Validation	2018-12-22 16:38:50 +00:00
Dan Brown	26ec1cc3dc	Added proper escaping to LDAP filter operations ... To cover #1163	2018-12-20 20:04:09 +00:00
Dan Brown	7f6929d716	Re-enabled plaintext view for email notifications ... Updated mail notifications to set the HTML and plaintext views since before no plaintext version was being created. Closes #1182	2018-12-16 20:44:57 +00:00
Dan Brown	323bff7d6d	Extended translations system for arrays & extension ... Extended the base Laravel translation system to allow a locale to be based upon another. Also adds functionality to take base & fallback locales into account when fetching an array of translations. Related to work done in #1159	2018-12-12 20:46:27 +00:00
Dan Brown	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
Dan Brown	4a872012c5	Merge branch 'master' into 2019-design	2018-11-11 11:44:35 +00:00
Vinrobot	5e6c039b08	Added config to change Gravatar URL	2018-11-10 16:11:11 +01:00
Dan Brown	178b5af83a	Added google select_account test ... Also cleaned the function naming a little to be more descriptive of the work they do.	2018-11-10 14:52:43 +00:00
Dan Brown	4be0c567cc	Merge pull request #1063 from justein230/master ... Add select account parameter for google authorization	2018-11-10 14:32:28 +00:00
Dan Brown	038b2418f7	Fixed baseURL helper when no app url is set ... Also cleaned variable naming to be more obvious	2018-11-09 21:29:30 +00:00
Justin Stein	2ca8038df2	Removed return from documentation for function redirectToSocialProvider	2018-11-04 11:07:04 -08:00
Justin Stein	89de328439	Merge branch 'master' of https://github.com/BookStackApp/BookStack	2018-11-04 11:04:30 -08:00
Justin Stein	c37e73b626	Moved redirect functionality back to start register and log in functions	2018-11-04 10:48:55 -08:00
Justin Stein	0283ab11b5	Added function for redirect with parameters for Socialite	2018-11-04 10:40:06 -08:00
Dan Brown	ffc1aa873e	Merge branch 'v0.24-dev'	2018-11-04 15:36:40 +00:00
Dan Brown	19b7093438	Fixed redirect issue when custom app url in use ... Fixes #956 & #1048 Also added tests to cover this url logic. Also removed debugbar during tests to maybe improve test speed.	2018-11-04 15:18:27 +00:00
Christopher Tran	8e7f703af7	fix how the option is set, change handle to NULL	2018-10-27 16:58:10 -04:00
Christopher Tran	6c14c09880	Add ability to disable LDAP certificate validation	2018-10-27 16:14:19 -04:00
Dan Brown	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
Justin Stein	216358c6e4	Added Google select account functionality to login	2018-10-13 15:14:06 -07:00
Justin Stein	57d99130ee	Added environment variable for google select account option.	2018-10-13 14:50:58 -07:00
Justin Stein	79afec9737	Revert "Added else clause" ... This reverts commit 77d7f764f1.	2018-10-13 14:31:29 -07:00
Dan Brown	85f330c79a	Extracted many page-specific repo methods into page-specific repo	2018-10-13 11:27:55 +01:00
justein230	77d7f764f1	Added else clause	2018-10-12 22:50:02 -07:00
Justin Stein	a76599bd2a	Add select account parameter for google authorization ... Useful for choosing an account if a default account is outside the scope of a G Suite organization.	2018-10-12 11:52:13 -07:00
Dan Brown	495d18814a	Updated various classes to take EntityProvider instead of separate entities	2018-09-25 18:00:40 +01:00
Dan Brown	257a5a23ec	Fleshed out entity provided and optimized imports	2018-09-25 16:58:03 +01:00
Dan Brown	919660678b	Re-structured the app code to be feature based rather than code type based	2018-09-25 12:30:50 +01:00
Dan Brown	7b32aa163f	Added Bookshelves to search system. ... Also cleaned up and made search indexing system a little more efficient. Closes #1023	2018-09-23 12:34:30 +01:00
Dan Brown	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
Dan Brown	da58c41ab6	Prevented attachDefaultRole from trying to re-attach if already existing ... Fixes #1003 Added test to cover	2018-09-22 22:09:34 +01:00
Dan Brown	3f58800ed1	Added ability to configure revision limit	2018-09-22 17:30:42 +01:00
Dan Brown	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
Dan Brown	5c2e3f4e56	Extracted download response logic into controller method ... Fixes incorrect 'Content-Disposition' header value. Fixes #581	2018-09-22 11:34:09 +01:00
Dan Brown	c47b578599	Fixed formatting via phpcbf	2018-09-21 18:48:47 +01:00
Dan Brown	e60d11ee04	Altered social auto-reg to be configurable per service ... - Added {$service}_AUTO_REGISTER and {$service}_AUTO_CONFIRM_EMAIL env options for each social auth system. - Auto-register will allow registration from login, even if registration is disabled. - Auto-confirm-email indicates trust and will mark new registrants as 'email_confirmed' and skip 'confirmation email' flow. - Also added covering tests.	2018-09-21 18:05:06 +01:00
Dan Brown	7ad8314bd7	Merge branch 'feature/autoregistration_social_login' of git://github.com/ibrahimennafaa/BookStack into ibrahimennafaa-feature/autoregistration_social_login	2018-09-21 16:14:52 +01:00
Dan Brown	131fcae4c7	Merge pull request #947 from BookStackApp/bookshelves ... Bookshelves	2018-09-21 15:29:52 +01:00
Dan Brown	b59e5942c8	Added testing coverage for Bookshelves ... Created modified TestResponse so we can use DOM operations in new Testcases as we move away from the BrowserKit tests.	2018-09-21 15:15:16 +01:00
Dan Brown	8ff969dd17	Updated so permission effect admins more ... Asset permissions can now be configured for admins. joint_permissions will now effect admins more often. Made so shelves header link will hide if you have no bookshelves view permission.	2018-09-20 19:48:08 +01:00
Dan Brown	6eead437d8	Added bookshelf permission control UI and copy-down ability	2018-09-20 19:16:11 +01:00
Dan Brown	81eb642f75	Added bookshelves homepage options ... - Updated homepage selection UI to be more scalable - Cleaned homepage selection logic in code - Added seed test data for bookshelves - Added bookshelves to permission system	2018-09-20 15:27:30 +01:00
Dan Brown	47b08888ba	Added bookshelf view, update, delete ... - Enabled proper ordering of Books in a shelf. - Improved related item destroy for all entities.	2018-09-16 19:34:09 +01:00
Abijeet	08b967607f	Changes as per code review, and fixes failing test cases. ... Signed-off-by: Abijeet <abijeetpatro@gmail.com>	2018-09-16 20:44:09 +05:30
Abijeet	0c8b6b7324	Final tweaks after code review and fixing failing test cases.	2018-09-16 01:12:36 +05:30
Abijeet	81d3bdc168	Removes the BadRequestException class added earlier. ... Signed-off-by: Abijeet <abijeetpatro@gmail.com>	2018-09-15 21:08:00 +05:30
Abijeet	54ca4487fa	Adds tests and few fixes. ... Signed-off-by: Abijeet <abijeetpatro@gmail.com>	2018-09-15 21:05:51 +05:30
Abijeet	25da4d9a8b	Added a success message on deletion of revision. ... Signed-off-by: Abijeet <abijeetpatro@gmail.com>	2018-09-15 16:08:20 +05:30
Abijeet	714c7bbd3a	Adds code to delete the revision. ... Signed-off-by: Abijeet <abijeetpatro@gmail.com>	2018-09-15 15:15:42 +05:30
Michael Mullins	e0b479efef	UTF-8 slugs & UI fixes	2018-09-11 22:42:25 +04:00
Dan Brown	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
Ibrahim Ennafaa	d2f5313f92	add missing @param in method comment	2018-08-21 12:44:42 -04:00
Ibrahim Ennafaa	572e75b783	Update UserRepo.php	2018-08-20 21:19:25 -04:00
Dan Brown	d2a9b312e9	Fixed LDAP group sync using wrong user filter ... LDAP group sync was trying to find users based on the external_auth_id which is not garunteed to match the username entered so somtimes the search for a user would fail. This passes the username to the group sync. Picked up by @yoyokko in #959.	2018-08-19 15:24:42 +01:00
Ibrahim Ennafaa	b224a2c8a0	attempt to fix unit test error for admin creation	2018-08-16 21:52:16 +00:00
Dan Brown	fe6dfcedf9	implement social auto registration feature	2018-08-16 21:26:54 +00:00
Dan Brown	92c9837157	Fixed incorrect type error in LDAP group sync ... Should fix #951	2018-08-12 13:28:40 +01:00
Dan Brown	fcb93dc7c8	Added option to disable public lang autodetect ... Also cleaned up localization middleware a little. Closes #944	2018-08-12 13:10:55 +01:00
Dan Brown	b5a2d3c1c4	Merge remote-tracking branch 'origin' into bookshelves	2018-08-04 11:35:01 +01:00
Dan Brown	c83a51f7e2	Merge pull request #904 from lommes/903-socialite-discord ... add everything needed to use discord as social login provider	2018-07-29 16:18:10 +01:00
Dan Brown	f421d83627	Added ability to set custom ldap group -> role mapping ... Added input in role form to allow matching against custom names. Changed default mapping to use role display name instead of the hidden DB name.	2018-07-15 19:34:42 +01:00
Dan Brown	be2ca9d4bb	Refactored out the LDAP repo	2018-07-15 18:21:45 +01:00
Dan Brown	17bca662a7	Added tests to cover ldap group mapping ... Also updated .env.example formatting. Updated how LdapRepo uses Ldap so can be mocked by testing.	2018-07-15 17:57:25 +01:00
Dan Brown	1776204870	Merge branch 'master' of git://github.com/brennanmurphy/BookStack into brennanmurphy-master	2018-07-14 14:17:55 +01:00
Dan Brown	2bcc159fd6	Allowed creating pages in visible chapters in invisible books ... Fixes permissions with test to cover in the event a page is created, with permission, in a chapter but the user does not have permission to see the parent book. Fixes #912	2018-07-14 14:12:29 +01:00
Brennan Murphy	37aa8b05f8	Update files to PSR-2 standards	2018-07-02 17:27:43 +00:00
Brennan Murphy	d640cc1eee	LDAP groups sync to Bookstack roles. ... Closes #75	2018-07-02 17:09:39 +00:00
Timo B	93795b6eda	add everything needed to use discord as social login provider	2018-06-28 09:01:36 +02:00
Dan Brown	4948b443b6	Started work on bookshelves	2018-06-24 13:38:19 +01:00
Dan Brown	6b84a76af1	Merge branch 'drawing_updates'	2018-05-27 19:42:25 +01:00
Dan Brown	2bd6ba9895	Added maintenance view with image-cleanup	2018-05-27 19:40:07 +01:00
Dan Brown	1df0bcaf85	Made image cleanup safer ... Also fixed drawing update in markdown editor. Added shortcut for MD editor to view drawing manager.	2018-05-27 14:33:50 +01:00
Dan Brown	c31e6a03ce	Added command to clean-up old images, Unfinished	2018-05-20 18:16:01 +01:00
Dan Brown	8c4c8cd95b	Updated secure-images option to not effect image name ... Instead only the image path is altered. Also fixed image manger mode not changing on button press.	2018-05-20 16:47:53 +01:00
Dan Brown	0c9c1e4c6b	Reverted work on revisions ... Improved linkage of drawings and image manager. Updated image updates to create new versions.	2018-05-20 16:41:14 +01:00
Dan Brown	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
Dan Brown	a1ecdcacba	Fixed attachment error handling, Allowed all link types ... Related to #812	2018-05-20 11:06:10 +01:00
Dan Brown	63f96c1c6f	Reorganised home and robots views ... Extracted home view sidebar into own view. Moved home and robot views into 'common' folder so that we only have layouts in the top-level views folder.	2018-05-20 10:11:56 +01:00
Dan Brown	8df9dab80a	Merge branch 'master' into feature/615	2018-05-20 09:51:45 +01:00
Dan Brown	6cdb943916	Started work on revisions in image manager	2018-05-19 18:44:40 +01:00
Dan Brown	d3d8ddbe52	Improved 404 handling and fixed editor error ... 404 handling now not a hack-around and uses Laravel 'fallback' routes instead. Prevents errors with the session when you have mulitple errors on a page where a post/put/delete is made.	2018-05-19 17:01:33 +01:00
Dan Brown	13ad0031d6	Drawings now generate revisions, not replace ... Updated drawing update test to accomodate. Image deletion system now takes revisions into account.	2018-05-13 17:41:35 +01:00
Dan Brown	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
Abijeet	86b2ddbd28	Implemented displaying of the books list on home page.	2018-05-10 09:05:18 +05:30
Dan Brown	71b6f09128	Applied phpcs findings	2018-04-22 12:25:32 +01:00
Dan Brown	67e0c3d2a5	Improved export base64 encoding of images ... Now will use set storage mechanism to find image files. Fixes #786 Added test to cover	2018-04-22 12:23:43 +01:00
Dan Brown	a50153d221	Slimmed down testing DB sized and improved permission caching	2018-04-14 22:17:47 +01:00
Dan Brown	cdb1c7ef88	Added destination permission checking to entity move	2018-04-14 18:47:13 +01:00
Dan Brown	0f7b0ad45a	Added ability to copy a page ... In 'More' menu alongside move. Allows you to move if you have permission to create within the new target parent. Closes #673	2018-04-14 18:00:16 +01:00
Dan Brown	0ade9b5b9b	Refactored moment.js out of app ... Reduces bundle size by 25%	2018-04-01 14:10:44 +01:00
Dan Brown	1a72208d27	Added configurable robots.txt file. ... Deleted old static file. Default output depends on app-public setting. Otherwise can be overidden in `.env` file via `ALLOW_ROBOTS` Otherwise view file can be customized. Fixes #779	2018-03-31 12:41:40 +01:00
Dan Brown	58a6b2df7d	Merge branch 'master' of github.com:BookStackApp/BookStack	2018-03-30 14:10:36 +01:00
Dan Brown	582158f70e	Added tags to chapters and books ... Closes #121	2018-03-30 14:09:51 +01:00
Abijeet	2fc513984d	PSR2 fixes after running ./vendor/bin/phpcbf ... Signed-off-by: Abijeet <abijeetpatro@gmail.com>	2018-03-28 01:07:01 +05:30
Dan Brown	23f90ed6b4	Ensured uploaded system images remain public ... Also added tests to cover local_secure image storage. Fixes #725	2018-03-25 12:41:52 +01:00
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
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