1368 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dan Brown	19751ed1cb	Incremented dev version	2018-09-25 10:00:09 +01:00
Dan Brown	818c02ed44	Added null role check to migrate path ... Also added check for existing bookshelf role_permissions in the event the user got that for. Also related to #1027	2018-09-24 16:30:08 +01:00
Dan Brown	9abdab3991	Updated migration to convert MyISAM tables to InnoDB ... New bookshelves_books tables requires foreign constraints which error on MyISAM. For #1027	2018-09-24 15:58:40 +01:00
Dan Brown	43122f86e8	Merge pull request #1026 from vriic/master ... Update german translation	2018-09-24 10:35:22 +01:00
Nikolai Nikolajevic	935337862c	Update german translation	2018-09-24 09:55:37 +02:00
Dan Brown	dd671524f8	Merge pull request #1025 from moucho/master ... Spanish translation	2018-09-23 17:18:41 +01:00
Marcos	1cac3d43d3	Spanish translation	2018-09-23 17:31:41 +02:00
Dan Brown	9243c635f2	Made search test a little more consistent	2018-09-23 15:15:44 +01:00
Dan Brown	93f820d9da	Updated TinyMCE config to end containers on empty blocks ... Makes it easier to escape out of blockquote sections. Fixes #961	2018-09-23 14:07:50 +01:00
Dan Brown	b62afcad1f	Removed search indexing from migration path to prevent Bookshelf issue	2018-09-23 13:25:12 +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	eebfd8904e	Removed old fulltext indexes from migrations ... Prevents forcing of MyISAM for some databases Removed old code to add indexes and added checks for existing indexes before removal. Should still allow upgrades, rollbacks to old bookstack versions may be funky but should not be high use-case.	2018-09-23 00:30:48 +01:00
Dan Brown	0d84a0b976	Extracted search sidebar text to translation file ... Closes #864	2018-09-22 23:40:04 +01:00
Dan Brown	88ac636c00	Made it possible to scroll past the end of the markdown editor ... Closes #1020	2018-09-22 23:24:51 +01:00
Dan Brown	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
Dan Brown	6543020fd2	Updated tinymce to v4.8.3	2018-09-22 22:58:06 +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	10d08e641c	Merge pull request #1021 from moucho/master ... Spanish translation	2018-09-22 21:43:19 +01:00
Marcos	c4e4cebf14	Spanish translation	2018-09-22 18:36:52 +02:00
Dan Brown	3f58800ed1	Added ability to configure revision limit	2018-09-22 17:30:42 +01:00
Dan Brown	0931ff38e9	Tried to make chapter toggles a little smoother in FF	2018-09-22 16:36:35 +01:00
Dan Brown	07bc0612c0	Merge branch 'master' into fix/#960	2018-09-22 15:57:53 +01:00
Dan Brown	6dec485b45	Fixed sidebar rubber-banding when content is expanded ... Hopefully for #905 Ideally layout needs to be re-thought	2018-09-22 15:52:09 +01:00
Dan Brown	a441faf65c	Only show codeblock copy icon on hover ... Fixes #980	2018-09-22 14:55:33 +01:00
Dan Brown	50ee1462ad	Merge pull request #986 from DeehSlash/fix/pt_br_locale ... Adds and fixes pt_BR strings	2018-09-22 14:40:23 +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	c667c6e235	Merge branch 'master' of git://github.com/kmoj86/BookStack into kmoj86-master	2018-09-22 12:23:17 +01:00
Dan Brown	e3e484e561	Added custom head content to exports ... Closes #981 Also fixed incorrect download tests.	2018-09-22 11:53:40 +01:00
Dan Brown	73fa18a128	Made bookstack cookie name configurable ... Closes #1018	2018-09-22 11:42:02 +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	c8d893fac7	Updated 404 test to not fail based on random long name	2018-09-21 15:24:29 +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	0b6f83837b	Removed joint_permission generation in older migration	2018-09-20 16:03:01 +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 Patro	32e34f10ff	Merge pull request #1008 from BookStackApp/revision-deletion ... #784 - Adds ability to remove particular revision.	2018-09-16 21:30:04 +05:30
Dan Brown	f455b317ec	Added ability to click books in shelf-sort	2018-09-16 16:59:01 +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	90883bb22b	Fixes issue wth the dropdown list upon double clicking. ... Closes #960 Signed-off-by: Abijeet <abijeetpatro@gmail.com>	2018-09-16 13:09:21 +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