Infra-Mirrors/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-10-01 01:36:00 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,546 Commits 18 Branches 197 Tags 95 MiB
404d11d0eb
Commit Graph

548 Commits

Author SHA1 Message Date
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
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
Dan Brown
f455b317ec
Added ability to click books in shelf-sort 2018-09-16 16:59:01 +01:00
Abijeet
0c8b6b7324 Final tweaks after code review and fixing failing test cases. 2018-09-16 01:12:36 +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
fe6dfcedf9 implement social auto registration feature 2018-08-16 21:26:54 +00:00
Dan Brown
c3986cedfc
Added shelve icon, improved migration, added role permission 
Icon is placeholder for now
Migration will now copy permissions from Books to apply to shelves.
Role view updated with visibility on shelve permission
 2018-08-04 12:45:45 +01:00
Dan Brown
b5a2d3c1c4
Merge remote-tracking branch 'origin' into bookshelves 2018-08-04 11:35:01 +01:00
Dan Brown
af6f4e6c8c
Updated pagination to use theme colour 2018-07-29 15:44:10 +01:00
Dan Brown
69a0f8d502
Prevented error notification being visible on load 
Fixes #897

Also made design a little more compact
 2018-07-29 15:34:54 +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
f668bee88b
Merge branch 'master' into feature/edit-link-headers 2018-07-14 09:36:14 +01:00
Dan Brown
9da600caf9
Merge pull request #906 from BookStackApp/bug/revision-wrap 
Fixes issue with code not wrapping on revision page.
 2018-07-01 16:18:49 +01:00
Abijeet
fb29f4119d Fixes issue with code not wrapping on revision page. 
Closes #888

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-06-30 09:49:55 +05:30
Dan Brown
4948b443b6
Started work on bookshelves 2018-06-24 13:38:19 +01:00
Abijeet
7d81a95156 Fixes issue with having to click the delete icon for attachment twice. 
Fixes #884

This is happening because -

Due to the limitations of modern JavaScript (and the abandonment of Object.observe), Vue cannot detect property addition or deletion. Since Vue performs the getter/setter conversion process during instance initialization, a property must be present in the data object in order for Vue to convert it and make it reactive.

Source: https://vuejs.org/v2/guide/reactivity.html

Also added padding to the icons in the attachment section.

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-06-17 14:21:31 +05:30
Abijeet
6c4c1ccb58 Changed the way we were displaying the edit icon. 
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-06-10 17:06:23 +05:30
Abijeet
134a96fa32 Adds edit icon to each header in the page. 
Towards #618

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-06-03 13:47:07 +05:30
Dan Brown
86f43c8a65
Fixed incorrect tag from removing ng tags 2018-05-28 11:06:11 +01:00
Dan Brown
d886c6a32e
Removed old ng tags, Fixed header spacing 
Also prevent pointer error on custom home page
 2018-05-28 10:33:38 +01:00
Dan Brown
173eaf1c98
Made comments section more subtle 
Also removed spacing from within details above active restrictions
 2018-05-27 20:20:13 +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
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
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
6cdb943916
Started work on revisions in image manager 2018-05-19 18:44:40 +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
28823c4fae Changed the location of the "view-toggle" to be under the books views. 
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-05-12 18:26:35 +05:30
Abijeet
8254c3be8d Added the book view toggle option on the homepage. 
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-05-12 14:16:05 +05:30
Abijeet
86b2ddbd28 Implemented displaying of the books list on home page. 2018-05-10 09:05:18 +05:30
Abijeet
2e4863edb1 Added an option to set books as the default homepage. 
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-05-09 08:26:49 +05:30
Dan Brown
b0d027a4a9
Repaired other uses of entity-meta view 2018-04-30 15:12:10 +01:00
Dan Brown
624c568008
Revamped tag styling 2018-04-30 14:35:15 +01:00
Dan Brown
58a0a59d7e
Cleaned details sidebar box and merged with permissions 2018-04-30 13:53:04 +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
d34b91f2c9
Updated move card width and made sidebar order more consistent 2018-04-14 16:23:16 +01:00
Dan Brown
dfadaa28f6
Updated reset-password flow design 
Fixes #800
 2018-04-14 16:16:29 +01:00
Dan Brown
b612cf9e4c
Refactored out page-display system 2018-04-01 12:46:27 +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
7f437c2e3c
Fixed issue where cover images don't save on older books 
Ensured an existing ID is always provided to image-picker.js.
Fixes #773
 2018-03-31 11:21:22 +01:00
Dan Brown
cfdf5b93d9
Merge branch 'v0.20' to gain export fix 2018-03-30 15:45:34 +01:00
Dan Brown
3cd08382e9
Fixed export style paths 2018-03-30 15:31:39 +01:00
Dan Brown
582158f70e
Added tags to chapters and books 
Closes #121
 2018-03-30 14:09:51 +01:00
Dan Brown
4f788384f0
Updated icons with height 
Fixes issues within IE
 2018-03-25 15:52:48 +01:00
Dan Brown
f1586be516
Removed invalid bracket from view 2018-03-25 11:35:58 +01:00
Dan Brown
1a9f676416
Updated create routes to prevent slug clashes 
Fixes #758
 2018-03-25 11:34:42 +01:00
Dan Brown
df1a3a0715
Properly escaped search results 
Prevents vue-like syntax in results causing errors.
Related to #748
 2018-03-25 11:06:21 +01:00
Abijeet Patro
0335f58478
Merge branch 'master' into bug/image-upload 2018-03-18 23:44:33 +05:30
Abijeet
3a5c20c17e Removing the selected image and clearing the dropdzone on dialog close. 
Towards #741

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-03-18 23:38:37 +05:30
Dan Brown
ecdeb545e0
Cleaned some form styling 
Removed uppercasing of labels to make a little friendlier.
Extracted out toggleswitch JS into own component.
Improved basic code input for html-head-input area.
 2018-03-18 15:13:46 +00:00
Dan Brown
8b27ce3296
Fixed large content previews and improved mobile styles 
Listing content previews no longer pre-wrap and instead simply break
correctly.
Updated titles to ensure they break on mobile devices.
Reduced spacing and font sizes on mobile to better adjust content to
screen size.

Fixes #739
 2018-03-18 12:23:48 +00:00
Dan Brown
b42b07179f
Updated exports to use DejaVu font 
Provides potentially better language font coverage.
 2018-03-17 17:12:01 +00:00
Dan Brown
0a1546daea
Moved jQuery to use NPM and fixed some asset refs 2018-03-17 15:20:15 +00:00
Dan Brown
2ff2c0b257
Merge branch 'webpack-2018' 2018-03-17 13:05:25 +00:00
Dan Brown
ced4e58137
Finished off intitial conversion to webpack 2018-03-17 13:03:13 +00:00
Dan Brown
e52bfc0c24
Attempted move to webpack again 2018-03-11 16:16:30 +00:00
Artur Trzęsiok
98a3c815cf add missing polish translations for comments 2018-02-26 23:49:58 +01:00
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
2d43ab8a1b
Fixed text overflow in various views 
Fixes #669
 2018-02-11 14:28:26 +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
d84f75c257
Merge pull request #695 from Yoginth/patch-2 
Added Search Permission for not logged in Users
 2018-02-04 17:48:25 +00:00
Dan Brown
7c44f5462c
Prevent image manager search from reloading page 
Fixes #697
 2018-02-04 17:18:55 +00:00
Yoginth
ecf68b6365
Update all.blade.php 2018-02-03 20:15:36 +05:30
Dan Brown
98d4bf4486
Merge branch 'bug-650' of git://github.com/Abijeet/BookStack into Abijeet-bug-650 2018-01-28 14:15:31 +00:00
Dan Brown
9bbef3a3dd
Added drawio abilities to markdown editor 2018-01-20 20:40:21 +00:00
Dan Brown
56264551e7
Added drawing icon and made drawio disablable 2018-01-20 15:00:54 +00:00
Abijeet
f2c62765ca Adds overflow:auto to popup content to allow it to scroll in lower res. 
Fixes #650

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-01-06 01:41:06 +05:30
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
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
3ed5426315
Moved book cover image input into collapsible section 
Prevent extra friction when creating a new book and makes it easier to
skip if grid view is not in use
 2017-12-10 13:46:50 +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
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
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
10bass
46fc0e5026 Fix ajax tag suggestion for subdir installs 
tag suggest URLs were hardcoded to /ajax in blade template. Wrapped them in baseUrl()
 2017-10-16 18:24:47 -04:00
Dan Brown
79c3a07e9a
Fixed include syntax erroring within vue 
Fixes #553
 2017-10-15 18:20:13 +01:00
Dan Brown
61fad6a665
Finished migration of last angular code 2017-09-30 13:27:08 +01:00
Dan Brown
9ca22976c3
Migrated editor toolbox, No more directives! 2017-09-24 18:30:21 +01:00
Dan Brown
9e2934fe17
Migrated editor inputs to non-angular JS 2017-09-23 12:24:06 +01:00
Dan Brown
0c4ddf16a5
Moved details card above book nav 2017-09-20 21:32:19 +01:00
Dan Brown
09936566dd
Upgrade tinymce version 2017-09-20 20:26:34 +01:00
Dan Brown
874386ceab
Used trans_choice on profile view 
Closes #417
 2017-09-10 13:43:08 +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
e02fcbe983 Added Book cover image description in all languages. 2017-09-05 12:46:31 +05:30
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
756ee0b172
Merge branch 'master' of git://github.com/Abijeet/BookStack into Abijeet-master 2017-09-02 17:36:58 +01:00
Dan Brown
1c9ecc3edd
Reformatted sortable toolbox components 2017-09-02 15:06:52 +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
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
d8e1f52ddd
Made new sidebar layout responsive 2017-08-27 15:16:51 +01:00
Dan Brown
baea92b206
Migrated entity selector out of angular 2017-08-27 14:31:34 +01:00
Dan Brown
cfc05c1b22
Improved primary color control in settings 2017-08-27 12:59:56 +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
b60d2190ac
Updated error views for redesign 2017-08-26 14:53:23 +01:00
Dan Brown
2f8b8c580d
Resolved current failing tests 2017-08-26 14:41:46 +01:00
Dan Brown
5187d3fa78
Updated chapter views with new design 2017-08-26 14:36:48 +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
Abijeet
76ae5c7398 Removes some unused code. 2017-08-23 01:04:36 +05:30
Abijeet
1f6994b62c Added code for permissions, removed unnecessary code. 2017-08-20 21:26:44 +05:30
Abijeet
47d82a1ac2 Merge branch 'master' of https://github.com/BookStackApp/BookStack 
Conflicts:
	resources/assets/js/vues/vues.js
 2017-08-20 20:35:56 +05:30
Abijeet
ed375bfaf7 Refactored Angular code to instead use VueJS, left with permissions, testing and load testing. 2017-08-20 20:21:27 +05:30
Dan Brown
3da8c01c1f
Rolled out new design further 2017-08-20 13:57:25 +01:00
Dan Brown
295f520f21
Started design update 2017-08-19 18:32:24 +01:00
Dan Brown
28a9bd514f
Updated header design 2017-08-19 15:33:22 +01:00
Dan Brown
039ee5d06c
Aligned entity dash name and fixed chapter toggle on dash 2017-08-19 14:04:38 +01:00
Dan Brown
afc66b3c3d
Migrated attachment manager to vue 2017-08-19 13:55:56 +01:00
Dan Brown
d3e4a1a6f9
Converted tag autosuggestion to vue component 2017-08-13 13:25:30 +01:00
Dan Brown
b023699f1b
Converted tag manager to be fully vue based 2017-08-13 11:50:40 +01:00
Dan Brown
f338dbe3f8
Started vueifying tag system 2017-08-10 20:11:25 +01:00
Dan Brown
ab07f7df6c
Converted image manager into vue component 2017-08-09 21:33:00 +01:00
Dan Brown
2a069880cd
Converted jQuery bits into raw JS components 2017-08-06 21:08:03 +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
21247e10d0
Reverted travis changes and added html escaping 2017-07-27 16:28:23 +01:00
Dan Brown
c1fc06ae34
Merge branch 'master' of git://github.com/Cyber-Duck/BookStack into Cyber-Duck-master 2017-07-27 16:20:38 +01:00
Dan Brown
ec83f83017
Added breadcrumbs to pages in entity select 
Fixes #391
 2017-07-27 16:10:58 +01:00
Dan Brown
433cb9b3b2
Improved breadcrumb responsiveness 
Closes #426
 2017-07-22 15:20:36 +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
dd4d2f4696 Resolves book heading issues in grid view. 2017-07-15 16:15:45 +05:30
Clément Blanco
67bc7007aa Support new lines for book/chapter descriptions 
Avoid ignoring new lines when renderring the book/chapter descriptions on their respective detailed views.
 2017-07-14 16:05:46 +01:00
Abijeet
21a8df78ee Merge pull request #9 from OsmosysSoftware/feature-181 
Feature 181
 2017-07-13 15:50:43 +05:30
Nilesh Deepak
7f8351e044 Removed avatar class from form.blade.php 2017-07-13 15:20:53 +05:30
Nilesh Deepak
b0ba1a43a9 2. Added classed col-xs-6 col-sm-4 col-md-4 col-lg-3 in grid-item.blade.php 
5. Added <div class="row"> in index.blade.php
 2017-07-13 12:24:47 +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
Nilesh Deepak
7a724f9134 Updated modifications. 2017-07-12 13:44:37 +05:30
Abijeet
844976c85b Revert "Revert "Bookstack grid view."" 2017-07-12 11:40:50 +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
c5f11e4516 Fixed pagination on change of display type. 2017-07-06 10:05:11 +05:30
Nilesh Deepak
f51db4b9f6 Resolved responsiveness issues 2017-07-05 19:58:52 +05:30
Nilesh Deepak
5b736c3b36 Updated views to support different languages. 2017-07-05 16:12:29 +05:30
Nilesh Deepak
d089eaf754 Changes in User edit profile page. 2017-07-05 12:32:39 +05:30
Nilesh Deepak
947c58f227 Applied required changes in BookStack. 2017-07-05 12:09:01 +05:30
Nilesh Deepak
fdf139edb2 Changing column size for responsiveness 2017-07-04 15:04:57 +05:30
Dan Brown
4db2c274e2
Prevent empty-state actions visible without permission. 
Fixes #411
 2017-07-02 15:59:40 +01:00