colin
/
bookstack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,537 Commits 1 Branch 0 Tags 48 MiB
Commit Graph

4537 Commits

Author SHA1 Message Date
Dan Brown 33a2999a57
Namespaced tests to align with new laravel default 2017-02-04 11:58:42 +00:00
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
Sebastian Reese 54d1fcde5b Merge branch 'master' of https://github.com/BookStackApp/BookStack 2017-02-02 00:43:54 +01:00
Sebastian Reese 1c656d6556 Updated and improved german translation 2017-02-02 00:43:24 +01:00
Dan Brown 2431ce9f86
Merge branch 'v0.14' 2017-02-01 22:28:38 +00:00
Dan Brown 80f844139c
Fixed missing subscript styling 
Closes #284
 2017-02-01 22:20:44 +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
Dan Brown 3ccfa0e7fc
Fixed readme badge links & added contributing block 2017-01-30 19:31:24 +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
Abijeet Patro e5c4e0ac86 Merge pull request #6 from BookStackApp/master 
Getting the latest
 2017-01-29 09:35:21 +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 8f19231ed5
Added options to use database cache & sessions 2017-01-21 16:39:50 +00:00
Dan Brown 5c60f27a7d
Merge branch 'page_transclusion' 
Closes #123
 2017-01-21 16:17:33 +00:00
Dan Brown 2d4034f3b7
Added transclusion tests and fixed other tests 2017-01-21 16:16:27 +00:00
Dan Brown 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
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 26da81a3b0
Added pt_BR to language dropdown and renamed folder 2017-01-18 20:04:29 +00:00
Dan Brown ec9410b510 Merge pull request #279 from NakaharaL/master 
Brazilian Portuguese Localization
 2017-01-18 19:48:53 +00:00
NakaharaL a0035e4de2 Brazilian Portuguese Localization 
Translated files for messages from English to Brazilian Portuguese
 2017-01-18 08:29:18 -03:00
Dan Brown e4e3b25c22
Started page transclusion system 2017-01-16 21:24:48 +00:00
Dan Brown d8c5f72258
Updated issue template and added TinyMCE autolinking 
Closes #267
 2017-01-16 19:33:29 +00:00
Dan Brown d67ad47b2c Merge pull request #274 from GeneralMediaCH/feature/translations 
French translations
 2017-01-16 19:23:30 +00:00
Dan Brown b08e49b59d
Updated CI to not use github token 2017-01-16 19:14:58 +00:00
sirgix d3dc73ca06 remove trailing spaces 2017-01-16 15:34:34 +01:00
sirgix d5ea15e6dd fix typo 2017-01-16 14:51:45 +01:00
sirgix 5d45286646 french translation 2017-01-16 14:51:33 +01: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 0bcf608e0b
Fixed page navigation with special chars in id 
Also made so it smooth-scrolls and uses app theme color.
Fixes #254
 2017-01-14 16:36:12 +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 f7f86ff821
Merge branch 'master' of github.com:BookStackApp/BookStack 2017-01-08 18:43:33 +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 33c44d3c0f Merge pull request #263 from Abijeet/typo-fix 
Typo fix
 2017-01-08 13:55:44 +00:00
Dan Brown 0faa130cfd
Fixed offset code blocks when editing in markdown. 
Fixes #264
 2017-01-08 13:31:53 +00:00
Abijeet Patro af76580b98 Fixes typo causing the message not to be displayed 2017-01-03 22:18:13 +05:30
Abijeet Patro b526d172d6 Merge pull request #5 from BookStackApp/master 
Getting the latest from Bookstack to push the typo-fix
 2017-01-03 22:16:39 +05:30
Abijeet Patro cd6572b61a Merge pull request #3 from BookStackApp/master 
Getting the latest
 2017-01-03 07:54:28 +05:30
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 3595ac2551 Merge pull request #262 from BookStackApp/entity_repo_refactor 
Entity repo refactor
 2017-01-02 11:12:44 +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