2793 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dan Brown	af7d62799c	New Crowdin updates (#2787) ... * New translations common.php (German) * New translations common.php (Dutch)	2021-06-04 22:50:48 +01:00
Dan Brown	bb00c331e4	Ordered entity permission roles by display name ... Closes #2782	2021-06-04 22:36:30 +01:00
Dan Brown	807f92b693	Updated homepage action button colors for consistency ... Were previously inconsistent with other homepage buttons for non-default homepage options.	2021-06-04 22:28:38 +01:00
Dan Brown	c5d31ea7b2	Merge branch 'master' of github.com:BookStackApp/BookStack	2021-06-04 22:21:06 +01:00
Dan Brown	ef1bde8bb1	Fixed wrong styles for homepage favourites ... When using a non-default homepage option. Fixes #2783	2021-06-04 22:20:11 +01:00
Dan Brown	8897945609	Roll-out and re-fix of croation via crowdin (#2785) ... * New translations auth.php (Croatian) * New translations activities.php (Croatian) * New translations activities.php (German Informal) * New translations common.php (Croatian) * New translations passwords.php (Croatian) * New translations settings.php (Czech) * New translations settings.php (Spanish) * New translations settings.php (Catalan) * New translations settings.php (Arabic) * New translations settings.php (French) * New translations pagination.php (Croatian) * New translations settings.php (German) * New translations settings.php (Danish) * New translations settings.php (Chinese Simplified) * New translations settings.php (Hebrew) * New translations validation.php (Korean) * New translations validation.php (Croatian) * New translations settings.php (Hungarian) * New translations settings.php (Chinese Traditional) * New translations settings.php (Japanese) * New translations settings.php (Korean) * New translations settings.php (Dutch) * New translations settings.php (Polish) * New translations settings.php (Portuguese) * New translations settings.php (Russian) * New translations settings.php (Slovak) * New translations settings.php (Slovenian) * New translations settings.php (Turkish) * New translations settings.php (Ukrainian) * New translations settings.php (Vietnamese) * New translations settings.php (Portuguese, Brazilian) * New translations settings.php (Indonesian) * New translations settings.php (Persian) * New translations settings.php (Spanish, Argentina) * New translations settings.php (Croatian) * New translations settings.php (Latvian) * New translations settings.php (Bosnian) * New translations settings.php (Norwegian Bokmal) * New translations settings.php (German Informal) * New translations entities.php (German Informal) * New translations settings.php (Italian) * New translations settings.php (Swedish) * New translations settings.php (Bulgarian) * New translations errors.php (German Informal) * New translations errors.php (Croatian) * New translations components.php (Croatian) * New translations entities.php (Croatian) * New translations pagination.php (Croatian) * New translations entities.php (Croatian) * New translations components.php (Croatian) * New translations errors.php (Croatian) * New translations settings.php (Croatian) * New translations validation.php (Croatian) * New translations passwords.php (Croatian) * New translations auth.php (Croatian) * New translations common.php (Croatian) * New translations activities.php (Croatian)	2021-06-02 22:15:58 +01:00
Dan Brown	9382d647d7	Merge branch 'ffranchina-master'	2021-06-02 21:57:23 +01:00
Dan Brown	0d17d18d07	New Crowdin updates (#2777) ... * New translations common.php (Latvian) * New translations entities.php (Latvian) * New translations activities.php (Italian) * New translations common.php (Italian) * New translations entities.php (Italian) * New translations errors.php (Italian) * New translations settings.php (Italian) * New translations common.php (Spanish, Argentina) * New translations entities.php (Spanish, Argentina) * New translations activities.php (Spanish, Argentina) * New translations common.php (Spanish, Argentina) * New translations common.php (French) * New translations common.php (Swedish) * New translations activities.php (Swedish) * New translations common.php (Swedish) * New translations entities.php (Swedish) * New translations errors.php (Swedish) * New translations settings.php (Swedish) * New translations validation.php (Bulgarian) * New translations validation.php (Bulgarian) * New translations common.php (Bulgarian) * New translations validation.php (Bulgarian) * New translations settings.php (Bulgarian) * New translations activities.php (Indonesian) * New translations settings.php (Bulgarian) * New translations common.php (Bulgarian) * New translations entities.php (Bulgarian) * New translations activities.php (Turkish) * New translations settings.php (Bulgarian) * New translations components.php (Bulgarian) * New translations activities.php (Russian) * New translations common.php (Russian) * New translations entities.php (Russian) * New translations common.php (Russian) * New translations entities.php (Russian)	2021-06-02 21:56:53 +01:00
Dan Brown	24eef03fb9	Added croatian to required arrays/lists	2021-06-02 21:55:30 +01:00
Dan Brown	e51352e1a4	Added back in commas, reset settings language array ... Related to #2784	2021-06-02 21:50:38 +01:00
Dan Brown	2dfb1ae3ee	Merge branch 'master' of https://github.com/ffranchina/BookStack into ffranchina-master	2021-06-02 21:44:39 +01:00
Dan Brown	39928e1c63	Reviewed base64 image upload support ... - Added test cases to cover. - Altered parsing logic to be a little less reliant on regex. - Added new iamge repo method for creating from data. - Added extension validation and additional type support. - Done some cleanup of common operations within PageContent. - Added message to API docs/method to mention image usage. For #2700 and #2631.	2021-06-02 21:34:34 +01:00
Dan Brown	40ca50e44f	Merge branch 'master' of https://github.com/awarre/BookStack into awarre-master	2021-06-02 20:25:20 +01:00
Francesco Franchina	fc7b8c49fb	Adding Croatian translation files	2021-06-02 17:32:31 +02:00
Dan Brown	fdabafffda	Added thumbnail attribute to complete .env	2021-05-30 15:22:58 +01:00
Dan Brown	e2df15fe20	Updated translators before next release	2021-05-30 15:11:59 +01:00
Dan Brown	54bac17ef0	New Crowdin updates (#2764)	2021-05-30 15:10:11 +01:00
Dan Brown	7634ac4e12	Updated test to align with export date format change	2021-05-30 13:23:51 +01:00
Dan Brown	c4f5ab12cf	Aligned export and revision shown date format ... As raised in #2771	2021-05-30 00:02:32 +01:00
Dan Brown	57a063cdfb	Updated nav tests to look for shortened item names	2021-05-29 23:46:33 +01:00
Dan Brown	1fa90e4f12	Converted another couple of tests from browserkit	2021-05-29 23:42:21 +01:00
Dan Brown	d62cdd58d3	Upgraded php and npm deps ... - Sass upgrade had some breaking changes where division was used hence updated for newer sass version support.	2021-05-29 13:08:28 +01:00
Dan Brown	ed6ec341df	Added testing to cover next/previous navigation ... For #2511	2021-05-29 12:49:10 +01:00
Dan Brown	0cfff6ab6f	Reviewed and refactored next/previous navigation button implementation ... - Updated styling to include item name. - Extracted used text to translations. - Updated the design to better suit the surrounding blocks. - Removed newly added model/repo methods. - Moved core logic out of controller and instead into a "NextPreviousContentLocator" helper with re-uses the output from the book-tree generation. - Also added the system to chapters. For #2511	2021-05-29 12:39:41 +01:00
Dan Brown	7ca66c5d5e	Merge branch 'prev-next-button' of https://github.com/shubhamosmosys/BookStack into shubhamosmosys-prev-next-button	2021-05-26 22:13:19 +01:00
Dan Brown	9cbea1eb08	Updated drawing upload error to shown/handle server limit errors ... Closes #2740	2021-05-26 18:23:27 +01:00
Dan Brown	1a2d374f24	Revert "Added app logo to outgoing emails" ... This reverts commit e32929029b.	2021-05-26 17:13:59 +01:00
Dan Brown	e32929029b	Added app logo to outgoing emails ... Required changing the header bar of the email to be solid color to match the configuration of the main app header since otherwise colors may not work together. Closes #2577	2021-05-26 17:11:03 +01:00
Dan Brown	eb76e882c5	Added deletion of revisions on page delete ... Added testing to cover. Closes #2668	2021-05-26 16:40:56 +01:00
Dan Brown	d326417edc	Added name input autofocus on shelves, books and chapters ... Closes #1956	2021-05-26 15:25:23 +01:00
Dan Brown	a3a8fef6b2	Made users header interface more adaptable ... Search input was stacking on create button on default desktop view due when viewing in russian due to combined width exceeding container. Made into normal flexbox instead. Closes #2147	2021-05-26 15:20:35 +01:00
Dan Brown	0c16334426	Merge branch 'master' of github.com:BookStackApp/BookStack	2021-05-25 00:06:13 +01:00
Dan Brown	600f8cd142	Added origin verification to postMessage usage. ... Closes #2769	2021-05-25 00:05:20 +01:00
Dan Brown	5c8c85a0ff	Merge pull request #2768 from CorruptComputer/RSPEC-5148-Fixes ... [sec] Fixes a few minor vulnerabilies when using target="_blank" on links (RSPEC-5148)	2021-05-24 22:11:49 +01:00
Nickolas Gupton	7a6f21648a	Fixes minor vulnerability when using target="_blank" on links (RSPEC-5148)	2021-05-24 16:17:08 -04:00
Dan Brown	df0e03cd07	Reviewed PR to add import user avatars va LDAP ... - Reduced options to single new configuration paramter instead of two. - Moved more logic into UserAvatars class. - Updated LDAP avatar import to also run on login when no image is currently set. - Added thumbnail fetching to search requests. - Added testing to cover. Related to PR #2320, and issue #1161	2021-05-24 18:54:08 +01:00
Dan Brown	85db812fea	Merge branch 'master' of https://github.com/jasonhoule/BookStack into jasonhoule-master	2021-05-24 17:06:50 +01:00
Dan Brown	fb5b5e138d	Updated existing tag tests away from browserkit testing	2021-05-24 16:16:58 +01:00
Dan Brown	3eaf03a7ac	Reviewed tag in seach work ... - Refactored some tag code bits while reviewing. - Updated tag design in search listing to be more subtle. - Moved tags out of entity-list-item-basic template and instead moved them into entity-list-item, below the existing content. - Tweaked existing tag colors a little. - Changed tag icon to be more tag-like. - Added tag-on-search test case. Review of #2487, Related to #2462	2021-05-24 16:12:09 +01:00
Dan Brown	5420f3451c	Merge branch 'show-tags' of https://github.com/burnoutberni/BookStack into burnoutberni-show-tags	2021-05-24 15:12:45 +01:00
Dan Brown	7d94da10fb	Merge branch 'v21.04.x'	2021-05-24 13:08:51 +01:00
Dan Brown	c7322a71f7	Added theme add social driver redirect configuration callback ... Allows someone using the theme system to configure the social driver before a redirect action occurs, by passing a callback as an additional param to the theme 'addSocialDriver' method.	2021-05-24 12:55:45 +01:00
Dan Brown	2c3523f6a1	Updated image permission setting logic ... To ensure thhat the visibility is still set on local storage options since the previous recent changes could cause problems where in scenarios where the server user could not read images uploaded by the php process user. Closes #2758	2021-05-24 12:09:28 +01:00
Dan Brown	dd6076049c	Merge pull request #2748 from BookStackApp/favourite_system ... Favourite System	2021-05-23 14:45:42 +01:00
Dan Brown	ba8ba5c634	Added testing to favourite system ... - Also removed some old view service references. - Updated TopFavourites query to be based on favourites table and join in the views instead of the other way around, so that favourites still show even if they have no views.	2021-05-23 14:34:36 +01:00
Dan Brown	c2069f37cc	Added deletion of favourites on entity/user delete	2021-05-23 13:41:56 +01:00
Dan Brown	1e0aa7ee2c	Added favourites page with link from header and home	2021-05-23 13:34:08 +01:00
Dan Brown	27942f5ce8	Deleted redundant complex relationmultimodel query class	2021-05-22 14:07:57 +01:00
Dan Brown	d0ff79ea60	Revamped some complex queries, added favourites to home ... - Removed old view system and started use of new query classes instead. - Finished off RelationMultiModelQuery but found it was less efficient than x-many queries due to the amount of tables being scanned. Adding now for history but will delete as not used. - Updated recently viewed to use same query system as popular items rather than running and joining x-entities queries. - Added "Most Viewed Faviourites" listing to homepages.	2021-05-22 14:05:28 +01:00
Dan Brown	3de02566bf	Started building system for cross-model queries	2021-05-19 23:37:23 +01:00