Mirrors/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-11-25 04:13:42 +01:00
Code Issues Releases Wiki Activity
1,645 Commits 11 Branches 200 Tags 53 MiB
23ad8024ec
Commit Graph

619 Commits

Author SHA1 Message Date
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
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
Dan Brown
96c074bb56
Merge fixes from branch 'v0.11' 2016-08-21 15:02:37 +01:00
Dan Brown
f8a299caee
Fixed login 'intended' redirect for custom urls. 
Also changed social account detach wording.
 2016-08-21 14:49:40 +01:00
Chris
437dce7756 Applied baseUrl to login redirect 2016-08-21 13:48:56 +01:00
Chris
632ecc668f Applied baseUrl to login redirect 2016-08-15 15:07:45 +01:00
Dan Brown
92d393537c Merge branch 'v0.11' 2016-08-14 13:09:44 +01:00
Dan Brown
43d9d2eba7 Updated all application urls to allow path prefix. 
Allows BookStack to be installed at a non-root location on a domain.
Closes #40.
 2016-08-14 12:29:35 +01:00
Dan Brown
baa260a03d Started work on subdirectory support 2016-08-13 17:56:25 +01:00
Dan Brown
2d958e88bf Fixed entities created with blank slugs. 
Fixes #156.
 2016-08-13 13:53:04 +01:00
Dan Brown
42976ca48c Fixed revision-based redirect on new pages 2016-07-26 18:16:40 +01:00
Dan Brown
7215392784 Changed when revisions are saved and update changelog input 
Revisions are now saved when te page content is originally saved whereas before they were saved on the next update to the page.
 2016-07-10 12:12:52 +01:00
Younès EL BIACHE
c279c6e2af replace GPL diff lib with MIT lib 
replace gpl lib with mit lib
 2016-07-10 12:01:05 +02:00
Dan Brown
8a9a8dfae5 Merge branch 'summary' of git://github.com/younes0/BookStack into younes0-summary 2016-07-10 10:42:47 +01:00
Dan Brown
c44314def3 Added check for s3 bucket name to choose shortest url 2016-07-10 10:28:05 +01:00
Dan Brown
8b899a9cf0 Merge branch 'patch-1' of git://github.com/younes0/BookStack into younes0-patch-1 2016-07-10 10:15:38 +01:00
Younes El Biache
32a06f119b set uploaded files public visibliity (relevant for S3 storage) 2016-07-09 15:26:53 +02:00
Younes El Biache
ec30864ce5 shorter amazon S3 url 2016-07-09 14:33:37 +02:00
Younès EL BIACHE
6bc72e157a edit summary 2016-07-07 20:53:43 +02:00
Younès EL BIACHE
9537e2ae95 html diff in revision view 2016-07-07 19:54:40 +02:00
Dan Brown
a11d5245ec Cut down homepage queries a little 2016-07-03 10:42:13 +01:00
Dan Brown
565033e0d4 Fixed bug which hid entities and fixed new chapter priority 2016-07-03 10:31:20 +01:00
Dan Brown
b0a63ba0cc Tightened and cleaned some list styles 2016-07-03 09:58:45 +01:00
Dan Brown
7b6c88f17c Fixed error on image deletion 
Also Added tests to cover image upload and deletion.
Fixes #136.
 2016-07-01 20:13:30 +01:00
Dan Brown
9baa96d41c Added chapter move actions. Closes #86 2016-06-25 15:31:38 +01:00
Dan Brown
7f99903fdb Finished off page move functionality 2016-06-12 12:14:14 +01:00
Dan Brown
97d011ac8e Started work on page move view and entity selector 2016-06-11 21:04:18 +01:00
Dan Brown
61596a8e21 Prevent page redirect on draft saving 
Only an issue when using the non 'mysqlnd' extension.
Fixes #120
 2016-06-10 19:45:53 +01:00
Dan Brown
eec9c05518 Added tag autosuggestion when no input provided 
Shows the most popular tag names/values.
As requested on #121
 2016-06-04 15:37:28 +01:00
Dan Brown
246d1621f5 Limited tag value autosuggestions based on tag name 
As requested on #121
 2016-06-04 14:54:31 +01:00
Dan Brown
947db95d16 Fixed error with similar activity filtering 2016-05-28 14:02:48 +01:00
Dan Brown
be517de7dc Added pagination, sorting & searching to users list 
As requested on #113
 2016-05-22 10:44:31 +01:00
Dan Brown
23ab1f0c81 Standardised delete aesthetics regarding roles and users 
Also added user delete success message.
Fixes #114
 2016-05-22 09:23:41 +01:00
Dan Brown
e80ae76856 Added auto-suggestions to tag names and values 2016-05-15 20:12:53 +01:00
Dan Brown
eebad3e2a0 Fixed tags not being saved on new pages 2016-05-15 14:17:25 +01:00
Dan Brown
8d80e7311c Added tag searching to search interfaces 2016-05-15 13:41:18 +01:00
Dan Brown
7932069535 Added tags to page display and simplified editing flow 
Tags now save with the page content data
 2016-05-15 10:39:17 +01:00
Dan Brown
78564ec61d Cleaned up tag edit interface 2016-05-14 20:02:00 +01:00
Dan Brown
b80184cd93 Renamed attribute to tags & continued interface 
Also fixed page create route broken in last commit
 2016-05-13 21:20:21 +01:00
Dan Brown
1fa079b466 Started the page attributes interface 2016-05-12 23:12:05 +01:00
Dan Brown
fcfb9470c9 Added further attribute endpoints and added tests 2016-05-07 14:29:43 +01:00
Dan Brown
c99653f0f2 Fixed bad refactor in the permission service 2016-05-06 20:44:07 +01:00
Dan Brown
5080b4996e Started base work on attribute system 2016-05-06 20:33:08 +01:00
Dan Brown
1903422113 Merge branch 'v0.9' 2016-05-03 21:30:55 +01:00
Dan Brown
4e8722661f Added bookstack version in settings 
Gets the app version via git. Closes #99
 2016-05-03 21:10:05 +01:00
Dan Brown
3a1cda5802 Updated ldap so extension not required in testing 2016-05-02 11:38:07 +01:00
Dan Brown
5c1015d6fc Updated social testing compatibility 2016-05-02 11:26:47 +01:00
Dan Brown
75a4fc905b Major permission naming refactor and database migration cleanup 2016-05-01 22:33:56 +01:00
Dan Brown
05666efda9 Added hidden public role to fit with new permissions system 2016-05-01 19:36:53 +01:00
Dan Brown
59367b3417 Improved permission regen performance by factor of 4 
Worked around slower eloquent access to speed up permission generation.
 2016-04-30 17:16:06 +01:00
Dan Brown
9a31b83b2a Worked around create permission quirks 2016-04-26 21:48:17 +01:00
Dan Brown
a81a56706e Rolled out new permissions system throughout application 2016-04-24 16:54:20 +01:00
Dan Brown
ada7c83e96 Continued with database work for permissions overhaul 
Added to the entity_permissions table with further required fields and indexes.
Wrote the code for checking permissions.
 2016-04-23 18:14:26 +01:00
Dan Brown
ea287ebf86 Started creation of intermediate permission table 2016-04-20 21:37:57 +01:00
Dan Brown
043cdeafb3 Merge branch 'master' into add_role_view_permissions 2016-04-20 20:22:30 +01:00
Dan Brown
8933179017 Prevented drafts from showing up in a book sort 
Added tests to cover regresssion.
In reference to #100.
 2016-04-15 19:51:27 +01:00
Dan Brown
d6bad01130 Fixed draft time display, Cleaned up some code 
Cleaned up some comment spacing in book controller and refactored some of the view service functions.
 2016-04-09 14:26:42 +01:00
Dan Brown
2e7345f4f0 Localised draft save time display 
In reference to #83.
 2016-04-09 13:36:32 +01:00
Dan Brown
6e03078de3 Started work towards adding role view permissions 
Work halted as re-write required.
In reference to #92
 2016-04-09 12:40:07 +01:00
Dan Brown
1a7de4c2d6 Fixed and cleaned some permisison/role based components 2016-04-09 12:37:58 +01:00
Dan Brown
afc3583be8 Made new pages in chapters have a better inital priority 2016-04-07 19:03:00 +01:00
Dan Brown
cbff2c6035 Added uploaded to book/page filters & search in image manager 
Also refactored tab styles which affected the settings area.

Closes #41
 2016-04-03 14:59:54 +01:00
Dan Brown
d099885fd1 Fixed some label casing and fixed incorrect notifications 
Fixed the book & chapter permission update notification stating the 'page permissions' have been updated.
 2016-04-03 12:19:44 +01:00
Dan Brown
2bb8c3d914 Made email confirmations work with LDAP auth 
The email_confirmed user field now actually indicates if an email is confirmed rather than defaulting to true if not checked.
 This ensures toggleing the 'Require email confirmation' setting actually makes all currently unconfirmed users confirm thier emails.
 2016-04-03 12:16:54 +01:00
Dan Brown
4caa61fe96 Added a friendlier error for LDAP new user mismatches 2016-04-03 11:16:49 +01:00
Dan Brown
e9b596d3bc Merge bugfixes from branch 'v0.8' 2016-03-30 21:49:25 +01:00
Dan Brown
8b109bac13 Trimmed long names in header 
Fixes #87
 2016-03-30 21:28:38 +01:00
Dan Brown
097d9c9f3c Updated entity restrictions to allow permissions, Not just restrict 
Also changed wording from 'Restrictions' to 'Permissions' to keep things more familiar and to better reflect what they do.

Referenced in issue #89.
 2016-03-30 20:15:44 +01:00
Dan Brown
e1994ef2cf Added editor control in admin settings & Fixed some markdown editor bugs 
Also updated the setting system with a more sane approach to handling default values. (Now done via the setting-defaults config file)
 2016-03-29 19:26:13 +01:00
Dan Brown
26965fa08f Added a markdown editor 2016-03-25 14:41:15 +00:00
Dan Brown
491f73e0cd Fixed bug causing permission error on save and fixed non-gallery image save 2016-03-13 15:37:46 +00:00
Dan Brown
4656c12f6d Fixed bug causing editing notification to always show 
Updated tests to prevent happening again
 2016-03-13 14:33:43 +00:00
Dan Brown
dbe11c1360 Attached images to pages and added restriction filtering 
Closes #79
 2016-03-13 13:30:47 +00:00
Dan Brown
5283919d24 Added new page drafts and started image entity attaching 
Closes #80.
 2016-03-13 12:04:08 +00:00
Dan Brown
30214fde74 Added UI components of page autosaving 2016-03-12 15:52:19 +00:00
Dan Brown
59ce228c2e Moved page editing to angular controller and started work on update drafts 2016-03-09 22:32:07 +00:00
Dan Brown
1d6137f7e2 Added restrictions to user profile lists 2016-03-06 13:17:46 +00:00
Dan Brown
66c56e9d02 Added settings helper and formatted code in some files 2016-03-06 12:55:08 +00:00
Dan Brown
e744d4c82c Changed color picker library and moved color logic to front end 
Since the old library was GPLv3 i changed the color picker to tiny-color-picker which is MIT.
Also extracted the styles to a shared view and move color calculation logic to javascript side.
 2016-03-06 10:52:10 +00:00
Dan Brown
0774ecc89c Merge branch 'master' into nwalke-update_site_color 2016-03-06 09:08:20 +00:00
Dan Brown
5e7a4c7fb5 Fixed incorrect recents pages on homescreen 
Fixed the bug causing the recently updated pages to be exaclty the same as the recently create pages.
Also added in tests to prevent regression.
 2016-03-05 22:54:53 +00:00
Dan Brown
76eaf64f94 Fixed errors that occured when merging & refactored entity repositories 
Also deleted the git '.orig' files that got added in last merge.
 2016-03-05 19:00:26 +00:00
Dan Brown
80865b30a5 Merge branch 'custom_role_system' 
Conflicts:
	app/Repos/BookRepo.php
	app/Repos/ChapterRepo.php
	app/Repos/PageRepo.php
 2016-03-05 18:21:44 +00:00
Dan Brown
8e6248f57f Added restriction tests and fixed any bugs in the process 
Also updated many styles within areas affected by the new permission and roles system.
 2016-03-05 18:09:21 +00:00
Dan Brown
268db6b1d0 Added a whole load of permission & role tests 2016-03-05 12:09:09 +00:00
Dan Brown
bc2b310638 Updated fulltext search with custom escaped query 
Changed pdo quoted query to use custom escaping and added like searches when quoted terms are used.
 2016-03-04 20:49:35 +00:00
Nick Walke
33bf20cfc8 Found the source of the issue, not sure how to fix 2016-03-04 02:33:57 -06:00
Nick Walke
e3bdc391cd Closes #55. Allows you to set the primary color. 
This certainly should not be seen as the final implementation of this.
I imagine that requests like this will happen for many other colors in
the system, it might be good at some point to allow them to upload their
own stylesheet to be used.
 2016-03-03 12:01:14 -06:00
Nick Walke
5681f4dd69 Closes #70. 
Added the ability to search by multi-word terms using double quotes.
 2016-03-02 21:38:23 -06:00
Dan Brown
8e274a5a84 Refactored some permission controls and increased testing for roles system 2016-03-02 22:35:01 +00:00
Dan Brown
985d2f1c2c Tied entity restriction system into userCan checks 2016-02-29 20:31:21 +00:00
Dan Brown
7f5872372d Added in restriction queries for most lists 2016-02-28 19:03:13 +00:00
Dan Brown
201f788806 Implemented database structure and inital interfaces for entity restrictions 2016-02-28 10:49:41 +00:00
Dan Brown
a14b5c33fd Added missing permission checkboxes and improved image AJAX permission responses 2016-02-27 20:52:46 +00:00
Dan Brown
473261be35 Finished initial implementation of custom role system 2016-02-27 19:24:42 +00:00
Dan Brown
a54be85185 Started work on exposing the role system as editable 2016-02-26 23:44:02 +00:00
Dan Brown
54e3122540 Added smarter page finding so changing the page name does not break old urls 
Added page & book slug history to revisions so they can be looked up if a page is not found.
 2016-02-25 20:01:59 +00:00
Dan Brown
3ab09ef708 Fixed issue with the book sort not showing all books in sidebar 2016-02-22 21:28:20 +00:00
Dan Brown
6bd49bcd4b Fixed page listing excerpts not showing due to encoding issues 2016-02-21 13:15:46 +00:00
Dan Brown
61577cf6bf Added entity-specific search results pages. Cleaned & Fixed search results bugs 
Added search result pages for pages, chapters and books.
Limited the results on the global search as it just listed out an infinate amount.
Fixed styling on new detailed page listings and also removed the 'bars' from the side to create  a cleaner view.
Fixed bad sql fulltext query format that may have thrown off searches.
Reduced the number of database queries down a thousand or so.
 2016-02-21 12:53:58 +00:00
Dan Brown
b4dec2a99c Made page anchor hashes more relevant to the page content 
This will help when adding support for new kinds of page content such as markdown as we won't be able to reference the same ID's as before thus they would break on every save.
 2016-02-21 11:29:46 +00:00
Dan Brown
fe0b122aca Merge pull request #63 from AkibaWolf/patch-1 
Fixes encoding issues the page HTML is formatted on save
 2016-02-20 19:24:32 +00:00
Dan Brown
8eb2960950 Added recently created & updated page listings 
Closes #46.
 2016-02-20 18:51:01 +00:00
AkibaWolf
c2369a740d Update PageRepo.php 
Fix encoding problem.

By default DOMDocument::loadHTML treats a string as being encoded with ISO-8859-1. This causes a problem with saving cyrillic pages' text that becomes completely unreadable (like Проверка instead of normal symbols).
 2016-02-20 21:31:21 +05:00
Dan Brown
bab6fd1f2f Added recent pages to home view and made the home content more compact 2016-02-20 12:37:06 +00:00
Dan Brown
86fbc9a936 Added tests for profile pages 2016-02-18 19:32:07 +00:00
Dan Brown
4d9726dbdd Added content to user profile pages 2016-02-17 22:11:48 +00:00
Dan Brown
4442a2e6d1 Started work on user profile pages 2016-02-16 21:25:11 +00:00
Dan Brown
5d73d17c74 Fixed bug preventing LDAP users updating thier profile 
Made email not required when a profile is updated. LDAP users without admin privileges could did not have an email field to submit therefore could previously not update thier profile.
 2016-02-08 20:35:23 +00:00
Dan Brown
d32460070f Made ldap auth use the 'dn' if a 'uid' is not present. 
Fixes #56
 2016-02-08 19:45:01 +00:00
Dan Brown
8e8d582bc6 Updated app requirements & Added some friendlier errors 2016-02-03 20:55:37 +00:00
Dan Brown
e87db96fc0 Updated folder permissions installation instructions & fixed issue with handling image saving on user creation 2016-02-02 07:34:48 +00:00
Dan Brown
080acf0a62 Added plaintext & basic PDF page Export 2016-01-31 17:53:30 +00:00
Dan Brown
ea2e16cabb Added page HTML export 2016-01-20 22:13:13 +00:00
Dan Brown
7bcd967fd9 Increased LDAP testing and fixed any Auth-based bugs found 2016-01-17 15:20:07 +00:00
Dan Brown
bb87401d10 Improved image upload error handling and fixed bad user-avatar rewriting 2016-01-17 15:19:26 +00:00
Dan Brown
0821672e70 Cleaned tests up, Started LDAP tests, Created LDAP wrapper 2016-01-15 23:21:47 +00:00
Dan Brown
14feef3679 Updated user interfaces for LDAP and added email from LDAP 2016-01-13 22:22:30 +00:00
Dan Brown
1c8c9e65c5 Got LDAP auth working to a functional state 2016-01-11 22:41:05 +00:00
Dan Brown
14ca31768c Updated laravel to 5.2 and started ldap implementation 2016-01-09 19:24:21 +00:00
Dan Brown
e27a630a09 Updated readme with social & update instructions 2016-01-02 16:24:09 +00:00
Dan Brown
d3709de035 Added more tests to increase test coverage 2016-01-02 14:48:35 +00:00
Dan Brown
f60a0c3b76 Improved 404 page and updated tests for empty search 2016-01-01 09:03:40 +00:00
Dan Brown
9a470b07fd Added public build folder and support for a demo mode 2015-12-31 17:57:34 +00:00
Dan Brown
445f939822 Fixed issue with searching invalid chars and page-content compiliation 2015-12-29 15:37:13 +00:00
Dan Brown
05c4b2089c Accounted for non-existant entities 2015-12-28 17:19:23 +00:00
Dan Brown
4db692309b Standardized vue component http access and fixed some small bugs 2015-12-28 15:58:13 +00:00
Dan Brown
2a4ff6fb6a Implemented custom asset versioning to make creating releases easier 2015-12-16 17:09:44 +00:00
Dan Brown
497747e621 Fixed issue with deleted users in page revision list & extended tests to cover. 2015-12-15 19:53:46 +00:00
Dan Brown
af33156369 Fixed name retrieval on missing users and added tests to cover along with some test helper methods 2015-12-15 19:27:36 +00:00
Dan Brown
123dc11583 Fixed issue with users that have no avatar 2015-12-14 20:30:40 +00:00
Dan Brown
93223fcd3d Cleaned up gravatar image importing 2015-12-14 20:13:32 +00:00
Dan Brown
8f7c642f32 Added custom user avatars 2015-12-09 22:30:55 +00:00
Dan Brown
db3acabc66 Added an image service and facade, Cleaned Image Model 2015-12-09 19:50:17 +00:00
Dan Brown
a3188d349c Added mulit image-type compatability to manager & app and added scaled image selection 2015-12-08 22:04:59 +00:00
Dan Brown
32d5b12d27 Fixed bad s3 stock url creation 2015-12-08 21:01:37 +00:00
Dan Brown
c88096b7e2 Revamped image system to use driver-agnotstic storage and be more efficent 2015-12-07 23:00:34 +00:00
Dan Brown
46c905df8a Added search name weighting. Closes #27. 2015-12-05 15:11:48 +00:00
Dan Brown
c32d70abc4 Added custom meta titles to many pages. Closes #30. 2015-12-05 14:41:51 +00:00
Dan Brown
f1c2866fbc Added Popular books list with relevant tests 2015-12-02 20:22:41 +00:00
Dan Brown
5e21ecc526 Fixed crash on public entitiy viewing 2015-12-01 21:14:39 +00:00
Dan Brown
9969698783 Floating page content bugfix and prevent incompatable image uploads. Fixes #26. 2015-12-01 20:26:09 +00:00