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
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
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
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
Abijeet
714c7bbd3a
Adds code to delete the revision.
...
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
2018-09-15 15:15:42 +05:30
Michael Mullins
e0b479efef
UTF-8 slugs & UI fixes
2018-09-11 22:42:25 +04:00
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
Ibrahim Ennafaa
d2f5313f92
add missing @param in method comment
2018-08-21 12:44:42 -04:00
Ibrahim Ennafaa
572e75b783
Update UserRepo.php
2018-08-20 21:19:25 -04: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
Ibrahim Ennafaa
b224a2c8a0
attempt to fix unit test error for admin creation
2018-08-16 21:52:16 +00:00
Dan Brown
fe6dfcedf9
implement social auto registration feature
2018-08-16 21:26:54 +00: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
b5a2d3c1c4
Merge remote-tracking branch 'origin' into bookshelves
2018-08-04 11:35:01 +01:00
Dan Brown
c83a51f7e2
Merge pull request #904 from lommes/903-socialite-discord
...
add everything needed to use discord as social login provider
2018-07-29 16:18:10 +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
Timo B
93795b6eda
add everything needed to use discord as social login provider
2018-06-28 09:01:36 +02:00
Dan Brown
4948b443b6
Started work on bookshelves
2018-06-24 13:38:19 +01: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
1df0bcaf85
Made image cleanup safer
...
Also fixed drawing update in markdown editor.
Added shortcut for MD editor to view drawing manager.
2018-05-27 14:33:50 +01:00
Dan Brown
c31e6a03ce
Added command to clean-up old images, Unfinished
2018-05-20 18:16:01 +01:00
Dan Brown
8c4c8cd95b
Updated secure-images option to not effect image name
...
Instead only the image path is altered.
Also fixed image manger mode not changing on button press.
2018-05-20 16:47:53 +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
71b6f09128
Applied phpcs findings
2018-04-22 12:25:32 +01:00
Dan Brown
67e0c3d2a5
Improved export base64 encoding of images
...
Now will use set storage mechanism to find image files.
Fixes #786
Added test to cover
2018-04-22 12:23:43 +01:00
Dan Brown
a50153d221
Slimmed down testing DB sized and improved permission caching
2018-04-14 22:17:47 +01:00
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
58a6b2df7d
Merge branch 'master' of github.com:BookStackApp/BookStack
2018-03-30 14:10:36 +01:00
Dan Brown
582158f70e
Added tags to chapters and books
...
Closes #121
2018-03-30 14:09:51 +01:00
Abijeet
2fc513984d
PSR2 fixes after running ./vendor/bin/phpcbf
...
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
2018-03-28 01:07:01 +05:30
Dan Brown
23f90ed6b4
Ensured uploaded system images remain public
...
Also added tests to cover local_secure image storage.
Fixes #725
2018-03-25 12:41:52 +01:00
Dan Brown
1e015af3c9
Fixed incorrect search logic in last commit
...
Incorrect cross-entity pagination could lead to hidden entities.
2018-03-24 19:05:56 +00: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
Dan Brown
5ad9c5d319
Merge branch 'bug/gif-image-740' of git://github.com/Abijeet/BookStack
...
Also removed console.logs in dropzone.js
2018-03-24 14:54:50 +00:00
Abijeet
bf8dddd99c
Not resizing gif images.
...
See - https://github.com/Intervention/image/issues/176
Fixes #223
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
2018-03-19 01:44:33 +05:30
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
Dan Brown
1ad6fe1cbd
Added togglable script escaping to page content
...
Configurable via 'ALLOW_CONTENT_SCRIPTS' env variable.
Fixes #575
2018-03-17 15:52:42 +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
5ab39bfd5a
Started migration to SVG icons
2018-02-17 13:30:52 +00:00
Dan Brown
dc1a16be4c
Made it possible to override icons via custom theme
2018-02-17 12:36:24 +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
110f32a16d
Merge branch 'master' of git://github.com/moutonnoireu/BookStack into moutonnoireu-master
...
Also updated composer deps
2018-02-11 11:44:09 +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
9becc8055b
Merge branch 'support_for_gitlub_auth' of git://github.com/pixwell-dev/BookStack into pixwell-dev-support_for_gitlub_auth
2018-02-04 17:51:30 +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
Jozef Balún
44d8f39037
add support for gitlab authentification
2018-01-31 16:02:07 +01:00
BlackSheep
5e2bf7c3e4
Add twitch socialite auth provider
2018-01-29 09:28:56 +01: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
ead4b14d94
Updated user profile image delete to delete all uploads
...
Also moved test and made more comprehensive
2018-01-28 14:08:14 +00:00
Sampath Kumar
35e00ddb95
#630 : Deleting user's profile pics on deleting of user account ( #646 )
...
* Issue-630: Fixed issue with deleting user profile pics when deleting a user.
* Issue #630 : Deleting user's profile pics on deleting of user account
* Issue-630: Added test case for deleting user
2018-01-28 13:50:24 +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
56264551e7
Added drawing icon and made drawio disablable
2018-01-20 15:00:54 +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
96b8c403a8
Fixed failing book view test
...
Also ensured setting system localcache is cleared correctly
2017-12-30 16:09:27 +00:00
Dan Brown
359b1b40a2
Fixed broken table/ol/ul page includes
...
Fixes #640
2017-12-30 15:50:33 +00:00
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
0c1b1cd435
Standardised admin role check
2017-12-29 16:14:20 +00:00
Dan Brown
3eb2246291
Merge branch 'feature-579' of git://github.com/Abijeet/BookStack into Abijeet-feature-579
2017-12-29 16:03:34 +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
Abijeet
7da8804753
Adds code to allow deletion of users via cmd line.
...
Fixes #579
Command:
php artisan bookstack:delete-users
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
2017-12-26 02:22:41 +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
d17eb0f54c
Merge branch 'master' of git://github.com/lommes/BookStack into lommes-master
2017-12-09 12:48:08 +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
6ee35f55cc
Refactored image picker to js component
...
Also adjusted default cover image size
2017-12-06 17:32:29 +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
6ebe8bf619
Fixed conflicting PDF facade namespace and corrected php version
...
Updated composer to have the correct config to install dependancies that
work for 7.0
2017-12-04 17:59:53 +00:00
Timo Bartholomes
009af9736e
Add socialite authentication for okta
2017-11-26 16:41:29 +01: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
711ba258f1
Prevented mulitple hypens incorrectly in slug
...
Added test to check slug format.
Fixes #589
2017-11-11 16:27:29 +00:00
Dan Brown
f094837709
Added test to cover multi-byte slugs
...
Also removed check for 'mb_' functions since mbstring is a dependancy
2017-11-11 16:15:08 +00:00
Vladimir
6b2581de63
Russian slug and Multibyte String
2017-11-03 14:00:07 +02:00
Dan Brown
db51cee2d8
Prevented custom homepage being deleted
...
Fixes #546
2017-10-15 19:14:46 +01:00
Dan Brown
a988438946
Expanded list of indexing split chars
...
Expands on #531
2017-10-15 19:14:31 +01:00
Dan Brown
9758872baf
Updated image fetching in exporting
...
Added domain check to see if possibly local even when whole url found.
Changed image fetch from file_get_contents to curl for external
resources.
Hopeful solution to #392
2017-10-06 20:49:25 +01:00
Dan Brown
2b3d6e4e4a
Updated search-regen command description
2017-10-01 17:51:59 +01:00
Dan Brown
9ba29770e1
Added azureAD social auth option
...
Closes #509
2017-10-01 13:19:17 +01:00
Dan Brown
481aa5b5b0
Added 'last_commented' sort option to search
...
Closes #440
2017-10-01 11:24:33 +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
5fd04fa470
Updated search indexer to split words better
...
Will now split up words based on more chars than just spaces.
Not takes into account newlines, tabs, periods & commas.
Fixed #531
2017-09-30 14:14:23 +01:00
Dan Brown
74a5e3113e
Fixed page includes erroring on save
...
Closes #514
2017-09-20 21:03:40 +01:00
Dan Brown
39e7ac1c15
Updated social login to redirect to intended page.
...
Closes #508 .
2017-09-14 20:20:47 +01:00
Dan Brown
0275d2ad58
Added loading icons, Added comment activity
2017-09-09 17:06:30 +01:00
Dan Brown
41f56e659d
Added comment reply and delete confirmation.
...
Also fixed local_id bug
Added component helpers
Added global scroll & Highlight helpers
2017-09-09 15:56:24 +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
Dan Brown
c81b63b56f
Fixed broken page content includes
2017-09-02 16:06:03 +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
Dan Brown
e9831a7507
Merge branch 'master' of git://github.com/Abijeet/BookStack into Abijeet-master
2017-08-01 19:24:33 +01:00
Dan Brown
33642c20ec
Fixed faulty text rendering calls and LDAP tests
2017-07-22 17:10:52 +01:00
Dan Brown
2704962277
Updated utfmb4 upgrade command
2017-07-22 16:19:17 +01:00
Dan Brown
6bcd89acf7
Moved utf8mb4 migration to command instead of migration
...
To prevent errors upon migration.
Command generates out the SQL syntax to make the change instead
so the upgrade can be done manually.
In reference to #425
2017-07-22 15:54:17 +01:00
Dan Brown
b12e2ceada
Added included content into page's text view
...
Allows rendered content to be shown in listings and used in searches.
Also prevented angular tags in content being parsed in listings.
Fixes #442
2017-07-22 14:21:56 +01:00
Nilesh Deepak
b4044e6c3a
Resolves heading issues in grid view
2017-07-15 16:22:29 +05:30
Nilesh Deepak
85fbe820c4
Adding getHeadingExcerpt to get heading.
2017-07-15 16:11:10 +05:30
Abijeet
f37509062e
Merge pull request #8 from OsmosysSoftware/feature-181
...
Issue 181
2017-07-12 18:41:35 +05:30
Nilesh Deepak
24ee78ccd8
Update.
2017-07-12 18:04:06 +05:30
Abijeet
844976c85b
Revert "Revert "Bookstack grid view.""
2017-07-12 11:40:50 +05:30
Abijeet
f0d914abbf
Merge pull request #5 from BookStackApp/master
...
Getting latest changes
2017-07-12 11:33:58 +05:30
Dan Brown
2ea7e10923
Set ldap to not follow referrals by default
...
Added LDAP_FOLLOW_REFERRALS .env option to override.
Fixes #317
2017-07-10 19:43:49 +01:00
Abijeet
3fd61a3600
Revert "Bookstack grid view."
2017-07-07 17:28:34 +05:30
Nilesh Deepak
d84315fff8
Indentation correction.
2017-07-07 17:06:08 +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
Dan Brown
005f0eb4fc
Updated default encoding and added conversion migration.
...
Also updated how DB port is defined so that the DB_PORT
env var can be used or it can be take from the host name.
Fixes #405
2017-07-02 17:30:12 +01:00
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
fd50efb503
#47 - Putting the comments right under the page.
2017-06-11 11:41:33 +05:30
Abijeet
652a67ad65
Removes some unncessary code.
2017-06-06 23:20:40 +05:30
Abijeet
5bd9da6054
#47 - Adds various translations in English, and a few code improvements.
2017-06-06 01:46:59 +05:30
Abijeet
7c6fe8c4e2
#47 - Changes the location of the reply and edit comment box.
2017-06-05 00:20:37 +05:30
Abijeet
06d75e1804
#47 - Updates the total comments when a comment is added.
2017-06-04 20:12:01 +05:30
Dan Brown
f99c8ff99a
Fixed role permission removal bug
2017-06-04 15:37:10 +01:00
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
1a1e71cd60
#47 Adds two attributes updated and created to display time to user.
2017-05-25 08:03:27 +05:30
Abijeet
34802ff8a6
#47 Inserts null for updated_at when the user is creating a comment.
2017-05-25 08:02:49 +05:30
Abijeet
03e5d61798
#47 Implements the reply and edit functionality for comments.
2017-05-16 00:40:14 +05:30
Abijeet Patro
4f231d1bf0
Merge pull request #11 from BookStackApp/master
...
Fixed chapter check for non-mysqlnd instances
2017-05-15 22:25:33 +05:30
Dan Brown
75981c2412
Fixed chapter check for non-mysqlnd instances
...
Fixes #383
2017-05-07 19:34:56 +01:00
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
f8ae4c335e
Made single entity updates more efficent
2017-04-30 19:44:59 +01:00
Dan Brown
5570e858e5
Made more efficiency improvements to permission system
2017-04-30 11:38:58 +01:00
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
Dan Brown
44347ee353
Fixed search system id clash
2017-04-23 20:27:49 +01:00
Dan Brown
fdd816b17d
Merge pull request #362 from DaneEveritt/patch-1
...
Queue confirmation emails.
2017-04-23 17:15:06 +01:00
Dan Brown
a323b0d49c
Allowed child entity permissions to override parent permissions
...
Updated elements of a page display and sidebar render to allow
child permissions to work even when parent entitites have permission
set. This allows a page with a 'view' permission to be viewable even
when the parent book or chapter is not viewable.
Fixes #366
2017-04-22 13:39:34 +01:00
Dan Brown
4c985aac7e
Added page revision counting
...
Adds stored revision counts to pages and the revisions themselves.
Closes #321
2017-04-20 20:58:54 +01:00
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
5fee7c4db1
Merge pull request #340 from BookStackApp/search_system
...
Implementation of new search system
2017-04-16 11:01:00 +01:00