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
9884cca00c
Merge branch 'v0.30.x'
2020-12-17 21:47:59 +00:00
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
d7e0d3e2d6
Fix issue with viewing export dropdown list
...
There is issue with viewing all the export list
2020-12-17 19:47:15 +05:30
5ab0db9690
Updated chapter delete wording to fit with new logic
2020-12-17 02:29:53 +00:00
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
6c09334ba0
Fixed issue where page export contain system would miss images
2020-12-06 22:23:21 +00:00
65b2c90522
Merge branch 'v0.30.x'
2020-12-06 21:32:01 +00:00
884664bfe9
Ensured base64 images are read from image upload folder
...
Also removed unused storage systems and updated testing.
2020-12-06 15:34:18 +00:00
8911e3f441
Removed http fetching from image base64 generation
2020-12-06 14:24:22 +00:00
7d38c96a23
Removed generic "UploadService" which was doing very little
2020-12-06 12:58:40 +00:00
162d893143
Updated .env.example to encorage use of setting APP_URL
...
For the purposes of secure URL generation and to avoid common problems
found when people are using reverse proxies.
2020-12-06 12:31:36 +00:00
4b36df08a8
Merge pull request #1 from BookStackApp/master
...
Update from base/master
2020-12-03 11:39:06 -06:00
0b01a77c16
Swapped out HTML diff implementation for own, removes tidy depdendancy
2020-11-29 19:08:13 +00:00
bf8716bb22
Fixed bad collection/array mixing causing error on seed
2020-11-28 16:42:12 +00:00
d56e7e7c79
Merge pull request #2382 from BookStackApp/pages_api
...
Pages API
2020-11-28 16:31:35 +00:00
57754c8211
Added testing to cover the pages API
2020-11-28 16:30:30 +00:00
8aedba14a3
Added page export API controller
2020-11-28 15:39:40 +00:00
875a8bdaff
Made docs sidebar a slight bit easier to scroll
...
Now it easily goes off the page, made it indapentally scrollable.
Will probably do something different in future as it grows more.
2020-11-28 15:28:44 +00:00
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
1c8102bb89
Started pages API
2020-11-22 14:56:19 +00:00
ebeca256f0
Updated old exportService name in controllers
2020-11-22 01:26:14 +00:00
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
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
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
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
5e01c30882
Aligned constructors across controller classes
...
Since they no longer needed to run the parent contructor
since the parent constructor was no longer needed.
2020-11-21 17:08:37 +00:00
f76a2a69f7
Cleaned up api docs implementation, added missing titles
2020-11-21 17:03:24 +00:00
65ddd16532
Merge pull request #2360 from BookStackApp/activity_revamp
...
Tracked activity update
2020-11-21 16:12:25 +00:00
c0680d5717
Added latest activity into users list view
2020-11-20 20:10:18 +00:00
bd6a1a66d1
Implemented remainder of activity types
...
Also fixed audit log to work for non-entity items.
2020-11-20 19:33:11 +00:00
da37700ac2
Implemented user, api_tokem & role activity logging
...
Also refactored some role content, primarily updating the permission
controller to be RoleController since it only dealt with roles.
2020-11-20 18:53:01 +00:00
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
20f9a50cee
LDAP: Added TLS support
2020-11-18 01:05:29 +01:00
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
ee7e1122d3
Removed use of book_id in activity
2020-11-07 23:15:13 +00:00
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
4824ef2760
Merge pull request #2283 from BookStackApp/recycle_bin
...
Recycle Bin Implementation
2020-11-07 15:10:17 +00:00
b4da081552
Checked over recycle bin parent/child flows
2020-11-07 15:05:13 +00:00
df10b508d8
Enhanced how activities are shown on items in recycle bin
2020-11-07 14:28:50 +00:00
ec3aeb3315
Added recycle bin auto-clear lifetime functionality
2020-11-07 13:58:23 +00:00
68b1d87ebe
Added test coverage of recycle bin actions
2020-11-07 13:19:23 +00:00
483cb41665
Started testing work for recycle bin implementation
2020-11-06 12:54:39 +00:00
34dc4a1b6d
Automatic Restored Revision Changelog Summary Text
2020-11-03 20:46:47 -05:00
3e70c661a1
Cleaned up duplicate code in recycle-bin restore
2020-11-02 22:54:00 +00:00
9e033709a7
Added per-item recycle-bin delete and restore
2020-11-02 22:47:48 +00:00
82e671a06d
Re-aligned init files with Laravel default
...
Removed the custom init elements that we added in 2017 to
custom load the helpers file and instead load via composer.
Also removed laravel-microscope package due to not running due to
helpers file.
2020-10-31 23:05:48 +00:00
474770af51
Merge branch 'fixes' of git://github.com/imanghafoori1/BookStack into imanghafoori1-fixes
2020-10-31 22:11:27 +00:00
78be644332
Merge pull request #2298 from timoschwarzer/composer-install-in-entrypoint
...
Install composer dependencies in Docker entrypoint
2020-10-31 21:56:48 +00:00
6d8b0605a0
Merge branch 'xss_and_redir_patch' of git://github.com/PercussiveElbow/BookStack into xss_and_redirect
2020-10-31 15:19:33 +00:00
Dan Brown
shubhamosmosys
James Geiger
Boddy4
Anthony Ronda