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
Dan Brown
8ed9f75d57
Fixed model extending mis-use
2017-04-16 10:54:23 +01:00
Dan Brown
a15b179676
Updated testcases for new search system.
...
Finishes implementation of new search system.
Closes #271
Closes #344
Fixes #285
Fixes #269
Closes #64
2017-04-16 10:47:44 +01:00
Dan Brown
73844b9eeb
Enabled type search filter in book search
2017-04-15 19:31:11 +01:00
Dan Brown
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
Dan Brown
0e0945ef84
Finished off UI for search system
2017-04-15 15:04:30 +01:00
Dane Everitt
dfaf20dd83
Actually include the Queueable namespace...
2017-04-13 20:09:38 -04:00
Dane Everitt
786262db3b
Queue confirmation emails.
...
Implements Laravel's queue abilities into the email notification job. Should not affect existing installations that are not using queues as the environment file defaults to `sync`.
2017-04-13 20:03:03 -04:00
Dan Brown
46f3d78c8a
Fixed entity type filter bug in new search system
2017-04-09 21:12:13 +01:00
Dan Brown
1338ae2fc3
Started search interface, Added in vue and moved fonts
2017-04-09 20:59:57 +01:00
Dan Brown
37813a223a
Improved DB prefix support and removed old search method
2017-04-09 14:44:56 +01:00
Dan Brown
01cb22af37
Added tag searches and advanced filters to new search
2017-03-27 18:05:34 +01:00
Dan Brown
331305333d
Added search term parsing and exact term matches
2017-03-27 11:57:33 +01:00
Dan Brown
0651eae7ec
Improve efficiency of single entity search indexing
2017-03-26 19:34:53 +01:00
Dan Brown
1552417598
Developed basic search queries.
...
Updated search & permission regen commands with ability to specify
database.
2017-03-26 19:24:57 +01:00
Dan Brown
cc0ce7c630
Fixed bug preventing page revision restore
...
Added regression tests to cover.
Fixes #341
2017-03-23 22:19:14 +00:00
Dan Brown
070d4aeb6c
Started implementation of new search system
2017-03-19 12:48:44 +00:00
Dan Brown
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
Dan Brown
a90f564980
Made LDAP email attribute configurable via .env
...
Closes #306
2017-02-26 14:51:49 +00:00
Dan Brown
253132afdf
Added chapter export options
...
Closes #177
2017-02-26 14:25:02 +00:00
Dan Brown
eded8abded
Added book export and created export tests to cover
...
In reference to #177
2017-02-26 13:26:51 +00:00
Dan Brown
0abed1afe5
Added clear activity/revision commands. Cleaned commands.
...
Added testing to cover each command.
Removed example laravel inspire command.
Standardised command names to be behind 'bookstack' naming.
In reference to #320 .
2017-02-26 09:16:24 +00:00
Dan Brown
22077d4181
Updated DOMPDF to latest version
2017-02-25 14:59:56 +00:00
Dan Brown
387047f262
Fixed inaccessible revisions, added regression tests
...
Fixes #309
2017-02-25 12:29:01 +00:00
Dan Brown
a6128a1df1
Merge bugfixes from branch 'v0.14'
2017-02-05 21:24:15 +00:00
Dan Brown
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
Dan Brown
65899a3e91
Prevented settings being overfetched from db/cache
2017-02-05 18:57:57 +00:00
Dan Brown
86625a7642
Neatened up social login/register buttons
2017-02-05 15:28:53 +00:00
Abijeet
410e967eb1
Merge branch 'master' of https://github.com/Abijeet/BookStack
2017-02-05 16:46:32 +05:30
Dan Brown
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
Dan Brown
2431ce9f86
Merge branch 'v0.14'
2017-02-01 22:28:38 +00:00
Dan Brown
9eecaea31a
Attempt to fix bookchildren and user getThumb
...
Hopefully Fixes #292 and #294 and #287
2017-02-01 22:16:32 +00:00
Abijeet
148350009c
#47 Adds comment permission to each role.
2017-01-29 14:25:20 +05:30
Abijeet
70991fc1e5
Merge branch 'master' of https://github.com/Abijeet/BookStack
2017-01-29 09:35:46 +05:30
Dan Brown
6669998c10
Upgraded to Laravel 5.4
2017-01-25 19:35:40 +00:00
Dan Brown
492e2f173e
Fixed error causing permissions to be deleted on book sort
...
Closes #282
2017-01-23 22:27:11 +00:00
Dan Brown
380f0f2042
Prevented a missing avatar from crashing the application
2017-01-22 12:19:50 +00:00
Dan Brown
33d4844f17
Fixed role 'manage own permissions' permission
2017-01-22 12:16:02 +00:00
Dan Brown
989de47f22
Fixed hidden book children for admins on upgrade
2017-01-22 12:02:30 +00:00
Dan Brown
2d4034f3b7
Added transclusion tests and fixed other tests
2017-01-21 16:16:27 +00:00
Dan Brown
a4f6bc63f0
Updated page include logic to use blade-style tags
...
It will also snippets of a page if and id is provided in a tag
2017-01-21 13:53:00 +00:00
Dan Brown
e4e3b25c22
Started page transclusion system
2017-01-16 21:24:48 +00:00
Dan Brown
dabf149411
Added user setting system and added user-lang option
...
Supports #115
2017-01-15 16:27:24 +00:00
Dan Brown
ee5ded6e1e
Updated permission bookChildrenQuery to use QueryBuilder
2017-01-15 15:00:29 +00:00
Dan Brown
598b07b53d
Updated LDAP to allow protocol to be specified
...
As per details by fredericmohr in #236
2017-01-14 17:55:09 +00:00
Dan Brown
e211f31370
Merge branch 'patch-2' of git://github.com/fredericmohr/BookStack into fredericmohr-patch-2
2017-01-14 17:30:49 +00:00
Dan Brown
969ad8911c
Updated page nav to hide when empty
2017-01-14 15:34:52 +00:00
Abijeet
397db04428
Added comments controller, model, repo, and the database schema. Modified existing Page model to associate with comments.
2017-01-13 21:45:48 +05:30
Dan Brown
581c382f65
Fixed image delete permission issue
...
Also fixed missing translations and wrote tests to cover issue.
Fixes #258
2017-01-08 19:19:30 +00:00
Dan Brown
212cd710aa
Fixed default empty app settings effecting blank app color
...
Fixes #265
2017-01-08 18:42:46 +00:00
Dan Brown
f2917fc462
Added tests to cover social login actions
...
Closes #244
2017-01-02 14:56:58 +00:00
Dan Brown
7c8c4c2a05
Normalised page nav header inset when only small headers are used
2017-01-02 12:13:03 +00:00
Dan Brown
8453191dfb
Finished refactor of entity repos
...
Removed entity-specific repos and standardised
the majority of repo calls to be applicable to
all entity types
2017-01-02 11:07:27 +00:00
Dan Brown
65796cfc7b
Rewrote book children query
2017-01-01 21:21:11 +00:00
Dan Brown
bab27462ab
Fixed issue where default user was over-fetched
2017-01-01 17:33:06 +00:00
Dan Brown
241278226f
Refactored search and slug repo components
2017-01-01 16:57:47 +00:00
Dan Brown
7f9de2c8ab
Started refactor to merge entity repos
2017-01-01 16:05:44 +00:00
Dan Brown
3f0ef57d31
Added wkhtmltopdf support and done some style tweaks
...
Closes #248
2017-01-01 12:20:30 +00:00
Dan Brown
0eb90cb3b6
Fixed carbon locale setting
2016-12-31 14:38:04 +00:00
Dan Brown
9fe158b78a
Merge pull request #255 from olexus/master
...
Add Carbon localization support
2016-12-31 14:36:01 +00:00
Dan Brown
a24f3d7d47
Merge branch 'master' into translations
2016-12-31 14:32:52 +00:00
Dan Brown
c9700e38e2
Created solution for JS translations
...
Also tidied up existing components and JS
2016-12-31 14:27:40 +00:00
Dan Brown
05316c90ba
converted image picker to blade-based component
...
Also updated some other JS translations
2016-12-24 15:21:19 +00:00
olexus
f30f4579e9
Add Carbon localization support
2016-12-19 11:05:06 +03:00
Dan Brown
573357a08c
Extracted text from logic files
2016-12-04 16:51:39 +00:00
Dan Brown
c403d05755
Fixed social login routes
...
Fixes #239
2016-11-27 19:11:15 +00:00
Frederic Mohr
340d3f833b
Update Ldap.php
...
This is a very crude workaround, a better solution is explained in the comments I added.
2016-11-15 11:10:12 +01:00
Dan Brown
694a9459c1
Moved text from auth views into lang files
2016-11-13 16:34:28 +00:00
Dan Brown
0fb1fc87c8
Enabled utf8 slugs
...
Prevents slug change when using only non-ascii chars
Allows use of more localised urls.
Closes #233
2016-11-12 17:16:52 +00:00
Dan Brown
d3c7aada89
Fixed attachments on draft pages
2016-11-12 14:21:54 +00:00
Dan Brown
e639600ba5
Renamed files to attachments
2016-11-12 14:12:26 +00:00
Dan Brown
600055bc73
Fixed tag searches and added tag search regression test
...
Fixes #222
2016-11-12 13:21:16 +00:00
Dan Brown
672b15d36c
Fixed attachment base-url usage and non-existant images
...
Images now self-delete if the original file does not exist.
Prevents simply getting non-fixable errors.
Also cleaned some JS.
2016-11-12 12:41:34 +00:00
Dan Brown
ac80723058
Merge fixes from branch 'v0.12'
2016-11-12 11:40:54 +00:00
Dan Brown
ab468bac3c
Updated build and versioning system
...
Added versioning file instead of using git tags
(Step towards removing git as a dependancy in the future)
Updated gulpfile to fit with verisioning system and cleaned
up node dependancies.
Fixes #108
2016-10-30 17:44:00 +00:00
Dan Brown
b251671e3f
Amended search to not break on non-alpha-num chars
...
And also fixed exact term matches that contain non-alpha-num chars
Fixes #212
2016-10-30 12:08:22 +00:00
Dan Brown
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
Dan Brown
30458405ce
Page Attachments - Improved UI, Now initially complete
...
Closes #62
2016-10-23 17:55:48 +01:00
Dan Brown
91220239e5
Added in attachment tests
2016-10-23 15:25:04 +01:00
Dan Brown
7ee695d74a
File upload deletion complete & added extension handling
...
Also fixed issue with file editing on JS side
2016-10-23 13:36:45 +01:00
Dan Brown
867fc8be64
Added basic attachment editing functionality
2016-10-11 20:39:11 +01:00
Dan Brown
89509b487a
Added attachment creation from link/name
2016-10-10 21:13:18 +01:00
Dan Brown
ac0b29fb6d
Added view, deletion and permissions for files
2016-10-10 20:30:27 +01:00
Dan Brown
673c74ddfc
Started work on attachments
...
Created base models and started user-facing controls.
2016-10-09 18:58:22 +01:00
Dan Brown
3b7d223b0c
Updated and added tests for new default user system
...
Closes #138
2016-09-29 17:07:58 +01:00
Dan Brown
b662670efc
Prevented guest users creating draft pages.
2016-09-29 15:56:57 +01:00
Dan Brown
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
Dan Brown
f15cc5bdfa
Separated revision preview and diff & fixed chosen diff html
...
Closes #8
2016-09-29 10:10:46 +01:00
Dan Brown
fff5bbcee4
Merge branch 'diff' of git://github.com/younes0/BookStack into younes0-diff
2016-09-29 09:32:40 +01:00
Dan Brown
42d8e9e5bd
Improved numeric term search capabilities
...
Prevented a quoted term also being added to fuzzy searches
and also added check to see if the term is numeric to check if
an exact match is required.
Closes #200
2016-09-29 09:13:15 +01:00
Dan Brown
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
Dan Brown
e0235fda8b
Made registration gravatar/email requests fail gracefully
...
* Extracted any email confirmation text into langs.
* Added new notification on confirmation email send fail.
Closes #187
2016-09-17 21:33:55 +01:00
Dan Brown
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
Dan Brown
bbd8fff021
Fixed bad image base-urls and forced tinyMCE to use absolute
...
Also ensured image file existance is checked during base64 conversion
during exports.
Closes #171 .
2016-09-03 19:24:58 +01:00
Dan Brown
ec17bd8608
Improved Exception handling, Removed npm requirement for testing
2016-09-03 12:08:58 +01:00
Dan Brown
3f81eba13b
Updated travis testing to work with new helper configuration ( #175 )
...
* Updated travis to call phpunit globally rather then booting application first
2016-08-27 11:27:23 +01:00
Dan Brown
7973412c29
Improved sort efficiency by a factor of 10
...
Fixes #145
2016-08-26 20:20:58 +01:00
Dan Brown
f83de5f834
Fixed single word quoted search terms
...
Fixes #170
2016-08-25 17:17:26 +01:00
