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
0a402e3c63
Made custom home ignore permissions and added tests
...
Closes #126 and #372
2017-08-28 13:55:39 +01:00
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
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
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
3da8c01c1f
Rolled out new design further
2017-08-20 13:57:25 +01:00
a04b31866d
Cleaned social callback
2017-08-17 19:44:35 +01:00
e9831a7507
Merge branch 'master' of git://github.com/Abijeet/BookStack into Abijeet-master
2017-08-01 19:24:33 +01:00
33642c20ec
Fixed faulty text rendering calls and LDAP tests
2017-07-22 17:10:52 +01:00
2704962277
Updated utfmb4 upgrade command
2017-07-22 16:19:17 +01:00
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
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
b4044e6c3a
Resolves heading issues in grid view
2017-07-15 16:22:29 +05:30
85fbe820c4
Adding getHeadingExcerpt to get heading.
2017-07-15 16:11:10 +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
844976c85b
Revert "Revert "Bookstack grid view.""
2017-07-12 11:40:50 +05:30
f0d914abbf
Merge pull request #5 from BookStackApp/master
...
Getting latest changes
2017-07-12 11:33:58 +05:30
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
3fd61a3600
Revert "Bookstack grid view."
2017-07-07 17:28:34 +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
16a09e8ff6
Deletion of image file on book deletion.
2017-07-06 10:03:40 +05:30
6ad24a6bee
Changed public getImageURL function to private.
2017-07-05 18:32:38 +05:30
d99fd1fd65
Applied required changes
2017-07-05 12:26:02 +05:30
947c58f227
Applied required changes in BookStack.
2017-07-05 12:09:01 +05:30
bce5fdd5cd
Merge branch 'master' into issue-181
2017-07-04 15:16:46 +05:30
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
af72f0d490
Bookstack grid view.
2017-06-29 18:54:04 +05:30
8924618d12
test
2017-06-28 18:56:17 +05:30
6557fbb666
commit
2017-06-28 18:51:32 +05:30
fd50efb503
#47 - Putting the comments right under the page.
2017-06-11 11:41:33 +05:30
652a67ad65
Removes some unncessary code.
2017-06-06 23:20:40 +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
06d75e1804
#47 - Updates the total comments when a comment is added.
2017-06-04 20:12:01 +05:30
f99c8ff99a
Fixed role permission removal bug
2017-06-04 15:37:10 +01:00
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
860d4d4be5
#47 - Changes the way we are handling fetching of data for the comment section.
2017-05-30 09:02:47 +05:30
1a1e71cd60
#47 Adds two attributes updated and created to display time to user.
2017-05-25 08:03:27 +05:30
34802ff8a6
#47 Inserts null for updated_at when the user is creating a comment.
2017-05-25 08:02:49 +05:30
03e5d61798
#47 Implements the reply and edit functionality for comments.
2017-05-16 00:40:14 +05:30
4f231d1bf0
Merge pull request #11 from BookStackApp/master
...
Fixed chapter check for non-mysqlnd instances
2017-05-15 22:25:33 +05:30
75981c2412
Fixed chapter check for non-mysqlnd instances
...
Fixes #383
2017-05-07 19:34:56 +01:00
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
f8ae4c335e
Made single entity updates more efficent
2017-04-30 19:44:59 +01:00
