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
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
d8e1f52ddd
Made new sidebar layout responsive
2017-08-27 15:16:51 +01:00
baea92b206
Migrated entity selector out of angular
2017-08-27 14:31:34 +01:00
cfc05c1b22
Improved primary color control in settings
2017-08-27 12:59:56 +01:00
4cb4c9e568
Updated remaining views to 2017 design update.
...
Also fixed issue with duplicate confirmation email.
2017-08-26 17:17:04 +01:00
36f524a354
Updated page view styles to align with 2017 update
2017-08-26 15:41:33 +01:00
b60d2190ac
Updated error views for redesign
2017-08-26 14:53:23 +01:00
2f8b8c580d
Resolved current failing tests
2017-08-26 14:41:46 +01:00
5187d3fa78
Updated chapter views with new design
2017-08-26 14:36:48 +01:00
8fcbe44d3e
Updated styles for auth and books views.
...
Also added sourcemaps to gulp sass build
2017-08-26 13:24:55 +01:00
7f902e41c7
Resolved conflicts
2017-08-24 12:21:43 +05:30
76ae5c7398
Removes some unused code.
2017-08-23 01:04:36 +05:30
1f6994b62c
Added code for permissions, removed unnecessary code.
2017-08-20 21:26:44 +05:30
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
ed375bfaf7
Refactored Angular code to instead use VueJS, left with permissions, testing and load testing.
2017-08-20 20:21:27 +05:30
3da8c01c1f
Rolled out new design further
2017-08-20 13:57:25 +01:00
295f520f21
Started design update
2017-08-19 18:32:24 +01:00
28a9bd514f
Updated header design
2017-08-19 15:33:22 +01:00
039ee5d06c
Aligned entity dash name and fixed chapter toggle on dash
2017-08-19 14:04:38 +01:00
afc66b3c3d
Migrated attachment manager to vue
2017-08-19 13:55:56 +01:00
d3e4a1a6f9
Converted tag autosuggestion to vue component
2017-08-13 13:25:30 +01:00
b023699f1b
Converted tag manager to be fully vue based
2017-08-13 11:50:40 +01:00
f338dbe3f8
Started vueifying tag system
2017-08-10 20:11:25 +01:00
ab07f7df6c
Converted image manager into vue component
2017-08-09 21:33:00 +01:00
2a069880cd
Converted jQuery bits into raw JS components
2017-08-06 21:08:03 +01:00
e9831a7507
Merge branch 'master' of git://github.com/Abijeet/BookStack into Abijeet-master
2017-08-01 19:24:33 +01:00
21247e10d0
Reverted travis changes and added html escaping
2017-07-27 16:28:23 +01:00
c1fc06ae34
Merge branch 'master' of git://github.com/Cyber-Duck/BookStack into Cyber-Duck-master
2017-07-27 16:20:38 +01:00
ec83f83017
Added breadcrumbs to pages in entity select
...
Fixes #391
2017-07-27 16:10:58 +01:00
433cb9b3b2
Improved breadcrumb responsiveness
...
Closes #426
2017-07-22 15:20:36 +01:00
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
dd4d2f4696
Resolves book heading issues in grid view.
2017-07-15 16:15:45 +05:30
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
21a8df78ee
Merge pull request #9 from OsmosysSoftware/feature-181
...
Feature 181
2017-07-13 15:50:43 +05:30
7f8351e044
Removed avatar class from form.blade.php
2017-07-13 15:20:53 +05:30
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
f37509062e
Merge pull request #8 from OsmosysSoftware/feature-181
...
Issue 181
2017-07-12 18:41:35 +05:30
24ee78ccd8
Update.
2017-07-12 18:04:06 +05:30
7a724f9134
Updated modifications.
2017-07-12 13:44:37 +05:30
844976c85b
Revert "Revert "Bookstack grid view.""
2017-07-12 11:40:50 +05:30
d84315fff8
Indentation correction.
2017-07-07 17:06:08 +05:30
144a6e469d
Updated cover image upload and delete function.
2017-07-07 16:29:38 +05:30
c5f11e4516
Fixed pagination on change of display type.
2017-07-06 10:05:11 +05:30
f51db4b9f6
Resolved responsiveness issues
2017-07-05 19:58:52 +05:30
5b736c3b36
Updated views to support different languages.
2017-07-05 16:12:29 +05:30
d089eaf754
Changes in User edit profile page.
2017-07-05 12:32:39 +05:30
947c58f227
Applied required changes in BookStack.
2017-07-05 12:09:01 +05:30
fdf139edb2
Changing column size for responsiveness
2017-07-04 15:04:57 +05:30
4db2c274e2
Prevent empty-state actions visible without permission.
...
Fixes #411
2017-07-02 15:59:40 +01:00
de6d8a811c
Added quick lang-selection options to code editor
2017-07-01 15:50:28 +01:00
968e7b8b72
Finished off main functionality of custom tinymce code editor
2017-07-01 13:23:46 +01:00
af72f0d490
Bookstack grid view.
2017-06-29 18:54:04 +05:30
fd50efb503
#47 - Putting the comments right under the page.
2017-06-11 11:41:33 +05:30
e155c52256
#47 - Fixes a few issues with the code.
2017-06-10 22:55:36 +05:30
4efe3b41da
#47 - Added translations for other language files using Google translate.
2017-06-10 15:21:28 +05:30
e647ec22b1
#47 - Adds direct linking to comments.
2017-06-08 01:14:53 +05:30
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
5bd9da6054
#47 - Adds various translations in English, and a few code improvements.
2017-06-06 01:46:59 +05:30
7c6fe8c4e2
#47 - Changes the location of the reply and edit comment box.
2017-06-05 00:20:37 +05:30
689d1eb082
#47 - Adds a cancel button for edit and reply button.
2017-06-04 20:43:56 +05:30
06d75e1804
#47 - Updates the total comments when a comment is added.
2017-06-04 20:12:01 +05:30
9558f84b97
#47 - Adds functionality to delete a comment. Also reduces the number of watchers.
2017-06-04 18:52:44 +05:30
2fd421b115
#47 - Adds comment level permissions to the front-end.
2017-06-04 11:17:14 +05:30
0bda5554dd
Getting the latest changes
2017-06-04 10:20:01 +05:30
860d4d4be5
#47 - Changes the way we are handling fetching of data for the comment section.
2017-05-30 09:02:47 +05:30
e5fc6bf5fa
Moved from highlight.js to codemirror
2017-05-28 13:16:21 +01:00
9a97995f18
#47 Displays the time for comments and border bottom for sub comments.
2017-05-25 08:04:19 +05:30
0ff5aad9c0
#47 Hides the reply button based if comments are 2 levels deep.
2017-05-24 07:02:11 +05:30
03e5d61798
#47 Implements the reply and edit functionality for comments.
2017-05-16 00:40:14 +05:30
8b82753218
#47 - Gets rid of simplemde
2017-05-03 02:42:04 +05:30
3368fe42d8
Merge pull request #10 from BookStackApp/master
...
Latest changes
2017-05-03 01:41:08 +05:30
c3ea0d333e
#47 - Adds functionality to display child comments. Also has some code towards the reply functionality.
2017-04-27 02:35:29 +05:30
82e2c523e6
Fixed chapter breadcrumbs and testing issues
2017-04-22 14:08:12 +01:00
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
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
d447355a61
Adding the view templates and styles.
2017-04-19 01:24:33 +05:30
8e2437498f
Merge branch 'master' of https://github.com/Abijeet/BookStack
2017-04-19 01:23:27 +05:30
b3d4c199ae
Merge branch 'master' of https://github.com/Abijeet/BookStack
...
Conflicts:
.gitignore
2017-04-19 01:21:45 +05:30
dcde599709
Added chapter search
...
Migrated book search to vue-based system.
Updated old tag seached.
Made chapter page layout widths same as book page.
Closes #344
2017-04-15 19:16:07 +01:00
0e0945ef84
Finished off UI for search system
2017-04-15 15:04:30 +01:00
ad125327c0
Migrated to custom gulp setup and conintue search interface
2017-04-14 18:47:33 +01:00
46f3d78c8a
Fixed entity type filter bug in new search system
2017-04-09 21:12:13 +01:00
1338ae2fc3
Started search interface, Added in vue and moved fonts
2017-04-09 20:59:57 +01:00
01cb22af37
Added tag searches and advanced filters to new search
2017-03-27 18:05:34 +01:00
070d4aeb6c
Started implementation of new search system
2017-03-19 12:48:44 +00:00
668ce26269
Fixed back button behaviour on books edit
...
As reported in #339
2017-03-19 08:32:04 +00:00
4499ae84bb
Made fixes to es languge files and users page
...
Fixed PHP formatting error in ES lang file and added tests to cover.
Made user edit page more responsive on smaller devices.
Fixed 'cancel' button on profile screen when the user does not have
permission to manage users.
2017-03-05 15:34:54 +00:00
d4e790d3cf
Added lang tests and update export text keys
2017-03-05 15:10:06 +00:00
36173eb47d
Removed extension from translation script link
...
Also fixed bug causing EN translation backup to not be passed
to javascript translation system.
Closes #328
2017-03-05 14:10:55 +00:00
e3eefba745
Fixed export testing and updated travis settings
2017-02-26 21:39:15 +00:00
253132afdf
Added chapter export options
...
Closes #177
2017-02-26 14:25:02 +00:00
eded8abded
Added book export and created export tests to cover
...
In reference to #177
2017-02-26 13:26:51 +00:00
22077d4181
Updated DOMPDF to latest version
2017-02-25 14:59:56 +00:00
af3c0e43a5
Prevented custom HTML being inserted on settings page
...
Gives option for fixing if badly formatted HTML is inserted.
Closes #310
2017-02-25 12:41:32 +00:00
a6128a1df1
Merge bugfixes from branch 'v0.14'
2017-02-05 21:24:15 +00:00
6638ee47d3
Fixed entities wrongly visible on 404
...
Also ensured header state as expected on 404.
In reference to BookStackApp/website#9
2017-02-05 21:19:29 +00:00
86625a7642
Neatened up social login/register buttons
2017-02-05 15:28:53 +00:00
7c9937e924
Converted sort tests to non browserkit testing
...
Added testing to cover book sort endpoint.
Closes #283
2017-02-05 14:20:59 +00:00
410e967eb1
Merge branch 'master' of https://github.com/Abijeet/BookStack
2017-02-05 16:46:32 +05:30
076693efc9
Added facebook, slack & twitter sign in options.
...
Also added icon svg blade helper.
Closes #125 . Starts #213 .
Requires documentation.
2017-02-04 11:01:49 +00:00
148350009c
#47 Adds comment permission to each role.
2017-01-29 14:25:20 +05:30
33d4844f17
Fixed role 'manage own permissions' permission
2017-01-22 12:16:02 +00:00
56d58ad8e5
Updated pointer to be able to show includes
...
Also fixed pointer copying on flash-blocked browsers
2017-01-21 14:58:03 +00:00
e4e3b25c22
Started page transclusion system
2017-01-16 21:24:48 +00:00
dabf149411
Added user setting system and added user-lang option
...
Supports #115
2017-01-15 16:27:24 +00:00
969ad8911c
Updated page nav to hide when empty
2017-01-14 15:34:52 +00:00
af76580b98
Fixes typo causing the message not to be displayed
2017-01-03 22:18:13 +05:30
f2917fc462
Added tests to cover social login actions
...
Closes #244
2017-01-02 14:56:58 +00:00
7c8c4c2a05
Normalised page nav header inset when only small headers are used
2017-01-02 12:13:03 +00:00
3f0ef57d31
Added wkhtmltopdf support and done some style tweaks
...
Closes #248
2017-01-01 12:20:30 +00:00
a24f3d7d47
Merge branch 'master' into translations
2016-12-31 14:32:52 +00:00
c9700e38e2
Created solution for JS translations
...
Also tidied up existing components and JS
2016-12-31 14:27:40 +00:00
05316c90ba
converted image picker to blade-based component
...
Also updated some other JS translations
2016-12-24 15:21:19 +00:00
242dc21876
Converted toggle switch into a blade/jquery template
2016-12-22 19:41:32 +00:00
573357a08c
Extracted text from logic files
2016-12-04 16:51:39 +00:00
0775cd09a1
Extracted text for remaining views
2016-12-04 14:08:04 +00:00
96075dee7b
Extracted text from page views & standardised breadcrumbs
2016-12-03 18:35:40 +00:00
066adf3cea
Moved text for errors and form views.
...
Updated 404 page with additional links
2016-12-03 13:31:54 +00:00
286f9b0c7d
Moved page tags to sidebar
...
Fixed #238
2016-11-27 19:37:57 +00:00
57dc53ceff
Extracted text from book & chapter views
2016-11-17 13:33:07 +00:00
694a9459c1
Moved text from auth views into lang files
2016-11-13 16:34:28 +00:00
d3c7aada89
Fixed attachments on draft pages
2016-11-12 14:21:54 +00:00
e639600ba5
Renamed files to attachments
2016-11-12 14:12:26 +00:00
ac80723058
Merge fixes from branch 'v0.12'
2016-11-12 11:40:54 +00:00
c4eed37d8e
Added custom head content into public pages
...
Closes #211
2016-10-30 11:46:23 +00:00
8b43b91057
Improved password reset flow with notifications.
...
Also added links to sign-in/register.
Fixed links in emails sent out.
Fixes #210 and #218 .
2016-10-30 11:36:57 +00:00
91fe7f0bee
Fixed PDF export table width
...
Closes #203
Signed-off-by: Dan Brown <ssddanbrown@googlemail.com>
2016-10-30 10:41:18 +00:00
30458405ce
Page Attachments - Improved UI, Now initially complete
...
Closes #62
2016-10-23 17:55:48 +01:00
91220239e5
Added in attachment tests
2016-10-23 15:25:04 +01:00
867fc8be64
Added basic attachment editing functionality
2016-10-11 20:39:11 +01:00
89509b487a
Added attachment creation from link/name
2016-10-10 21:13:18 +01:00
ac0b29fb6d
Added view, deletion and permissions for files
2016-10-10 20:30:27 +01:00
673c74ddfc
Started work on attachments
...
Created base models and started user-facing controls.
2016-10-09 18:58:22 +01:00
3b7d223b0c
Updated and added tests for new default user system
...
Closes #138
2016-09-29 17:07:58 +01:00
b662670efc
Prevented guest users creating draft pages.
2016-09-29 15:56:57 +01:00
771626b6ec
Started work on making the public role/user configurable
...
Create a new 'public' guest user and made the public
role visible on role setting screens.
2016-09-29 12:43:46 +01:00
f15cc5bdfa
Separated revision preview and diff & fixed chosen diff html
...
Closes #8
2016-09-29 10:10:46 +01:00
fff5bbcee4
Merge branch 'diff' of git://github.com/younes0/BookStack into younes0-diff
2016-09-29 09:32:40 +01:00
da10c50945
Added app name header display setting + extracted setting text
...
Closes #194
2016-09-22 18:53:22 +01:00
1d681e53e4
Added page navigation and tweaked header styles
...
Changed header selection in editor to be more descriptive and
to provide a wider range of styles.
Closes #68
2016-09-18 14:49:36 +01:00
9dc9724e15
Laravel 5.3 upgrade ( #189 )
...
* Started move to laravel 5.3
* Started updating login & registration flows for laravel 5.3 update
* Updated app emails to notification system
* Fixed registations bugs and removed email confirmation model
* Fixed large portion of laravel post-upgrade issues
* Fixed and tested LDAP process
2016-09-17 18:22:04 +01:00
f06770d91d
Updated TinyMCE version from 4.3.7 to 4.4.3
2016-09-06 19:29:09 +01:00
0dbb8babee
Merge branch 'page_link_selector'
2016-09-03 10:40:27 +01:00
b14e9fc619
Fixed some cross browser flexbox popup issues
...
Set min height for poor IE & safari flexbox support.
Fixes #105 .
2016-09-03 10:32:14 +01:00
781f0e7887
Added draft save indicator and fixed notification positions
2016-09-02 19:26:12 +01:00
23e014cb25
Added link selector to markdown editor
2016-09-02 18:54:26 +01:00
5b64358ef1
Added link selector interface to WYSIWYG editor
2016-09-01 20:36:22 +01:00
56df64063d
Updated popup design and started integrating link selector
...
Extracted design and base styles from image manager into generic popup
classes that can be used by other app components such as the new
popup Book/Chapter/Page link selector
2016-08-30 20:05:59 +01:00
7973412c29
Improved sort efficiency by a factor of 10
...
Fixes #145
2016-08-26 20:20:58 +01:00
Bharadwaja G
Dan Brown
Abijeet
Nilesh Deepak
Clément Blanco
Abijeet