416 Commits

Author	SHA1	Message	Date
Dan Brown	83d77d5166	Merge branch 'master' of git://github.com/rondaa/BookStack into rondaa-master	2021-01-02 16:25:59 +00:00
Dan Brown	b43f997dab	Added manual type conversion to fix failing tests	2021-01-01 18:38:54 +00:00
Dan Brown	5e686bb624	Added user ownership migrate to delete screen.	2021-01-01 18:31:01 +00:00
Dan Brown	99b14621f9	Moved permission updating to its own tool ... And added support for owner changing.	2021-01-01 17:49:48 +00:00
Dan Brown	4c580d1571	Added owners to entity creation and updated tests	2020-12-30 22:18:28 +00:00
Dan Brown	b493becadf	Started change for entities to have concept of owners	2020-12-30 18:25:35 +00:00
James Geiger	e458411f91	Create Open Graph meta tags for book/page/chapter/shelf	2020-12-21 23:20:13 -06:00
Dan Brown	cf04a0d818	Merge branch 'v0.30.x'	2020-12-18 14:16:13 +00:00
Dan Brown	2acef3c2ec	Fixed issue where restricted page content in plaintext export ... The content of pages made non-viewable to a user via permissions, within a visible parent, could be seen via the plaintext export option. Before v0.30.6 this would have applied only to scenarios where all pages within the chapter were made non-visible. In v0.30.6 this would make all pages within the chapter visible. As per #2414	2020-12-18 13:56:00 +00:00
Dan Brown	9884cca00c	Merge branch 'v0.30.x'	2020-12-17 21:47:59 +00:00
Dan Brown	3f3fad7113	Fixed book-tree-gen page visibility issue ... When book trees were generated, pages in chapters where ALL pages within were not supposed to be visibile, would be visible due to the code falling back on the raw relation which would not account for permissions. This has now been changed so that a custom 'visible_pages' attribute is set and used by any book tree structures, to ensure it does not fall back to the raw relation. Added an extra test to cover. For #2414	2020-12-17 17:31:18 +00:00
Dan Brown	00308ad4ab	Cleaned up some user/image areas of the app ... Further cleanup of docblocks and standardisation of repos.	2020-12-08 23:46:38 +00:00
Dan Brown	6c09334ba0	Fixed issue where page export contain system would miss images	2020-12-06 22:23:21 +00:00
Dan Brown	bf8716bb22	Fixed bad collection/array mixing causing error on seed	2020-11-28 16:42:12 +00:00
Dan Brown	53bcfe528d	Added pages API doc examples ... Made some tweaks to related content and other examples while there.	2020-11-28 15:21:54 +00:00
Dan Brown	1c8102bb89	Started pages API	2020-11-22 14:56:19 +00:00
Dan Brown	a042e22481	Focused base Entity class cleanup ... Removed some common functions from other entities. Aligned implementation of getUrl() Cleaned phpdocs and added typehinting. Also extracted sibling search logic out of controller.	2020-11-22 01:20:38 +00:00
Dan Brown	ef1b98019a	Fixed some mis-refactoring and split search service ... Search service broken into index and runner tools.	2020-11-22 00:17:45 +00:00
Dan Brown	c7a2d568bf	Moved models to folder, renamed managers to tools ... Tools seems to fit better since the classes were a bit of a mixed bunch and did not always manage. Also simplified the structure of the SlugGenerator class. Also focused EntityContext on shelves and simplified to use session helper.	2020-11-21 23:20:54 +00:00
Dan Brown	66917520cb	Service provider and other cleanup ... - Removed old 'exposeTranslations' system to instead use new component option system. - Extracted validation rules into their own service provider. - Cleaned up some formatting/comments in the repos.	2020-11-21 17:52:49 +00:00
Dan Brown	3f7180fa99	Started widening of activity logging ... In progress, Need to implement much of the logging in controllers. Also cleaned up base controller along the way.	2020-11-18 23:40:39 +00:00
Dan Brown	712ccd23c4	Updated activities table format ... Renamed some columns to be more generic and applicable. Removed now redundant book_id column. Allowed nullable entity morph columns for non-entity activity. Ran tests and made required changes.	2020-11-08 00:03:19 +00:00
Dan Brown	ee7e1122d3	Removed use of book_id in activity	2020-11-07 23:15:13 +00:00
Dan Brown	c157dc3490	Organised activity types and moved most to repos ... Repos are generally better since otherwise we end up duplicating things between front-end and API. Types moved to by CONST values within a class for better visibilty of usage and listing of types.	2020-11-07 22:37:27 +00:00
Dan Brown	4824ef2760	Merge pull request #2283 from BookStackApp/recycle_bin ... Recycle Bin Implementation	2020-11-07 15:10:17 +00:00
Dan Brown	b4da081552	Checked over recycle bin parent/child flows	2020-11-07 15:05:13 +00:00
Dan Brown	ec3aeb3315	Added recycle bin auto-clear lifetime functionality	2020-11-07 13:58:23 +00:00
Dan Brown	483cb41665	Started testing work for recycle bin implementation	2020-11-06 12:54:39 +00:00
Anthony Ronda	34dc4a1b6d	Automatic Restored Revision Changelog Summary Text	2020-11-03 20:46:47 -05:00
Dan Brown	3e70c661a1	Cleaned up duplicate code in recycle-bin restore	2020-11-02 22:54:00 +00:00
Dan Brown	9e033709a7	Added per-item recycle-bin delete and restore	2020-11-02 22:47:48 +00:00
PercussiveElbow	bbd1384acb	XSS and redirect fixes with test cases	2020-10-27 01:34:51 +00:00
Dan Brown	ff7cbd14fc	Added recycle bin empty notification response with count	2020-10-03 18:53:09 +01:00
Dan Brown	04197e393a	Started work on the recycle bin interface	2020-10-03 18:44:12 +01:00
Dan Brown	465d405926	Updated page content related links on content id changes ... For #2278	2020-09-28 22:26:50 +01:00
Dan Brown	691027a522	Started implementation of recycle bin functionality	2020-09-27 23:24:33 +01:00
Dan Brown	68489e5b44	Updated PR code to use isA and updated that function definition ... Related to #2227	2020-09-26 17:00:17 +01:00
Dan Brown	fe0e307313	Merge branch 'renderpages' of git://github.com/mr-vinn/BookStack into mr-vinn-renderpages	2020-09-26 16:55:05 +01:00
Dan Brown	31eec34b5d	Moved decode and updated page plaintext decode test	2020-09-19 15:13:18 +01:00
Dan Brown	44f3508171	Merge branch 'preview-entities' of git://github.com/mr-vinn/BookStack into mr-vinn-preview-entities	2020-09-19 14:58:56 +01:00
Dan Brown	78bf044a7a	Added audit log interface ... - Displays the currently tracked activities in the system. Related to #2173 and #1167	2020-09-19 12:06:45 +01:00
Vinnie Okada	311a12b7ef	Decode HTML entities ... Decode HTML entities in page text before saving it to the database.	2020-09-18 06:54:30 -06:00
Vinnie Okada	2c3f453c1f	Implement the renderPages parameter ... Render page content when getTree() is called with a true $renderPages argument.	2020-09-07 09:05:51 -06:00
Dan Brown	8bc3e0f31a	Merge branch 'master' of git://github.com/drzippie/BookStack into drzippie-master	2020-06-27 17:11:11 +01:00
Dan Brown	7a2e39212e	Fixed empty search scenario	2020-06-27 13:37:18 +01:00
Dan Brown	715dee2d0e	Converted search filters to not be vue based	2020-06-27 13:29:00 +01:00
Antonio Cortés (DrZippie)	ca202c1819	Added Illuminate\Support\Str::slug to generate slug from text to improve the creation of slugs with non-English characters	2020-06-25 18:08:13 +02:00
Dan Brown	3502abdd49	Fixed revision issues caused by page fillable changes	2020-05-23 12:28:14 +01:00
Dan Brown	00c0815808	Fixed issue where updated page content would not be indexed ... - Also updated html field of pages to not be fillable. (Since HTML should always go through app id parsing) Related to #2042	2020-05-23 00:46:13 +01:00
Dan Brown	8a6cf0cdec	Added chapters to the API	2020-05-23 00:28:41 +01:00
Nikhil Jha	e287d965f5	move zip export into exportservice	2020-05-13 20:07:19 -07:00
Nikhil Jha	a7d9646b19	support exporting WYSIWYG pages as Markdown	2020-05-13 18:34:22 -07:00
Nikhil Jha	a34a07c610	basic markdown export	2020-05-12 21:12:26 -07:00
Dan Brown	9666c8c0f7	Updated shelf-list view to enforce view permissions for child books ... - Aligned shelf-homepage behaviour to match - Updated testing to cover. For #2111	2020-05-12 22:21:45 +01:00
Dan Brown	29705a25ce	Reviewed and added testing for BookShelf API implementation ... - Tweaked how books are passed on update to prevent unassignment if parameter is not provided. - Added books to validation so they show in docs. - Added request/response examples. - Added tests to cover. - Added child book info to shelf info. Review of #1908	2020-04-10 15:19:18 +01:00
Dan Brown	47e645909e	Reviewed #1688, Show parent shelves on books page ... - Moved list to the left of the page to align with other navigational items. - Hid list of no shelves, to help hide shelf references if not in use. - Tweaked test to ensure it wasn't finding shelf name in breadcrumb rather than list being tested.	2020-04-09 17:29:22 +01:00
Dan Brown	898cedf536	Merge branch 'feature/#1598' of git://github.com/cw1998/BookStack into cw1998-feature/#1598	2020-04-09 17:18:37 +01:00
Dan Brown	6caedc7a37	Fixed issues preventing breadcrumb navigation menus from opening ... - Added tests to cover endpoint Fixes #1884	2020-02-15 19:09:33 +00:00
Dan Brown	5978d9a0d3	Updated cover image methods so image parameter is not optional but still nullable	2020-02-15 18:38:36 +00:00
Dan Brown	ccd50fe918	Aligned export styles a little better and fixed potential DOMPDF css error ... - Removed different PDF template used on pages. - Updated export view files to have the intended format passed. - Shared the export CSS amoung the export templates. Should hopefully address #1886	2020-02-15 15:34:06 +00:00
Dan Brown	04a8614136	Filled out base Book API endpoints, added example responses	2020-01-12 14:45:54 +00:00
Dan Brown	02af69ddf2	Added command to copy shelf permissions ... Has options to run for all or to specify a slug for a specific shelf. Closes #1091	2019-12-11 21:22:03 +00:00
Dan Brown	d64c358c4f	Updated sort logic to handle chapter to book scenario ... - Extended tests out to cover	2019-10-29 22:33:09 +00:00
Dan Brown	e108808a32	Merge branch 'feature_move_page_into_chapter' of git://github.com/philjak/BookStack into philjak-feature_move_page_into_chapter	2019-10-29 22:26:11 +00:00
jakob	7368ff3e6a	No need to save page	2019-10-28 16:53:48 +01:00
jakob	4daeb9daa6	Check if parent is a chapter. If so, move into Book and assing page to chapter.	2019-10-28 15:33:28 +01:00
jakob	bc38fd3ac4	entity needs to be saved after image upload and associate	2019-10-22 11:18:08 +02:00
Dan Brown	31f5786e01	Entity Repo & Controller Refactor (#1690) ... * Started mass-refactoring of the current entity repos * Rewrote book tree logic - Now does two simple queries instead of one really complex one. - Extracted logic into its own class. - Remove model-level akward union field listing. - Logic now more readable than being large separate query and compilation functions. * Extracted and split book sort logic * Finished up Book controller/repo organisation * Refactored bookshelves controllers and repo parts * Fixed issues found via phpunit * Refactored Chapter controller * Updated Chapter export controller * Started Page controller/repo refactor * Refactored another chunk of PageController * Completed initial pagecontroller refactor pass * Fixed tests and continued reduction of old repos * Removed old page remove and further reduced entity repo * Removed old entity repo, split out page controller * Ran phpcbf and split out some page content methods * Tidied up some EntityProvider elements * Fixed issued caused by viewservice change	2019-10-05 12:55:01 +01:00
Christopher Wilkinson	4ad4dfa55a	Show bookshelves that a book belongs to on a book view ... Closes #1598	2019-09-27 00:45:22 +01:00
Dan Brown	7cd956b24b	Removed some unused parameters and fixed env test logic	2019-09-20 01:18:59 +01:00
Dan Brown	8b550991a4	Refactored some core entity actions ... - Created BookChild class to share some page/chapter logic. - Gave entities the power to generate their own permissions and slugs. - Moved bits out of BaseController constructor since it was overly sticky. - Moved slug generation logic into its own class. - Created a facade for permissions due to high use. - Fixed failing test issues from last commits	2019-09-20 00:18:28 +01:00
Dan Brown	f7a5a0705b	Moved shelf book append logic	2019-09-19 18:20:09 +01:00
Dan Brown	615b2de433	Simplified activity facade interface ... Also cleaned up any other bits along the way.	2019-09-19 18:03:17 +01:00
Dan Brown	60d0f96cd7	Extracted some methods into a BookRepo	2019-09-15 23:28:23 +01:00
Dan Brown	be08dc1588	Ran phpcbf and updated helpers typehinting	2019-09-15 18:29:51 +01:00
Dan Brown	140298bd96	Updated to Laravel 5.8	2019-09-13 23:58:40 +01:00
Dan Brown	7cc17934a8	Made MD editor display a sandboxed iframe ... - Also added escaping of srcdoc elements in escape logic. Related to #1531	2019-08-26 12:16:50 +01:00
Dan Brown	20c36d58a6	Merge pull request #1527 from BookStackApp/129-page-templates ... Page Templates Implementation	2019-08-11 20:21:17 +01:00
Dan Brown	de3e9ab094	Added ability to use templates ... - Added replace, append and prepend actions for template content into both the WYSIWYG editor and markdown editor. - Added further testing to cover.	2019-08-11 20:04:43 +01:00
Dan Brown	421dd93ffd	Merge branch 'v0.26'	2019-08-06 21:50:56 +01:00
Dan Brown	2955f414dd	Added iframe JS and data url escaping ... Related to #1531	2019-08-06 21:08:24 +01:00
Dan Brown	2ebbc6b658	Merge branch 'master' into 129-page-templates	2019-08-04 16:26:38 +01:00
Dan Brown	4b0c4e621a	Replaced use of custom 'baseUrl' helper with 'url' ... Also changed up how base URL setting was being done by manipulating incoming request URLs instead of altering then on generation.	2019-08-04 14:26:39 +01:00
Dan Brown	8fcb0e6820	Merge branch 'v0.26'	2019-07-10 20:30:36 +01:00
Dan Brown	c732970f6e	Hardened page content script escaping ... Increased range of tests to cover. Fixes #1531	2019-07-10 20:17:22 +01:00
Dan Brown	71167426bb	Started implementation of page template	2019-07-07 13:45:46 +01:00
Dan Brown	f08668706f	Updated page-nav to show more title content ... Will now be truncated using CSS instead of being truncated on PHP side. Closes #1206.	2019-06-16 12:08:07 +01:00
Dan Brown	fbb2b7ac6a	Updated page nav header shift logic to be accurate ... Added tests to cover. Fixes #542	2019-06-16 11:32:38 +01:00
Dan Brown	3ad1b42a74	Updated page delete to handle inactive custom homepage correctly ... Fixes #1447	2019-05-27 12:40:19 +01:00
Dan Brown	13c0386e84	Updated string functions to use mulitbyte versions where needed ... Fixes #816	2019-05-25 16:15:19 +01:00
Dan Brown	896f88174a	Updated page navigation logic to ignore empty headers ... Fixes #1429	2019-05-15 21:02:11 +01:00
Dan Brown	3f83c548f8	Ran phpcbf	2019-05-05 14:54:37 +01:00
Dan Brown	ad542f0407	Prevented potential inline JS event usage ... - Removes 'on*' attributes from elements. - Also updated script logic to remove scripts instead of escaping. - All JS injection removal now uses DomDocument + xpath parsing.	2019-05-05 13:53:37 +01:00
Dan Brown	8c190324ac	Updated existing image tests to reflect changes ... - Also added some new tests	2019-05-04 18:11:19 +01:00
Dan Brown	2bb06463d5	Added deeper content id de-duplication ... Closes #1393	2019-04-21 12:22:41 +01:00
Dan Brown	6c66a8935a	Added test to check page HTML id de-duplication ... Relates to #1393	2019-04-20 13:01:56 +01:00
Dan Brown	c380c10d54	Prevented bad duplicate IDs causing major exception ... Related to #1393	2019-04-15 21:20:32 +01:00
Dan Brown	7f3f6e65b9	Aligned item creation wording and updated shelf-book-add logic	2019-04-15 20:45:04 +01:00
Dan Brown	b12ae6d11b	Added bookshelves to breadcrumbs ... - Updated breadcrumb dropdown switchers and back-end sibling code to handle new breadcrumbs. - Added breadcrumb view composer and EntityContext system to mangage tracking if in the context of a bookshelf.	2019-04-07 18:28:11 +01:00
Dan Brown	d9cde4123d	Fixed entity excerpt function signature misalignment	2019-04-06 18:47:27 +01:00
Dan Brown	37bf7f11e4	Implemented new design in entity selector ... - Also showed entity path in search. - Cleaned popular entity fetch logic. - Cleaned entity selector JS code a little	2019-03-30 16:54:15 +00:00
Dan Brown	8b7bee7c67	Updated standard entity lists	2019-03-17 15:07:03 +00:00
Dan Brown	035a0d8efb	Added experimental breadcrumb traversal	2019-02-24 15:57:35 +00:00
Dan Brown	f1e571a57c	Made shelf listing more unique & efficient ... - Now includes listing of all books within.	2019-02-16 17:13:01 +00:00
Dan Brown	3286f29a61	Merge branch 'master' into 2019-design	2019-02-09 14:58:38 +00:00
Dan Brown	138f5d5c4f	Updated user and shelf views to new design	2019-02-03 13:45:45 +00:00
Dan Brown	20988962fe	Migrated a whole load more page/chapter/shelf views	2019-02-02 11:41:41 +00:00
abijeet	5ef0992d5b	PHPCS related fixes.	2019-01-27 15:59:23 +05:30
Dan Brown	163a57cf70	Merge branch 'master' into 2019-design	2019-01-13 14:10:27 +00:00
Dan Brown	0e0a17cc30	Prevented page text content includes ... Avoids possible permission issues where included content shown in search or preview where the user would not normally have permission to view the included content. Closes #1178	2019-01-05 17:18:40 +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	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
Dan Brown	85f330c79a	Extracted many page-specific repo methods into page-specific repo	2018-10-13 11:27:55 +01: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