Mirrors/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-11-25 04:13:42 +01:00
Code Issues Releases Wiki Activity
2,678 Commits 11 Branches 200 Tags 53 MiB
78e94bb003
Commit Graph

593 Commits

Author SHA1 Message Date
Dan Brown
17969c0bbf
Added shelves and search shortcuts to profile page 2019-04-06 16:21:20 +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
53a26a365c
Merge branch 'master' into 2019-design 2019-03-30 13:17:29 +00:00
Dan Brown
193e2ffebe
Prevent dbl exts. on img upload, Randomized attachment upload names 2019-03-24 19:08:21 +00:00
Dan Brown
f5fe524e6c
Added extension whitelist for image uploads 
- A continuation of the security issues addressed in v0.25.3
 2019-03-21 19:43:15 +00:00
Dan Brown
37b91b6b0e
Hardened image file validation by removing custom validation 
- Added test to check PHP files cannot be uploaded as an image.
 2019-03-20 23:59:55 +00:00
Dan Brown
5f2d226f09
Merge branch 'master' into 2019-design 2019-03-10 21:40:02 +00:00
Dan Brown
6be2d3f28c
Merge branch 'Copy-For-View-Only' of git://github.com/mark-james/BookStack into mark-james-Copy-For-View-Only 2019-03-09 16:12:12 +00:00
Dan Brown
98a4359198
Updated user language select to use correct default 
- Updated localisation system to take note of system defaul locale
before replacing the current locale
Fixes #1316
 2019-03-07 21:09:23 +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
a112c11df8
Re-ordered and updated main settings page 2019-02-16 14:17:35 +00:00
Dan Brown
3286f29a61
Merge branch 'master' into 2019-design 2019-02-09 14:58:38 +00:00
Dan Brown
5325870271
Updated auth pages to new design, Removed public layout 2019-02-03 17:34:15 +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
Dan Brown
32603362a6
Updated a bunch of book views 2019-01-31 20:37:12 +00:00
Dan Brown
36424a24b5
Added ability for date format strings to be localized by back-end 
Requires the locale to be installed on the system-side.
Closes #1214
 2019-01-19 12:11:18 +00:00
Dan Brown
0efed43389
Converted more views to new layout and made breadcrumbs more flexible 2019-01-13 15:54:55 +00:00
Dan Brown
163a57cf70
Merge branch 'master' into 2019-design 2019-01-13 14:10:27 +00:00
Dan Brown
a2087fe3ff
Made delete permissions a requirement for move operations 
Closes #1200
 2019-01-05 14:39:40 +00:00
Mark James
99c6d70c51 Initial updates to allow for page copy when the user can read the page but can't update it. 2018-12-31 17:01:49 +11:00
Dan Brown
2317bf2350
Added check for last admin on role change 
Will show error message if last admin and admin role is removed.
Closes #1124
Also cleaned up user controller a little.
 2018-12-30 16:11:58 +00:00
Dan Brown
b56fc21aaf
Abstracted user avatar fetching away from gravatar 
Still uses gravatar as a default.
Updated URL placeholders to follow LDAP format.
Potential breaking config change: `GRAVATAR=false` replaced by `AVATAR_URL=false`
Builds upon #1111
 2018-12-22 19:29:19 +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
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
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
131fcae4c7
Merge pull request #947 from BookStackApp/bookshelves 
Bookshelves
 2018-09-21 15:29:52 +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
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
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
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
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
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
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
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
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
582158f70e
Added tags to chapters and books 
Closes #121
 2018-03-30 14:09:51 +01: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
Abijeet Patro
0335f58478
Merge branch 'master' into bug/image-upload 2018-03-18 23:44:33 +05:30
Dan Brown
d2eec4fbce
Markdown editor image paste sets cursor correctly 
Now sets cursor to alt text rather than end of placeholder image.
Fixed #751
 2018-03-18 11:33:30 +00:00
Abijeet
f42d355fd7 Fixes issue with the validation message not being translated. 
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-03-13 09:10:23 +05:30
Dan Brown
81fa021083
Finished migrated from icon-font to SVG 2018-02-17 19:49:00 +00:00
Dan Brown
548dcd4db1
Fixed error when accessing non-authed attachment 
Also updated attachment tests to use standard test-case.
Fixes #681
 2018-02-11 12:37:02 +00:00
Dan Brown
bed7ba78d3
Updated grid view to use CSS grid and flexbox 
Provides a cleaner height-matched design.
Closes #701
 2018-02-11 11:36:51 +00:00
Dan Brown
a45922616f
Made default books view configurable in .env 
Under 'APP_VIEWS_BOOKS' key.
Closes #675
 2018-02-04 11:36:58 +00:00
Dan Brown
59e809be16
Added command to add a new admin user 
Closes #609
 2018-01-28 18:09:26 +00:00
Dan Brown
ec050a5eef
Fixed validation issue on register post 
Added test to cover and also cleaned up RegisterController comments.

Fixes #670
 2018-01-28 17:15:30 +00:00
Dan Brown
62342433f4
Set /app PHP code to PSR-2 standard 
Also adde draw.io to attribution list.

Closes #649
 2018-01-28 16:58:52 +00:00
Dan Brown
88d09a2a3b
Added drawing endpoint tests 
Also refactored ImageTests away from BrowserKit
Also added image upload type validation.
 2018-01-28 13:18:28 +00:00
Dan Brown
0c383eee5b
Merge branch 'master' into draw.io to fetch auth image changes 2018-01-20 14:06:44 +00:00
Dan Brown
f4bfbf91db
Merge pull request #665 from BookStackApp/authed_images 
Adds ability to secure images behind auth
 2018-01-20 14:05:03 +00:00
Dan Brown
34782fbc91
Merge branch 'master' into draw.io 2018-01-20 14:01:56 +00:00
Dan Brown
1bfd77e7a1
Added drawing update ability 2018-01-20 14:01:35 +00:00
Dan Brown
281da59bae
Refactored book sort using collections 2018-01-13 16:44:47 +00:00
Dan Brown
0afa417b0a
Added ability to secure images behind auth 
Still in testing.
Adds STORAGE_TYPE=local_secure option for setting images to be behind
auth. Stores images alongside attachments in /storage/uploads/images.
 2018-01-13 11:11:23 +00:00
Abijeet
a77756a2da Refactored the code to first check for the permissions before sorting the book. 
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-01-06 01:04:48 +05:30
Abijeet
e13e71cbe0 Changed the sort view to only show books to which we have an update permission. 
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2017-12-31 16:44:46 +05:30
Abijeet
4a24d1c31b Checks the target and the source book before performing the sort. 
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2017-12-31 16:25:21 +05:30
Dan Brown
920964a561
Enabled system-storage of drawings made via draw.io 2017-12-30 15:26:39 +00:00
Dan Brown
141bf22725
Updated book view change to PATCH + other amends 
Moved toggle to right of header bar and added unique text and icon for
each view type.

Removed old profile setting to keep things clean.
 2017-12-29 16:49:03 +00:00
Dan Brown
1aa4d0dc59
Merge branch 'feature-613' of git://github.com/Abijeet/BookStack into Abijeet-feature-613 2017-12-29 16:25:15 +00:00
Dan Brown
afe781bc39
Enabled session in 404 responses 
Fixes #634
 2017-12-28 13:19:02 +00:00
Abijeet
d5a2529775 Adds test cases and fixes an issue with the permission checking. 
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2017-12-26 15:46:20 +05:30
Abijeet
0d4db603a4 Adds button to allow users to toggle the book view via the books list page. 
Closes #613

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2017-12-26 12:38:16 +05:30
Dan Brown
03eb63ec77
Made it possible to pre-fill login via url 
Allows email to be passed to email field.
Also allows password only if in demo mode (Due to security concerns).
 2017-12-10 13:56:25 +00:00
Dan Brown
90bf13c1ab
Updated okta config keys, made SVG fully vector 
Also added some additional error handling to login.
 2017-12-09 13:32:45 +00:00
Dan Brown
d7edc389a6
Enabled custom HTML head content to work within editors 
Closes #562
 2017-12-08 11:52:43 +00:00
Dan Brown
56d5af1336
Made it possible to configure proxies via env 
In reference to #146
 2017-12-07 19:46:47 +00:00
Dan Brown
b65abd25e0
Made small var name and formatting tweaks 2017-12-07 19:19:25 +00:00
Dan Brown
a5e49f642b
Merge branch 'disable-comments' of git://github.com/Abijeet/BookStack into Abijeet-disable-comments 2017-12-07 19:15:26 +00:00
Dan Brown
261e57fc4e
Converted books view setting to user setting 
Also cleaned up/moved new CSS and removed redundant new book methods.
 2017-12-06 16:34:26 +00:00
Dan Brown
bc1302a8d8
Merge branch 'BookStackApp-master' of git://github.com/OsmosysSoftware/BookStack into OsmosysSoftware-BookStackApp-master 2017-12-06 15:52:54 +00:00
Dan Brown
873b1099f8
Updated to laravel 5.5 
Closes #590
 2017-11-19 15:56:19 +00:00
Abijeet
6bb7b5465f Added code in the settings to disable comments. Based on that hiding the comments section on the page display. 2017-11-16 00:05:24 +05:30
Dan Brown
d89440d198
Fixed required email confirmation with domain restriction 
Added test to cover scenario.

Closes #573
 2017-11-11 18:09:48 +00:00
Dan Brown
db51cee2d8
Prevented custom homepage being deleted 
Fixes #546
 2017-10-15 19:14:46 +01:00
Dan Brown
c943eb4d0d
Removed empty string null middleware as was causing issues 2017-09-30 14:44:52 +01:00
Dan Brown
aca6de49b0
Added missing middleware to trim input 2017-09-30 14:31:27 +01:00
Dan Brown
74a5e3113e
Fixed page includes erroring on save 
Closes #514
 2017-09-20 21:03:40 +01:00
Dan Brown
0275d2ad58
Added loading icons, Added comment activity 2017-09-09 17:06:30 +01:00
Bharadwaja G
c1a1bc0135 Books grid view 2017-09-04 20:27:52 +05:30
Dan Brown
fea5630ea4
Made some changes to the comment system 
Changed to be rendered server side along with page content.
Changed deletion to fully delete comments from the database.
Added 'local_id' to comments for referencing.
Updated reply system to be non-nested (Incomplete)
Made database comment format entity-agnostic to be more future proof.
Updated designs of comment sections.
 2017-09-03 16:37:51 +01:00
Bharadwaja G
6200948eec Merge branch 'master' of git://github.com/BookStackApp/BookStack into BookStackApp-master 
Conflicts:
	app/Http/Controllers/BookController.php
	resources/lang/en/common.php
	resources/views/books/create.blade.php
	resources/views/books/form.blade.php
	resources/views/books/index.blade.php
	resources/views/users/edit.blade.php
	tests/Entity/EntityTest.php
 2017-08-29 12:19:00 +05:30
Dan Brown
0a402e3c63
Made custom home ignore permissions and added tests 
Closes #126 and #372
 2017-08-28 13:55:39 +01:00
Dan Brown
55759bd22a
Added ability to set a page to view on the homepage. 
Relates to #372 and #126
 2017-08-28 13:38:32 +01:00
Dan Brown
4cb4c9e568
Updated remaining views to 2017 design update. 
Also fixed issue with duplicate confirmation email.
 2017-08-26 17:17:04 +01:00
Dan Brown
36f524a354
Updated page view styles to align with 2017 update 2017-08-26 15:41:33 +01:00
Dan Brown
8fcbe44d3e
Updated styles for auth and books views. 
Also added sourcemaps to gulp sass build
 2017-08-26 13:24:55 +01:00
Bharadwaja G
7f902e41c7 Resolved conflicts 2017-08-24 12:21:43 +05:30
Dan Brown
3da8c01c1f
Rolled out new design further 2017-08-20 13:57:25 +01:00
Dan Brown
a04b31866d
Cleaned social callback 2017-08-17 19:44:35 +01:00
Abijeet
844976c85b Revert "Revert "Bookstack grid view."" 2017-07-12 11:40:50 +05:30
Abijeet
3fd61a3600 Revert "Bookstack grid view." 2017-07-07 17:28:34 +05:30
Nilesh Deepak
144a6e469d Updated cover image upload and delete function. 2017-07-07 16:29:38 +05:30
Nilesh Deepak
16a09e8ff6 Deletion of image file on book deletion. 2017-07-06 10:03:40 +05:30
Nilesh Deepak
6ad24a6bee Changed public getImageURL function to private. 2017-07-05 18:32:38 +05:30
Nilesh Deepak
d99fd1fd65 Applied required changes 2017-07-05 12:26:02 +05:30
Nilesh Deepak
947c58f227 Applied required changes in BookStack. 2017-07-05 12:09:01 +05:30
Nilesh Deepak
bce5fdd5cd Merge branch 'master' into issue-181 2017-07-04 15:16:46 +05:30
Nilesh Deepak
af72f0d490 Bookstack grid view. 2017-06-29 18:54:04 +05:30
Nilesh Deepak
8924618d12 test 2017-06-28 18:56:17 +05:30
Nilesh Deepak
6557fbb666 commit 2017-06-28 18:51:32 +05:30
Abijeet
5bd9da6054 #47 - Adds various translations in English, and a few code improvements. 2017-06-06 01:46:59 +05:30
Abijeet
9558f84b97 #47 - Adds functionality to delete a comment. Also reduces the number of watchers. 2017-06-04 18:52:44 +05:30
Abijeet
2fd421b115 #47 - Adds comment level permissions to the front-end. 2017-06-04 11:17:14 +05:30
Abijeet
860d4d4be5 #47 - Changes the way we are handling fetching of data for the comment section. 2017-05-30 09:02:47 +05:30
Abijeet
03e5d61798 #47 Implements the reply and edit functionality for comments. 2017-05-16 00:40:14 +05:30
Abijeet
8b82753218 #47 - Gets rid of simplemde 2017-05-03 02:42:04 +05:30
Abijeet Patro
3368fe42d8 Merge pull request #10 from BookStackApp/master 
Latest changes
 2017-05-03 01:41:08 +05:30
Dan Brown
1859a4d356
Refactored permission system components 
Split joint permission creation into chunks

Fixes #374
 2017-04-29 22:01:43 +01:00
Dan Brown
ad4642c2c4
Enabled translation when not logged in 
Reads from the Accept-Language HTTP header.
Also fixed some encoding for ES translations.

Fixes #375
 2017-04-29 16:47:41 +01:00
Abijeet
c3ea0d333e #47 - Adds functionality to display child comments. Also has some code towards the reply functionality. 2017-04-27 02:35:29 +05:30
Abijeet
8e2437498f Merge branch 'master' of https://github.com/Abijeet/BookStack 2017-04-19 01:23:27 +05:30
Abijeet
b3d4c199ae Merge branch 'master' of https://github.com/Abijeet/BookStack 
Conflicts:
	.gitignore
 2017-04-19 01:21:45 +05:30
Dan Brown
dcde599709
Added chapter search 
Migrated book search to vue-based system.
Updated old tag seached.
Made chapter page layout widths same as book page.
Closes #344
 2017-04-15 19:16:07 +01:00
Dan Brown
0e0945ef84
Finished off UI for search system 2017-04-15 15:04:30 +01:00
Dan Brown
1338ae2fc3
Started search interface, Added in vue and moved fonts 2017-04-09 20:59:57 +01:00
Dan Brown
070d4aeb6c
Started implementation of new search system 2017-03-19 12:48:44 +00:00
Dan Brown
36173eb47d
Removed extension from translation script link 
Also fixed bug causing EN translation backup to not be passed
to javascript translation system.

Closes #328
 2017-03-05 14:10:55 +00:00
Dan Brown
253132afdf
Added chapter export options 
Closes #177
 2017-02-26 14:25:02 +00:00
Dan Brown
eded8abded
Added book export and created export tests to cover 
In reference to #177
 2017-02-26 13:26:51 +00:00
Dan Brown
387047f262
Fixed inaccessible revisions, added regression tests 
Fixes #309
 2017-02-25 12:29:01 +00:00
Dan Brown
a6128a1df1
Merge bugfixes from branch 'v0.14' 2017-02-05 21:24:15 +00:00
Dan Brown
6638ee47d3
Fixed entities wrongly visible on 404 
Also ensured header state as expected on 404.
In reference to BookStackApp/website#9
 2017-02-05 21:19:29 +00:00
Abijeet
70991fc1e5 Merge branch 'master' of https://github.com/Abijeet/BookStack 2017-01-29 09:35:46 +05:30
Dan Brown
6669998c10
Upgraded to Laravel 5.4 2017-01-25 19:35:40 +00:00
Dan Brown
492e2f173e
Fixed error causing permissions to be deleted on book sort 
Closes #282
 2017-01-23 22:27:11 +00:00
Dan Brown
a4f6bc63f0
Updated page include logic to use blade-style tags 
It will also snippets of a page if and id is provided in a tag
 2017-01-21 13:53:00 +00:00
Dan Brown
e4e3b25c22
Started page transclusion system 2017-01-16 21:24:48 +00:00
Dan Brown
dabf149411
Added user setting system and added user-lang option 
Supports #115
 2017-01-15 16:27:24 +00:00
Abijeet
397db04428 Added comments controller, model, repo, and the database schema. Modified existing Page model to associate with comments. 2017-01-13 21:45:48 +05:30
Dan Brown
8453191dfb
Finished refactor of entity repos 
Removed entity-specific repos and standardised
the majority of repo calls to be applicable to
all entity types
 2017-01-02 11:07:27 +00:00
Dan Brown
65796cfc7b
Rewrote book children query 2017-01-01 21:21:11 +00:00
Dan Brown
bab27462ab
Fixed issue where default user was over-fetched 2017-01-01 17:33:06 +00:00
Dan Brown
241278226f
Refactored search and slug repo components 2017-01-01 16:57:47 +00:00
Dan Brown
7f9de2c8ab
Started refactor to merge entity repos 2017-01-01 16:05:44 +00:00
Dan Brown
a24f3d7d47 Merge branch 'master' into translations 2016-12-31 14:32:52 +00:00
Dan Brown
c9700e38e2
Created solution for JS translations 
Also tidied up existing components and JS
 2016-12-31 14:27:40 +00:00
Dan Brown
05316c90ba
converted image picker to blade-based component 
Also updated some other JS translations
 2016-12-24 15:21:19 +00:00
Dan Brown
573357a08c
Extracted text from logic files 2016-12-04 16:51:39 +00:00
Dan Brown
c403d05755
Fixed social login routes 
Fixes #239
 2016-11-27 19:11:15 +00:00
Dan Brown
0fb1fc87c8
Enabled utf8 slugs 
Prevents slug change when using only non-ascii chars
Allows use of more localised urls.

Closes #233
 2016-11-12 17:16:52 +00:00
Dan Brown
d3c7aada89
Fixed attachments on draft pages 2016-11-12 14:21:54 +00:00
Dan Brown
e639600ba5
Renamed files to attachments 2016-11-12 14:12:26 +00:00
Dan Brown
ac80723058
Merge fixes from branch 'v0.12' 2016-11-12 11:40:54 +00:00
Dan Brown
ab468bac3c
Updated build and versioning system 
Added versioning file instead of using git tags
(Step towards removing git as a dependancy in the future)

Updated gulpfile to fit with verisioning system and cleaned
up node dependancies.

Fixes #108
 2016-10-30 17:44:00 +00:00
Dan Brown
8b43b91057
Improved password reset flow with notifications. 
Also added links to sign-in/register.
Fixed links in emails sent out.

Fixes #210 and #218.
 2016-10-30 11:36:57 +00:00
Dan Brown
30458405ce
Page Attachments - Improved UI, Now initially complete 
Closes #62
 2016-10-23 17:55:48 +01:00
Dan Brown
91220239e5
Added in attachment tests 2016-10-23 15:25:04 +01:00
Dan Brown
7ee695d74a
File upload deletion complete & added extension handling 
Also fixed issue with file editing on JS side
 2016-10-23 13:36:45 +01:00
Dan Brown
867fc8be64
Added basic attachment editing functionality 2016-10-11 20:39:11 +01:00
Dan Brown
89509b487a
Added attachment creation from link/name 2016-10-10 21:13:18 +01:00
Dan Brown
ac0b29fb6d
Added view, deletion and permissions for files 2016-10-10 20:30:27 +01:00
Dan Brown
673c74ddfc
Started work on attachments 
Created base models and started user-facing controls.
 2016-10-09 18:58:22 +01:00
Dan Brown
3b7d223b0c
Updated and added tests for new default user system 
Closes #138
 2016-09-29 17:07:58 +01:00
Dan Brown
b662670efc
Prevented guest users creating draft pages. 2016-09-29 15:56:57 +01:00
Dan Brown
771626b6ec
Started work on making the public role/user configurable 
Create a new 'public' guest user and made the public
role visible on role setting screens.
 2016-09-29 12:43:46 +01:00
Dan Brown
f15cc5bdfa
Separated revision preview and diff & fixed chosen diff html 
Closes #8
 2016-09-29 10:10:46 +01:00
Dan Brown
fff5bbcee4
Merge branch 'diff' of git://github.com/younes0/BookStack into younes0-diff 2016-09-29 09:32:40 +01:00
Dan Brown
1d681e53e4
Added page navigation and tweaked header styles 
Changed header selection in editor to be more descriptive and
to provide a wider range of styles.

Closes #68
 2016-09-18 14:49:36 +01:00
Dan Brown
e0235fda8b
Made registration gravatar/email requests fail gracefully 
* Extracted any email confirmation text into langs.
* Added new notification on confirmation email send fail.

Closes #187
 2016-09-17 21:33:55 +01:00
Dan Brown
9dc9724e15 Laravel 5.3 upgrade (#189) 
* Started move to laravel 5.3

* Started updating login & registration flows for laravel 5.3 update

* Updated app emails to notification system

* Fixed registations bugs and removed email confirmation model

* Fixed large portion of laravel post-upgrade issues

* Fixed and tested LDAP process
 2016-09-17 18:22:04 +01:00
Dan Brown
7973412c29
Improved sort efficiency by a factor of 10 
Fixes #145
 2016-08-26 20:20:58 +01:00
Dan Brown
f8a299caee
Fixed login 'intended' redirect for custom urls. 
Also changed social account detach wording.
 2016-08-21 14:49:40 +01:00
Chris
437dce7756 Applied baseUrl to login redirect 2016-08-21 13:48:56 +01:00
Dan Brown
43d9d2eba7 Updated all application urls to allow path prefix. 
Allows BookStack to be installed at a non-root location on a domain.
Closes #40.
 2016-08-14 12:29:35 +01:00
Younès EL BIACHE
c279c6e2af replace GPL diff lib with MIT lib 
replace gpl lib with mit lib
 2016-07-10 12:01:05 +02:00
Younès EL BIACHE
9537e2ae95 html diff in revision view 2016-07-07 19:54:40 +02:00
Dan Brown
565033e0d4 Fixed bug which hid entities and fixed new chapter priority 2016-07-03 10:31:20 +01:00
Dan Brown
b0a63ba0cc Tightened and cleaned some list styles 2016-07-03 09:58:45 +01:00
Dan Brown
7b6c88f17c Fixed error on image deletion 
Also Added tests to cover image upload and deletion.
Fixes #136.
 2016-07-01 20:13:30 +01:00
Dan Brown
9baa96d41c Added chapter move actions. Closes #86 2016-06-25 15:31:38 +01:00
Dan Brown
7f99903fdb Finished off page move functionality 2016-06-12 12:14:14 +01:00
Dan Brown
97d011ac8e Started work on page move view and entity selector 2016-06-11 21:04:18 +01:00
Dan Brown
61596a8e21 Prevent page redirect on draft saving 
Only an issue when using the non 'mysqlnd' extension.
Fixes #120
 2016-06-10 19:45:53 +01:00
Dan Brown
eec9c05518 Added tag autosuggestion when no input provided 
Shows the most popular tag names/values.
As requested on #121
 2016-06-04 15:37:28 +01:00
Dan Brown
246d1621f5 Limited tag value autosuggestions based on tag name 
As requested on #121
 2016-06-04 14:54:31 +01:00
Dan Brown
be517de7dc Added pagination, sorting & searching to users list 
As requested on #113
 2016-05-22 10:44:31 +01:00
Dan Brown
23ab1f0c81 Standardised delete aesthetics regarding roles and users 
Also added user delete success message.
Fixes #114
 2016-05-22 09:23:41 +01:00
Dan Brown
e80ae76856 Added auto-suggestions to tag names and values 2016-05-15 20:12:53 +01:00
Dan Brown
b80184cd93 Renamed attribute to tags & continued interface 
Also fixed page create route broken in last commit
 2016-05-13 21:20:21 +01:00
Dan Brown
1fa079b466 Started the page attributes interface 2016-05-12 23:12:05 +01:00
Dan Brown
fcfb9470c9 Added further attribute endpoints and added tests 2016-05-07 14:29:43 +01:00
Dan Brown
5080b4996e Started base work on attribute system 2016-05-06 20:33:08 +01:00
Dan Brown
1903422113 Merge branch 'v0.9' 2016-05-03 21:30:55 +01:00
Dan Brown
4e8722661f Added bookstack version in settings 
Gets the app version via git. Closes #99
 2016-05-03 21:10:05 +01:00
Dan Brown
75a4fc905b Major permission naming refactor and database migration cleanup 2016-05-01 22:33:56 +01:00
Dan Brown
05666efda9 Added hidden public role to fit with new permissions system 2016-05-01 19:36:53 +01:00
Dan Brown
9a31b83b2a Worked around create permission quirks 2016-04-26 21:48:17 +01:00
Dan Brown
a81a56706e Rolled out new permissions system throughout application 2016-04-24 16:54:20 +01:00
Dan Brown
043cdeafb3 Merge branch 'master' into add_role_view_permissions 2016-04-20 20:22:30 +01:00
Dan Brown
8933179017 Prevented drafts from showing up in a book sort 
Added tests to cover regresssion.
In reference to #100.
 2016-04-15 19:51:27 +01:00
Dan Brown
d6bad01130 Fixed draft time display, Cleaned up some code 
Cleaned up some comment spacing in book controller and refactored some of the view service functions.
 2016-04-09 14:26:42 +01:00
Dan Brown
2e7345f4f0 Localised draft save time display 
In reference to #83.
 2016-04-09 13:36:32 +01:00
Dan Brown
6e03078de3 Started work towards adding role view permissions 
Work halted as re-write required.
In reference to #92
 2016-04-09 12:40:07 +01:00
Dan Brown
afc3583be8 Made new pages in chapters have a better inital priority 2016-04-07 19:03:00 +01:00
Dan Brown
cbff2c6035 Added uploaded to book/page filters & search in image manager 
Also refactored tab styles which affected the settings area.

Closes #41
 2016-04-03 14:59:54 +01:00
Dan Brown
d099885fd1 Fixed some label casing and fixed incorrect notifications 
Fixed the book & chapter permission update notification stating the 'page permissions' have been updated.
 2016-04-03 12:19:44 +01:00
Dan Brown
2bb8c3d914 Made email confirmations work with LDAP auth 
The email_confirmed user field now actually indicates if an email is confirmed rather than defaulting to true if not checked.
 This ensures toggleing the 'Require email confirmation' setting actually makes all currently unconfirmed users confirm thier emails.
 2016-04-03 12:16:54 +01:00
Dan Brown
4caa61fe96 Added a friendlier error for LDAP new user mismatches 2016-04-03 11:16:49 +01:00
Dan Brown
e9b596d3bc Merge bugfixes from branch 'v0.8' 2016-03-30 21:49:25 +01:00
Dan Brown
097d9c9f3c Updated entity restrictions to allow permissions, Not just restrict 
Also changed wording from 'Restrictions' to 'Permissions' to keep things more familiar and to better reflect what they do.

Referenced in issue #89.
 2016-03-30 20:15:44 +01:00
Dan Brown
26965fa08f Added a markdown editor 2016-03-25 14:41:15 +00:00
Dan Brown
491f73e0cd Fixed bug causing permission error on save and fixed non-gallery image save 2016-03-13 15:37:46 +00:00
Dan Brown
dbe11c1360 Attached images to pages and added restriction filtering 
Closes #79
 2016-03-13 13:30:47 +00:00
Dan Brown
5283919d24 Added new page drafts and started image entity attaching 
Closes #80.
 2016-03-13 12:04:08 +00:00
Dan Brown
30214fde74 Added UI components of page autosaving 2016-03-12 15:52:19 +00:00
Dan Brown
59ce228c2e Moved page editing to angular controller and started work on update drafts 2016-03-09 22:32:07 +00:00
Dan Brown
66c56e9d02 Added settings helper and formatted code in some files 2016-03-06 12:55:08 +00:00
Dan Brown
e744d4c82c Changed color picker library and moved color logic to front end 
Since the old library was GPLv3 i changed the color picker to tiny-color-picker which is MIT.
Also extracted the styles to a shared view and move color calculation logic to javascript side.
 2016-03-06 10:52:10 +00:00
Dan Brown
0774ecc89c Merge branch 'master' into nwalke-update_site_color 2016-03-06 09:08:20 +00:00
Dan Brown
5e7a4c7fb5 Fixed incorrect recents pages on homescreen 
Fixed the bug causing the recently updated pages to be exaclty the same as the recently create pages.
Also added in tests to prevent regression.
 2016-03-05 22:54:53 +00:00
Dan Brown
8e6248f57f Added restriction tests and fixed any bugs in the process 
Also updated many styles within areas affected by the new permission and roles system.
 2016-03-05 18:09:21 +00:00
Dan Brown
268db6b1d0 Added a whole load of permission & role tests 2016-03-05 12:09:09 +00:00
Nick Walke
e3bdc391cd Closes #55. Allows you to set the primary color. 
This certainly should not be seen as the final implementation of this.
I imagine that requests like this will happen for many other colors in
the system, it might be good at some point to allow them to upload their
own stylesheet to be used.
 2016-03-03 12:01:14 -06:00
Dan Brown
8e274a5a84 Refactored some permission controls and increased testing for roles system 2016-03-02 22:35:01 +00:00
Dan Brown
985d2f1c2c Tied entity restriction system into userCan checks 2016-02-29 20:31:21 +00:00
Dan Brown
201f788806 Implemented database structure and inital interfaces for entity restrictions 2016-02-28 10:49:41 +00:00
Dan Brown
a14b5c33fd Added missing permission checkboxes and improved image AJAX permission responses 2016-02-27 20:52:46 +00:00
Dan Brown
473261be35 Finished initial implementation of custom role system 2016-02-27 19:24:42 +00:00
Dan Brown
a54be85185 Started work on exposing the role system as editable 2016-02-26 23:44:02 +00:00
Dan Brown
54e3122540 Added smarter page finding so changing the page name does not break old urls 
Added page & book slug history to revisions so they can be looked up if a page is not found.
 2016-02-25 20:01:59 +00:00
Dan Brown
3ab09ef708 Fixed issue with the book sort not showing all books in sidebar 2016-02-22 21:28:20 +00:00
Dan Brown
61577cf6bf Added entity-specific search results pages. Cleaned & Fixed search results bugs 
Added search result pages for pages, chapters and books.
Limited the results on the global search as it just listed out an infinate amount.
Fixed styling on new detailed page listings and also removed the 'bars' from the side to create  a cleaner view.
Fixed bad sql fulltext query format that may have thrown off searches.
Reduced the number of database queries down a thousand or so.
 2016-02-21 12:53:58 +00:00
Dan Brown
8eb2960950 Added recently created & updated page listings 
Closes #46.
 2016-02-20 18:51:01 +00:00
Dan Brown
bab6fd1f2f Added recent pages to home view and made the home content more compact 2016-02-20 12:37:06 +00:00
Dan Brown
4d9726dbdd Added content to user profile pages 2016-02-17 22:11:48 +00:00
Dan Brown
4442a2e6d1 Started work on user profile pages 2016-02-16 21:25:11 +00:00
Dan Brown
5d73d17c74 Fixed bug preventing LDAP users updating thier profile 
Made email not required when a profile is updated. LDAP users without admin privileges could did not have an email field to submit therefore could previously not update thier profile.
 2016-02-08 20:35:23 +00:00
Dan Brown
080acf0a62 Added plaintext & basic PDF page Export 2016-01-31 17:53:30 +00:00
Dan Brown
ea2e16cabb Added page HTML export 2016-01-20 22:13:13 +00:00
Dan Brown
7bcd967fd9 Increased LDAP testing and fixed any Auth-based bugs found 2016-01-17 15:20:07 +00:00
Dan Brown
bb87401d10 Improved image upload error handling and fixed bad user-avatar rewriting 2016-01-17 15:19:26 +00:00
Dan Brown
0821672e70 Cleaned tests up, Started LDAP tests, Created LDAP wrapper 2016-01-15 23:21:47 +00:00
Dan Brown
14feef3679 Updated user interfaces for LDAP and added email from LDAP 2016-01-13 22:22:30 +00:00
Dan Brown
1c8c9e65c5 Got LDAP auth working to a functional state 2016-01-11 22:41:05 +00:00
Dan Brown
14ca31768c Updated laravel to 5.2 and started ldap implementation 2016-01-09 19:24:21 +00:00
Dan Brown
d3709de035 Added more tests to increase test coverage 2016-01-02 14:48:35 +00:00
Dan Brown
9a470b07fd Added public build folder and support for a demo mode 2015-12-31 17:57:34 +00:00
Dan Brown
4db692309b Standardized vue component http access and fixed some small bugs 2015-12-28 15:58:13 +00:00
Dan Brown
af33156369 Fixed name retrieval on missing users and added tests to cover along with some test helper methods 2015-12-15 19:27:36 +00:00
Dan Brown
93223fcd3d Cleaned up gravatar image importing 2015-12-14 20:13:32 +00:00
Dan Brown
8f7c642f32 Added custom user avatars 2015-12-09 22:30:55 +00:00
Dan Brown
a3188d349c Added mulit image-type compatability to manager & app and added scaled image selection 2015-12-08 22:04:59 +00:00
Dan Brown
c88096b7e2 Revamped image system to use driver-agnotstic storage and be more efficent 2015-12-07 23:00:34 +00:00
Dan Brown
c32d70abc4 Added custom meta titles to many pages. Closes #30. 2015-12-05 14:41:51 +00:00
Dan Brown
f1c2866fbc Added Popular books list with relevant tests 2015-12-02 20:22:41 +00:00
Dan Brown
9969698783 Floating page content bugfix and prevent incompatable image uploads. Fixes #26. 2015-12-01 20:26:09 +00:00
Dan Brown
62338e4a8f Added further tests, Fixed speed_update issues, improved search result query count 2015-11-29 17:33:25 +00:00
Dan Brown
22f8a408fa Added indexes, Reduced queries on pages 2015-11-26 23:45:04 +00:00
Dan Brown
3e24b04d00 Prevent duplicate slugs on sort 2015-11-21 18:11:46 +00:00
Dan Brown
61ae96c5f8 Added better entity deletion and commented up repos 2015-11-21 18:05:03 +00:00
Dan Brown
ea55b7f141 Added view count tracking with personalised lists 2015-11-21 17:22:14 +00:00
Dan Brown
76eb8fc5d7 Added limit to books shown on homepage and make alphabetical 2015-11-09 20:39:06 +00:00
Dan Brown
e5b9be2e76 Added pagination to books page 2015-11-09 19:46:04 +00:00
Dan Brown
3fd2613ab7 Prevent revision encoding issues 2015-10-18 19:40:33 +01:00
Dan Brown
8ea75b0fdf Image uploads now quicker, and image sized reduced with links to originals 2015-10-18 18:48:51 +01:00
Dan Brown
7039695b65 Added chrome paste-image-upload. Closes #20. 2015-10-14 21:46:18 +01:00
Dan Brown
5af6656fae Extracted page form js and added better page content linking 2015-10-10 18:57:52 +01:00
Dan Brown
1b736ac045 Added tests for confirmed registration 2015-09-21 20:54:11 +01:00
Dan Brown
e8dd7fda1f Added some basic registration testing 2015-09-10 20:28:53 +01:00
Dan Brown
88049476fe Change application namespace to BookStack 2015-09-10 19:31:09 +01:00
Dan Brown
e449f25cc8 Added cross-book page/chapter sorting 2015-09-06 14:35:53 +01:00
Dan Brown
411c331a62 Got registration process working with social accounts 2015-09-06 12:14:32 +01:00
Dan Brown
dec0cbb1b2 Got standard form-based registration working 2015-09-05 20:25:57 +01:00