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,079 Commits 18 Branches 197 Tags 95 MiB
fa83e6bda4
Commit Graph

456 Commits

Author SHA1 Message Date
Dan Brown
3eb2246291
Merge branch 'feature-579' of git://github.com/Abijeet/BookStack into Abijeet-feature-579 2017-12-29 16:03:34 +00:00
Dan Brown
afe781bc39
Enabled session in 404 responses 
Fixes #634
 2017-12-28 13:19:02 +00:00
Abijeet
d5a2529775 Adds test cases and fixes an issue with the permission checking. 
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2017-12-26 15:46:20 +05:30
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
Abijeet
7da8804753 Adds code to allow deletion of users via cmd line. 
Fixes #579

Command:

php artisan bookstack:delete-users

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2017-12-26 02:22:41 +05:30
Dan Brown
03eb63ec77
Made it possible to pre-fill login via url 
Allows email to be passed to email field.
Also allows password only if in demo mode (Due to security concerns).
 2017-12-10 13:56:25 +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
d7edc389a6
Enabled custom HTML head content to work within editors 
Closes #562
 2017-12-08 11:52:43 +00:00
Dan Brown
56d5af1336
Made it possible to configure proxies via env 
In reference to #146
 2017-12-07 19:46:47 +00:00
Dan Brown
b65abd25e0
Made small var name and formatting tweaks 2017-12-07 19:19:25 +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
Dan Brown
6ebe8bf619
Fixed conflicting PDF facade namespace and corrected php version 
Updated composer to have the correct config to install dependancies that
work for 7.0
 2017-12-04 17:59:53 +00:00
Timo Bartholomes
009af9736e Add socialite authentication for okta 2017-11-26 16:41:29 +01:00
Dan Brown
873b1099f8
Updated to laravel 5.5 
Closes #590
 2017-11-19 15:56:19 +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
Dan Brown
d89440d198
Fixed required email confirmation with domain restriction 
Added test to cover scenario.

Closes #573
 2017-11-11 18:09:48 +00:00
Dan Brown
711ba258f1
Prevented mulitple hypens incorrectly in slug 
Added test to check slug format.
Fixes #589
 2017-11-11 16:27:29 +00:00
Dan Brown
f094837709
Added test to cover multi-byte slugs 
Also removed check for 'mb_' functions since mbstring is a dependancy
 2017-11-11 16:15:08 +00:00
Vladimir
6b2581de63
Russian slug and Multibyte String 2017-11-03 14:00:07 +02:00
Dan Brown
db51cee2d8
Prevented custom homepage being deleted 
Fixes #546
 2017-10-15 19:14:46 +01:00
Dan Brown
a988438946
Expanded list of indexing split chars 
Expands on #531
 2017-10-15 19:14:31 +01:00
Dan Brown
9758872baf
Updated image fetching in exporting 
Added domain check to see if possibly local even when whole url found.
Changed image fetch from file_get_contents to curl for external
resources.

Hopeful solution to #392
 2017-10-06 20:49:25 +01:00
Dan Brown
2b3d6e4e4a
Updated search-regen command description 2017-10-01 17:51:59 +01:00
Dan Brown
9ba29770e1
Added azureAD social auth option 
Closes #509
 2017-10-01 13:19:17 +01:00
Dan Brown
481aa5b5b0
Added 'last_commented' sort option to search 
Closes #440
 2017-10-01 11:24:33 +01:00
Dan Brown
c943eb4d0d
Removed empty string null middleware as was causing issues 2017-09-30 14:44:52 +01:00
Dan Brown
aca6de49b0
Added missing middleware to trim input 2017-09-30 14:31:27 +01:00
Dan Brown
5fd04fa470
Updated search indexer to split words better 
Will now split up words based on more chars than just spaces.
Not takes into account newlines, tabs, periods & commas.

Fixed #531
 2017-09-30 14:14:23 +01:00
Dan Brown
74a5e3113e
Fixed page includes erroring on save 
Closes #514
 2017-09-20 21:03:40 +01:00
Dan Brown
39e7ac1c15
Updated social login to redirect to intended page. 
Closes #508.
 2017-09-14 20:20:47 +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
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
c81b63b56f
Fixed broken page content includes 2017-09-02 16:06:03 +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
0a402e3c63
Made custom home ignore permissions and added tests 
Closes #126 and #372
 2017-08-28 13:55:39 +01:00
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
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
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
Dan Brown
3da8c01c1f
Rolled out new design further 2017-08-20 13:57:25 +01:00
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