Commit Graph

3108 Commits

Author SHA1 Message Date
Arie Timmerman b2b64fb853 Started with Dutch translation 2017-02-10 22:10:41 +01:00
Dan Brown a6128a1df1
Merge bugfixes from branch 'v0.14' 2017-02-05 21:24:15 +00:00
Dan Brown 598758b991
Updated version for v0.14.3 2017-02-05 21:23:27 +00:00
Dan Brown 9926e23bc8
Merge branch 'v0.14' into release 2017-02-05 21:21:54 +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
Dan Brown ee495450cc
Improved multi-line callout rendering
Closes #300
2017-02-05 14:47:26 +00:00
Dan Brown d369d315a7
Fixed non-browserkit testcase and seeder issues 2017-02-05 14:37:50 +00:00
Dan Brown 7c9937e924
Converted sort tests to non browserkit testing
Added testing to cover book sort endpoint.
Closes #283
2017-02-05 14:20:59 +00:00
Abijeet 410e967eb1 Merge branch 'master' of https://github.com/Abijeet/BookStack 2017-02-05 16:46:32 +05:30
Abijeet Patro 388f2f40dc Merge pull request #7 from BookStackApp/master
Getting the latest.
2017-02-05 16:46:03 +05:30
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 5d3264bc63
Updated assets for release v0.14.2 2017-02-01 22:27:04 +00:00
Dan Brown d71f819f95
Merge branch 'v0.14' into release 2017-02-01 22:22: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 ee13509760
Updated version number 2017-01-23 22:28:31 +00:00
Dan Brown 82d7bb1f32
Merge branch 'master' into release 2017-01-23 22:28:02 +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 cdfda508d8
Updated assets for release v0.14 2017-01-22 12:36:10 +00:00
Dan Brown da941e584f
Merge branch 'master' into release ready for v0.14 2017-01-22 12:31:27 +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