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
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
cc553cc93d
Added labels for 'Thumbnail toggle' and 'Cover image' in different languages.
2017-07-05 16:11:15 +05:30
Nilesh Deepak
e88a06291e
Updated toggle thumbnails function.
2017-07-05 16:09:20 +05:30
Nilesh Deepak
026de8c5ca
Thumbnail toggle function.
2017-07-05 12:48:41 +05:30
Nilesh Deepak
e10d4b91cf
styles.scss
2017-07-05 12:36:26 +05:30
Nilesh Deepak
d089eaf754
Changes in User edit profile page.
2017-07-05 12:32:39 +05:30
Nilesh Deepak
bb2d85965f
Removed duplicated styles.
2017-07-05 12:29:16 +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
fdf139edb2
Changing column size for responsiveness
2017-07-04 15:04:57 +05:30
Dan Brown
314d98abc3
Removed logs, Updated version, Fixed inconsistent subheader
2017-07-02 20:33:32 +01:00
Dan Brown
69c50b9b48
Migrated markdown editor actions to new cm editor
2017-07-02 19:35:13 +01:00
Dan Brown
c5b58d8fd2
Merge branch 'japanese-translation' of git://github.com/S64/BookStack into S64-japanese-translation
2017-07-02 16:09:12 +01:00
Dan Brown
4db2c274e2
Prevent empty-state actions visible without permission.
...
Fixes #411
2017-07-02 15:59:40 +01:00
Dan Brown
d5d83da766
Added diff and sh code types
...
Verified changes to ensure fixes #296 .
2017-07-01 16:10:52 +01:00
Dan Brown
de6d8a811c
Added quick lang-selection options to code editor
2017-07-01 15:50:28 +01:00
Dan Brown
a94844b6b7
Fixed code block selection and drag/drop issues
2017-07-01 15:38:11 +01:00
Dan Brown
968e7b8b72
Finished off main functionality of custom tinymce code editor
2017-07-01 13:23:46 +01:00
Shuma Yoshioka
b2b8706d05
Translate errors.php
2017-07-01 16:38:43 +09:00
Shuma Yoshioka
2d345fe454
Translate entities.php
2017-07-01 16:38:20 +09:00
Shuma Yoshioka
7bec70d429
Translate common.php
2017-07-01 16:37:07 +09:00
Shuma Yoshioka
60710e7fb4
Translate auth.php
2017-07-01 16:33:54 +09:00
Shuma Yoshioka
f10d3a8564
Translate validation.php
2017-07-01 16:32:36 +09:00
Shuma Yoshioka
b020520366
Translate passwords.php
2017-07-01 16:32:02 +09:00
Shuma Yoshioka
52010e5820
Translate pagination.php
2017-07-01 16:31:32 +09:00
Nilesh Deepak
af72f0d490
Bookstack grid view.
2017-06-29 18:54:04 +05:30
Shuma Yoshioka
75eca03b05
Translate settings.php
2017-06-24 20:49:24 +09:00
Shuma Yoshioka
b8ebefd803
Translate components.php
2017-06-24 20:48:34 +09:00
Shuma Yoshioka
168c66815e
add ja to settings
2017-06-24 20:46:38 +09:00
Shuma Yoshioka
26e703a1cd
translate activities.php
2017-06-19 00:02:09 +09:00
Dan Brown
c8be214ee0
Started tinymce code editor components
2017-06-17 15:07:55 +01:00
Dan Brown
2060cdb931
Added code highlighting syntax modes
2017-06-17 12:41:18 +01:00
Abijeet
fd50efb503
#47 - Putting the comments right under the page.
2017-06-11 11:41:33 +05:30
Abijeet
8dab31b87a
Merge branch 'master' of https://github.com/Abijeet/BookStack
2017-06-10 22:56:07 +05:30
Abijeet
e155c52256
#47 - Fixes a few issues with the code.
2017-06-10 22:55:36 +05:30
Abijeet Patro
c76e7c706c
adding a comment on top.
2017-06-10 19:47:45 +05:30
Abijeet
4efe3b41da
#47 - Added translations for other language files using Google translate.
2017-06-10 15:21:28 +05:30
Abijeet
218376a41c
#47 - Fetching values from language files.
2017-06-08 01:30:43 +05:30
Abijeet
e647ec22b1
#47 - Adds direct linking to comments.
2017-06-08 01:14:53 +05:30
Abijeet
38fe756725
#47 - Fixes a couple of issues found during testing - delete not updating the UI, delete none not working properly.
2017-06-07 23:45:29 +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
689d1eb082
#47 - Adds a cancel button for edit and reply button.
2017-06-04 20:43:56 +05:30
Abijeet
06d75e1804
#47 - Updates the total comments when a comment is added.
2017-06-04 20:12:01 +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
0bda5554dd
Getting the latest changes
2017-06-04 10:20:01 +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
Dan Brown
88f93f76dd
Updated the markdown editor to use codemirror as editor
...
Improved scroll sync system to be smarter
2017-05-28 16:02:46 +01:00
Dan Brown
e5fc6bf5fa
Moved from highlight.js to codemirror
2017-05-28 13:16:21 +01:00
Abijeet
9a97995f18
#47 Displays the time for comments and border bottom for sub comments.
2017-05-25 08:04:19 +05:30
Abijeet
0ff5aad9c0
#47 Hides the reply button based if comments are 2 levels deep.
2017-05-24 07:02:11 +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
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
Dan Brown
92108d710d
Re-enabled html in markdown editor
...
Fixes #378
2017-04-29 16:10:38 +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
82e2c523e6
Fixed chapter breadcrumbs and testing issues
2017-04-22 14:08:12 +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
Dan Brown
87e18b8068
Merge pull request #357 from diegoseso/master
...
Spanish translation completed
2017-04-19 06:40:00 +01:00
Diego Jose Sosa Diaz
607a2c91fc
Fixing encoding of files affecting accents.
2017-04-18 23:41:19 +02:00
Abijeet
d447355a61
Adding the view templates and styles.
2017-04-19 01:24:33 +05:30
Abijeet
8e2437498f
Merge branch 'master' of https://github.com/Abijeet/BookStack
2017-04-19 01:23:27 +05:30
