Commit Graph

876 Commits

Author SHA1 Message Date
Jason Cheng 007059273e Add translate.
Add translate.
2018-04-02 15:54:06 +08:00
Jason Cheng 106432ee4e Added Language zh_TW
Added Language zh_TW
2018-04-02 15:03:07 +08: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 736d7118b0
Refactored js file structure to be standard throughout app
Still work to be done but a good start in standardisation.
2018-04-01 13:21:11 +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
msaus 03ee3d21ba
Merge branch 'master' into update_japanese_translation 2018-03-28 11:58:14 +09:00
Soseki Masao 34499658d5 update japanese translation 2018-03-27 16:18:38 +09: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
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
Dan Brown 746684ec8c
Merge branch 'bug/image-upload' of git://github.com/Abijeet/BookStack into Abijeet-bug/image-upload 2018-03-24 14:39:57 +00:00
Dan Brown 2ede273ef3
Merge pull request #753 from Alwaysin/master
Update french language
2018-03-24 14:36:12 +00:00
Dan Brown 6882bd3c62
Merge pull request #752 from Alwaysin/patch-1
Update entities.php for french language
2018-03-24 14:35:04 +00:00
Soseki Masao 696ef3ff33 fix entities.php 2018-03-23 18:20:44 +09:00
Soseki Masao 2d1567ea30 update japanese translation 2018-03-23 17:35:21 +09:00
Abijeet 2cfcbe0a3c Fixes an issue with handling of large image files.
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
2018-03-19 02:09:01 +05:30
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 380e2ff668
Updated outline button styles for svg icons 2018-03-18 15:35:04 +00:00
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
Alwaysin 35c7e00203
Update entities.php 2018-03-18 14:46:56 +01:00
Abijeet 83d830fd7d Fixes the icons not being aligned properly in attached items section for the page.
Also formatting.

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
2018-03-18 18:58:04 +05:30
Alwaysin accd936781
Update settings.php 2018-03-18 14:24:39 +01:00
Alwaysin 880987f15c
Update components.php 2018-03-18 14:23:42 +01:00
Alwaysin 018084a951
Update common.php 2018-03-18 14:23:08 +01:00
Alwaysin 098b594104
Update auth.php 2018-03-18 14:21:11 +01:00
Alwaysin bb7fab1dc0
Update activities.php 2018-03-18 14:20:20 +01:00
Abijeet d859be3a12 Fixes a number of issues with the image uploader. Read below,
- Added a remove link to remove files that have an error.
- Error will appear below the progress bar.
- Hovering on dz-image or dz-details will display the error message. Otherwise error message was covering the remove link as well.
- Removed styling around the file size.
- Removed gradient effect in accordance with BookStack styling.
- Dropzone filenae will not overflow the container element. Also done for page attachments
- Added a 'uploaded' error message. this error was being thrown when the file size exceeded the server configured file size. (https://stackoverflow.com/a/42934387/903324)

Towards #741

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
2018-03-18 18:44:11 +05:30
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 8828adfc9c
Fixed up notification styling a little 2018-03-18 11:58:45 +00:00
Dan Brown d44e0b7964
Prevented markdown editor pushing out toolbar 2018-03-18 11:46:08 +00:00
Dan Brown 0372efa89a
Merge branch 'patch-1' of git://github.com/BackwardSpy/BookStack into BackwardSpy-patch-1 2018-03-18 11:40:38 +00:00
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 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 b64940be82
Merge branch 'master' of github.com:BookStackApp/BookStack 2018-03-17 13:05:37 +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
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
Matteo Piccina 85605ab570 Update Italian translation 2018-03-12 16:43:19 +01:00
Dan Brown e52bfc0c24
Attempted move to webpack again 2018-03-11 16:16:30 +00:00
Dan Brown a4072365e3
Merge pull request #718 from artur-trzesiok/master
add missing polish translations for comments
2018-03-05 20:26:26 +00:00
Artur Trzęsiok 98a3c815cf add missing polish translations for comments 2018-02-26 23:49:58 +01:00
Chris Latham 1c8a8acb3d
fix markdown editor resizing with long strings 2018-02-26 11:31:11 +00:00
Leonardo Martinez fb48b025f3 Updated 'Spanish Argentina' translation. 2018-02-21 13:20:12 -03:00
Leonardo Martinez 395d02ef81 Updated 'Spanish Argentina' translation. 2018-02-19 10:15:24 -03: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 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 2d41a4f064
Updated twitch SVG icon with vector SVG 2018-02-11 12:01:07 +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 2533db260d
Merge branch 'master' of github.com:BookStackApp/BookStack 2018-02-04 18:14:41 +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 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 1d49b65c2e
Fixed code block wrapping on export
Now wraps instead of running off the page.

Fixed #676
2018-02-04 17:35:01 +00:00
Dan Brown 7c44f5462c
Prevent image manager search from reloading page
Fixes #697
2018-02-04 17:18:55 +00:00
Yue Zhihan d65cd53c99 Added simplified Chinese(zh-CN) language 2018-02-04 21:42:19 +08:00
Yoginth ecf68b6365
Update all.blade.php 2018-02-03 20:15:36 +05:30
Jozef Balún 194bb0f042 add missing icon, fix name conventions 2018-02-01 18:26:19 +01:00
BlackSheep addfb96002 reduced icon size 2018-02-01 09:55:37 +01:00
BlackSheep 5e2bf7c3e4 Add twitch socialite auth provider 2018-01-29 09:28:56 +01:00
Dan Brown 1d5440493c
Set markdown editor preview width to 100%
Fixes #658
2018-01-28 18:14:02 +00:00
Dan Brown bd711d69e4
Adapted code insert area and language select for mobile 2018-01-28 14:19:54 +00:00
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 4eb5205070
Merge pull request #679 from marcusforsberg/master
Added Swedish translation
2018-01-28 13:40:01 +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
marcusforsberg 682bc9f896 Added Swedish translation 2018-01-26 20:16:35 +01:00
Dan Brown 9bbef3a3dd
Added drawio abilities to markdown editor 2018-01-20 20:40:21 +00:00
Dan Brown 1411ee86b3
Extracted draw.io functionality to own file 2018-01-20 16:32:13 +00:00
Dan Brown 56264551e7
Added drawing icon and made drawio disablable 2018-01-20 15:00:54 +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
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 920964a561
Enabled system-storage of drawings made via draw.io 2017-12-30 15:26:39 +00:00
Dan Brown 7bb336d1a8
Merge pull request #644 from Abijeet/bug-643
Adds font-size to ol to ensure that they are uniform.
2017-12-30 12:41:13 +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
Abijeet 937d2cd55c Adds font-size to ol to ensure that they are uniform.
Fixes #643

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
2017-12-28 22:32:24 +05:30
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 0dc1f0b07f
Started draw.io integration 2017-12-24 14:28:35 +00:00
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 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 ac7e3977de
Fixed WYSIWYG fullscreen mode on firefox
Prevented overlapping sidebar and collapsed content.
Fixes #605
2017-12-09 12:38:30 +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 06cf175b08
Prevented page navigation highlighting erroring
This was when no page nav was on the page
2017-12-07 19:27:54 +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 91444e83fd
Cleaned up some page-show JS 2017-12-07 19:10:31 +00:00
Dan Brown 6063ac4a11
Merge branch 'master' of git://github.com/Abijeet/BookStack 2017-12-07 18:47:07 +00:00
Dan Brown 02fd1c48ed
Added meta+enter shortcut for page save
Closes #604
2017-12-07 18:44:20 +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 b167ae795e
Added script to check translation files
Closes #373
2017-12-04 20:25:04 +00:00
Timo Bartholomes 009af9736e Add socialite authentication for okta 2017-11-26 16:41:29 +01:00
Abijeet 7a5bd23909 Added language translation for the new settings icons. 2017-11-16 00:22:22 +05:30
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
Abijeet 2261308415 Removed invalid comments, and formatted the code. 2017-11-15 00:04:35 +05:30
Abijeet 7b5edb4d62 Merge branch 'master' of https://github.com/Abijeet/BookStack 2017-11-15 00:01:48 +05:30
Abijeet 8378f06889 Highlights all headings currently visible. Also fixes extra scrollbar appearing in Firefox. 2017-11-14 23:54:25 +05:30
Abijeet Patro 10dc851697
Merge pull request #1 from BookStackApp/master
Getting the latest changes.
2017-11-13 23:22:45 +05:30
Dan Brown 08e58bab79
Fixed vue component error 2017-11-11 17:10:15 +00:00
Dan Brown d29b177c84
Merge pull request #563 from 10bass/master
Fix ajax tag suggestion for subdir installs
2017-11-11 17:03:36 +00:00
Abijeet bdba25b6f2 Refactored all functionality into one function. Changed margin-top. 2017-11-05 20:23:16 +05:30
Abijeet 1031c61d0c Fixes #466. Adds support for header highlighting using intersection observer. 2017-11-02 01:14:06 +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
Guilherme Bernal 332f678ed0 Update pt_BR translations 2017-10-15 16:15:53 -03:00
Dan Brown db51cee2d8
Prevented custom homepage being deleted
Fixes #546
2017-10-15 19:14:46 +01:00
Dan Brown 3bf7cac030
Prevented flexbox contains overflowing page
Fixes #552
2017-10-15 18:34:37 +01:00
Dan Brown 79c3a07e9a
Fixed include syntax erroring within vue
Fixes #553
2017-10-15 18:20:13 +01:00
Dan Brown b711bc6816
Prevented 'Discard draft' option showing after saving a draft page 2017-10-01 18:11:24 +01:00
Dan Brown 247e6dba85
Fixed some design issues around cards
Reverted drop shadow change.
Fixed header line-height when linked.
Fixed overflowing paragraph text. Fixes #533.
2017-10-01 17:59:51 +01:00
Dan Brown 6b1980c4f3
Merge branch 'master' of github.com:BookStackApp/BookStack 2017-10-01 13:19:41 +01:00
Dan Brown 9ba29770e1
Added azureAD social auth option
Closes #509
2017-10-01 13:19:17 +01:00
Dan Brown 3d375fae55 Merge pull request #529 from cipi1965/master
Updated italian translation
2017-10-01 11:44:45 +01:00
Dan Brown c99a50de2c Merge pull request #528 from turbotankist/master
russian lang fixes
2017-10-01 11:43:31 +01:00
Dan Brown 1a32b25b5e Merge pull request #523 from sanderdw/master
Update dutch translations
2017-10-01 11:33:22 +01:00
Dan Brown 87339e4cd0
Added missing codemirror theme class
Fixes #535
2017-09-30 13:48:38 +01:00
Dan Brown 61fad6a665
Finished migration of last angular code 2017-09-30 13:27:08 +01:00
Matteo Piccina fa4bee2d98 Updated italian translation 2017-09-27 10:44:08 +02:00
alexey ce63260fa6 russian lang fixes 2017-09-27 11:17:56 +03:00
Dan Brown a3557d5bb2
Tweaked shadows on cards 2017-09-24 18:47:34 +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
sanderdw 2259263214 Update entities.php 2017-09-23 00:52:08 +02:00
sanderdw 762cf5f183 Update components.php 2017-09-23 00:47:02 +02:00
sanderdw 07175f2b3e Update dutch translations 2017-09-23 00:28:25 +02:00
Dan Brown 0c4ddf16a5
Moved details card above book nav 2017-09-20 21:32:19 +01:00
Dan Brown df0a982433
Merge branch 'master' of github.com:BookStackApp/BookStack 2017-09-20 20:27:50 +01:00
Dan Brown 212f924ffa
Refactored WYSIWYG editor image upload code
Added sketchy timeout to fix images being pasted at end of page.
Fixes #489
2017-09-20 20:27:00 +01:00
Dan Brown 09936566dd
Upgrade tinymce version 2017-09-20 20:26:34 +01:00
Leonardo Martinez 941bb73a68 Added missing colon 2017-09-19 14:25:44 -03:00
Leonardo Martinez 8e652f5d8f Added 'Spanish Argentina' translation. 2017-09-19 13:43:17 -03:00
Leonardo Martinez eec1b21928 Added 'Spanish Argentina' translation. 2017-09-19 13:42:39 -03:00
Dan Brown 1baeb7bec9 Merge pull request #510 from sanderdw/patch-1
Update entities.php
2017-09-17 11:09:12 +01:00
sanderdw 244c5a3ebb Update entities.php 2017-09-14 21:43:47 +02:00
alexey ab7f5def04 Russian lang added 2017-09-12 16:42:04 +03:00
Dan Brown cd7e727f8c
Modified IT comment translations as per recent changes 2017-09-10 16:43:05 +01:00
Dan Brown 2329a5cedf
Merge branch 'master' of github.com:BookStackApp/BookStack 2017-09-10 16:36:47 +01:00
Dan Brown d1a4ff9308 Merge pull request #501 from cipi1965/master
Added Italian language
2017-09-10 16:29:44 +01:00
Dan Brown 9a3bc27ef4
Fixed bullet styles and added code highlight on comments 2017-09-10 16:14:04 +01:00
Matteo Piccina f8315fb9c4 Added Italian language 2017-09-10 16:55:23 +02:00
Timo Schwarzer 8acc188e16
Update german translation 2017-09-10 15:01:25 +02:00
Dan Brown 874386ceab
Used trans_choice on profile view
Closes #417
2017-09-10 13:43:08 +01:00
Dan Brown 9dfbea8bf9
Restored seeder and fixed scroll on firefox 2017-09-10 13:29:48 +01:00
Dan Brown c1627a1468
Fixed sidebar scroll on mobile 2017-09-10 13:19:47 +01:00
Dan Brown 576a59a693
Fixed line-height difference in tinymce 2017-09-10 13:08:12 +01:00
Dan Brown fec6c65b78
Fixed quick save shortcut in wysiwyg editor
Fixes #467
2017-09-10 13:01:48 +01:00
Dan Brown f8c046d182
Fixed markdown callout tags and cursor pos
Closes #470
2017-09-09 19:41:11 +01:00
Dan Brown 621142a46e
Removed outdated translations and updated tests 2017-09-09 18:41:59 +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 1c88d21abf Fixed books cover image ratio. 2017-09-04 20:50:24 +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 70ee28ee13
Fixed long attachment names breaking outer boxes
Closes #460
2017-09-02 15:21:05 +01:00
Dan Brown 1c9ecc3edd
Reformatted sortable toolbox components 2017-09-02 15:06:52 +01:00
Dan Brown 9bd5d6a422 Merge pull request #483 from msaus/japanese_lang_update
Japanese lang update
2017-09-02 14:39:14 +01:00
Dan Brown 1e41ccbc7a
Added ability to override codemirror theme
Also cleaned codemirror file while there.
In referece to #455
2017-09-02 13:34:37 +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
soseki 3966fb1df6 update Japanese language for code editor 2017-08-24 15:30:07 +09:00
soseki 830614fb19 add Japanese language for code editor 2017-08-24 15:24:43 +09:00
Abijeet 76ae5c7398 Removes some unused code. 2017-08-23 01:04:36 +05:30
Abijeet 6920d6eef1 Fixes the comment check for linked comment. 2017-08-22 01:39:09 +05:30
Abijeet b5cd3bff3c Added functionality to highlight a comment. 2017-08-22 01:31:11 +05:30
Abijeet ac07cb41b6 Fixed formatting and added error messages. 2017-08-21 02:21:31 +05:30
Abijeet e8fa58f201 Removed code from the directives. 2017-08-21 00:38:59 +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 703d579561 Refactored Angular code to instead use VueJS, left with permissions, testing and load testing. 2017-08-20 20:21:32 +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 fba7ae923d
Darkened a few cm code styles for improved legibility 2017-08-19 15:51:51 +01:00
Dan Brown 28a9bd514f
Updated header design 2017-08-19 15:33:22 +01:00
Dan Brown 666c86b108
Removed included fonts, Set to use system fonts.
All font definitions moved into _text.scss.
Needs override documentation to complete.
Relates to #423.
2017-08-19 14:33:55 +01:00
Dan Brown 194293664f
Removed v-show delayed content display 2017-08-19 14:09:03 +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
Timo Schwarzer 0d6a6b5b63 Update/fix german translation 2017-08-16 22:31:07 +02: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 a59d73de7b
Fixed bug causing image manager popup not to show 2017-08-07 19:32:31 +01:00
Dan Brown 1ac7618bb1
Updated clipboard lib reference and version used 2017-08-06 21:21:20 +01:00
Dan Brown 2a069880cd
Converted jQuery bits into raw JS components 2017-08-06 21:08:03 +01:00
Dan Brown 5e5928a8a6
Added vanilla JS component system 2017-08-06 18:01:49 +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 fea139d8e7
Merge branch 'master' of github.com:BookStackApp/BookStack 2017-07-27 19:09:44 +01:00
Dan Brown ac7a8a8e1e
Expanded the available editor shortcuts in both editors
Adds formatting on ctrl+nums for everything on formats dropdown.
Closes #85.
2017-07-27 19:07:58 +01:00
Dan Brown bbaa2f4cda Merge pull request #435 from JachuPL/polish-localization
Polish translation
2017-07-27 16:48:19 +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 a0eb3d1079 Merge pull request #446 from Joorem/french-spelling
French spelling
2017-07-27 16:18:57 +01:00
Dan Brown 164aea3a3a Merge pull request #448 from 10bass/subdir-search-fix
Update search.js
2017-07-27 16:17:57 +01:00
Dan Brown ec83f83017
Added breadcrumbs to pages in entity select
Fixes #391
2017-07-27 16:10:58 +01:00
Dan Brown 5cd08ab2f5
Fixed custom plugin when developing 2017-07-27 15:43:17 +01:00
10bass b4dcde252b Update search.js
Trying to apply an exact match or tag would previously redirect to /search, regardless of the installation path.
2017-07-24 20:06:15 -04:00
Jérôme Le Gal 0b2c3c1aa7 settings.php: add missing french translation 2017-07-22 23:45:09 +02:00
Jérôme Le Gal 0dc9d0bed7 errors.php: add missing french translation 2017-07-22 23:45:09 +02:00
Jérôme Le Gal a2a2e37797 settings.php: fix some spelling issues in french translation 2017-07-22 23:45:09 +02:00
Jérôme Le Gal 3d9819f97c passwords.php: fix some spelling issues in french translation 2017-07-22 23:45:09 +02:00
Jérôme Le Gal b2b4a24d7c errors.php: fix some spelling issues in french translation 2017-07-22 23:45:08 +02:00
Jérôme Le Gal 7557d6d619 entities.php: fix some spelling issues in french translation 2017-07-22 23:45:08 +02:00
Jérôme Le Gal 57eeb9b0a3 common.php: fix some spelling issues in french translation 2017-07-22 23:45:08 +02:00
Jérôme Le Gal 813c7d5902 auth.php: fix some spelling issues in french translation 2017-07-22 23:45:08 +02:00
Dan Brown 433cb9b3b2
Improved breadcrumb responsiveness
Closes #426
2017-07-22 15:20:36 +01:00
Dan Brown 7f43372dd4
Fixed broken code block rendering when using DOMPDF
Fixes #427
2017-07-22 14:34: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
Dan Brown bc067e9ad4
Updated dropdowns to hide after option click
Fixes #429
2017-07-22 14:03:06 +01:00
Nilesh Deepak 922964ecf2 Changes grid container size 2017-07-15 17:50:09 +05:30
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
JachuPL 9e0c931573 Polish translation 2017-07-13 16:00:42 +02: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 afc1ecafe9 4. Changed the border color of the gallery item to #ccc 2017-07-13 12:27:14 +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
Nilesh Deepak e919cab3d1 1. Thumbnail size when creating or editing book. 2017-07-13 12:22:43 +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 d37b398e79 Updates styles. 2017-07-12 13:52:21 +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
Dan Brown e7f8188ee5
Prevented textarea styles interfering with codemirror
Closes #424
2017-07-10 19:29:35 +01:00