colin
/
bookstack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • 4a2a539c08 Merge pull request #295 from ReeseSebastian/master Dan Brown 2017-02-23 19:19:21 +0000
  • 4214fcd2fa Updated Dutch language files Arie Timmerman 2017-02-11 11:58:45 +0100
  • b2b64fb853 Started with Dutch translation Arie Timmerman 2017-02-10 22:10:41 +0100
  • a6128a1df1
         Merge bugfixes from branch 'v0.14' Dan Brown 2017-02-05 21:24:15 +0000
  • 598758b991
         Updated version for v0.14.3 Dan Brown 2017-02-05 21:23:27 +0000
  • 9926e23bc8
         Merge branch 'v0.14' into release Dan Brown 2017-02-05 21:21:54 +0000
  • 6638ee47d3
         Fixed entities wrongly visible on 404 Dan Brown 2017-02-05 21:19:29 +0000
  • 65899a3e91
         Prevented settings being overfetched from db/cache Dan Brown 2017-02-05 18:57:57 +0000
  • 86625a7642
         Neatened up social login/register buttons Dan Brown 2017-02-05 15:28:53 +0000
  • ee495450cc
         Improved multi-line callout rendering Dan Brown 2017-02-05 14:47:00 +0000
  • d369d315a7
         Fixed non-browserkit testcase and seeder issues Dan Brown 2017-02-05 14:37:50 +0000
  • 7c9937e924
         Converted sort tests to non browserkit testing Dan Brown 2017-02-05 14:20:59 +0000
  • 410e967eb1 Merge branch 'master' of https://github.com/Abijeet/BookStack Abijeet 2017-02-05 16:46:32 +0530
  • 388f2f40dc Merge pull request #7 from BookStackApp/master Abijeet Patro 2017-02-05 16:46:03 +0530
  • 33a2999a57
         Namespaced tests to align with new laravel default Dan Brown 2017-02-04 11:58:42 +0000
  • 076693efc9
         Added facebook, slack & twitter sign in options. Dan Brown 2017-02-04 11:01:49 +0000
  • 54d1fcde5b Merge branch 'master' of https://github.com/BookStackApp/BookStack Sebastian Reese 2017-02-02 00:43:54 +0100
  • 1c656d6556 Updated and improved german translation Sebastian Reese 2017-02-02 00:43:24 +0100
  • 2431ce9f86
         Merge branch 'v0.14' Dan Brown 2017-02-01 22:28:38 +0000
  • 5d3264bc63
         Updated assets for release v0.14.2 Dan Brown 2017-02-01 22:23:06 +0000
  • d71f819f95
         Merge branch 'v0.14' into release Dan Brown 2017-02-01 22:22:38 +0000
  • 80f844139c
         Fixed missing subscript styling Dan Brown 2017-02-01 22:20:44 +0000
  • 9eecaea31a
         Attempt to fix bookchildren and user getThumb Dan Brown 2017-02-01 22:16:32 +0000
  • 3ccfa0e7fc
         Fixed readme badge links & added contributing block Dan Brown 2017-01-30 19:31:24 +0000
  • 148350009c #47 Adds comment permission to each role. Abijeet 2017-01-29 14:25:20 +0530
  • 70991fc1e5 Merge branch 'master' of https://github.com/Abijeet/BookStack Abijeet 2017-01-29 09:35:46 +0530
  • e5c4e0ac86 Merge pull request #6 from BookStackApp/master Abijeet Patro 2017-01-29 09:35:21 +0530
  • 6669998c10
         Upgraded to Laravel 5.4 Dan Brown 2017-01-25 19:35:40 +0000
  • ee13509760
         Updated version number Dan Brown 2017-01-23 22:28:31 +0000
  • 82d7bb1f32
         Merge branch 'master' into release Dan Brown 2017-01-23 22:28:02 +0000
  • 492e2f173e
         Fixed error causing permissions to be deleted on book sort Dan Brown 2017-01-23 22:27:11 +0000
  • cdfda508d8
         Updated assets for release v0.14 Dan Brown 2017-01-22 12:36:10 +0000
  • da941e584f
         Merge branch 'master' into release ready for v0.14 Dan Brown 2017-01-22 12:31:27 +0000
  • 380f0f2042
         Prevented a missing avatar from crashing the application Dan Brown 2017-01-22 12:19:50 +0000
  • 33d4844f17
         Fixed role 'manage own permissions' permission Dan Brown 2017-01-22 12:16:02 +0000
  • 989de47f22
         Fixed hidden book children for admins on upgrade Dan Brown 2017-01-22 12:02:30 +0000
  • 8f19231ed5
         Added options to use database cache & sessions Dan Brown 2017-01-21 16:39:50 +0000
  • 5c60f27a7d
         Merge branch 'page_transclusion' Dan Brown 2017-01-21 16:17:33 +0000
  • 2d4034f3b7
         Added transclusion tests and fixed other tests Dan Brown 2017-01-21 16:16:27 +0000
  • 56d58ad8e5
         Updated pointer to be able to show includes Dan Brown 2017-01-21 14:56:47 +0000
  • a4f6bc63f0
         Updated page include logic to use blade-style tags Dan Brown 2017-01-21 13:53:00 +0000
  • 26da81a3b0
         Added pt_BR to language dropdown and renamed folder Dan Brown 2017-01-18 20:04:29 +0000
  • ec9410b510 Merge pull request #279 from NakaharaL/master Dan Brown 2017-01-18 19:48:53 +0000
  • a0035e4de2 Brazilian Portuguese Localization NakaharaL 2017-01-18 08:29:18 -0300
  • e4e3b25c22
         Started page transclusion system Dan Brown 2017-01-16 21:24:48 +0000
  • d8c5f72258
         Updated issue template and added TinyMCE autolinking Dan Brown 2017-01-16 19:33:29 +0000
  • d67ad47b2c Merge pull request #274 from GeneralMediaCH/feature/translations Dan Brown 2017-01-16 19:23:30 +0000
  • b08e49b59d
         Updated CI to not use github token Dan Brown 2017-01-16 19:14:58 +0000
  • d3dc73ca06 remove trailing spaces sirgix 2017-01-16 15:34:34 +0100
  • d5ea15e6dd fix typo sirgix 2017-01-16 14:51:45 +0100
  • 5d45286646 french translation sirgix 2017-01-16 08:56:06 +0100
  • dabf149411
         Added user setting system and added user-lang option Dan Brown 2017-01-15 16:27:24 +0000
  • ee5ded6e1e
         Updated permission bookChildrenQuery to use QueryBuilder Dan Brown 2017-01-15 15:00:29 +0000
  • 598b07b53d
         Updated LDAP to allow protocol to be specified Dan Brown 2017-01-14 17:55:09 +0000
  • e211f31370
         Merge branch 'patch-2' of git://github.com/fredericmohr/BookStack into fredericmohr-patch-2 Dan Brown 2017-01-14 17:30:49 +0000
  • 0bcf608e0b
         Fixed page navigation with special chars in id Dan Brown 2017-01-14 16:36:12 +0000
  • 969ad8911c
         Updated page nav to hide when empty Dan Brown 2017-01-14 15:34:52 +0000
  • 397db04428 Added comments controller, model, repo, and the database schema. Modified existing Page model to associate with comments. Abijeet 2017-01-13 21:45:48 +0530
  • 581c382f65
         Fixed image delete permission issue Dan Brown 2017-01-08 19:19:30 +0000
  • f7f86ff821
         Merge branch 'master' of github.com:BookStackApp/BookStack Dan Brown 2017-01-08 18:43:33 +0000
  • 212cd710aa
         Fixed default empty app settings effecting blank app color Dan Brown 2017-01-08 18:42:46 +0000
  • 33c44d3c0f Merge pull request #263 from Abijeet/typo-fix Dan Brown 2017-01-08 13:55:44 +0000
  • 0faa130cfd
         Fixed offset code blocks when editing in markdown. Dan Brown 2017-01-08 13:31:53 +0000
  • af76580b98 Fixes typo causing the message not to be displayed Abijeet Patro 2017-01-03 22:18:13 +0530
  • b526d172d6 Merge pull request #5 from BookStackApp/master Abijeet Patro 2017-01-03 22:16:39 +0530
  • cd6572b61a Merge pull request #3 from BookStackApp/master Abijeet Patro 2017-01-03 07:54:28 +0530
  • f2917fc462
         Added tests to cover social login actions Dan Brown 2017-01-02 14:56:58 +0000
  • 7c8c4c2a05
         Normalised page nav header inset when only small headers are used Dan Brown 2017-01-02 12:13:03 +0000
  • 3595ac2551 Merge pull request #262 from BookStackApp/entity_repo_refactor Dan Brown 2017-01-02 11:12:44 +0000
  • 8453191dfb
         Finished refactor of entity repos Dan Brown 2017-01-02 11:07:27 +0000
  • 65796cfc7b
         Rewrote book children query Dan Brown 2017-01-01 21:21:11 +0000
  • bab27462ab
         Fixed issue where default user was over-fetched Dan Brown 2017-01-01 17:33:06 +0000
  • 241278226f
         Refactored search and slug repo components Dan Brown 2017-01-01 16:57:47 +0000
  • 7f9de2c8ab
         Started refactor to merge entity repos Dan Brown 2017-01-01 16:05:44 +0000
  • f91f33c236
         Updated readme attribution and npm scripts Dan Brown 2017-01-01 12:51:23 +0000
  • 3f0ef57d31
         Added wkhtmltopdf support and done some style tweaks Dan Brown 2017-01-01 12:20:30 +0000
  • 0eb90cb3b6
         Fixed carbon locale setting Dan Brown 2016-12-31 14:38:04 +0000
  • 9fe158b78a Merge pull request #255 from olexus/master Dan Brown 2016-12-31 14:36:01 +0000
  • b14222dabd Merge pull request #234 from BookStackApp/translations Dan Brown 2016-12-31 14:33:25 +0000
  • a24f3d7d47 Merge branch 'master' into translations Dan Brown 2016-12-31 14:32:52 +0000
  • c9700e38e2
         Created solution for JS translations Dan Brown 2016-12-31 14:27:40 +0000
  • 05316c90ba
         converted image picker to blade-based component Dan Brown 2016-12-24 15:21:19 +0000
  • 242dc21876
         Converted toggle switch into a blade/jquery template Dan Brown 2016-12-22 19:41:32 +0000
  • 08c4b9ac7c
         Standardised JS vars and imports/exports Dan Brown 2016-12-19 19:16:31 +0000
  • f30f4579e9 Add Carbon localization support olexus 2016-12-19 11:05:06 +0300
  • 573357a08c
         Extracted text from logic files Dan Brown 2016-12-04 16:51:39 +0000
  • 0775cd09a1
         Extracted text for remaining views Dan Brown 2016-12-04 14:08:04 +0000
  • 96075dee7b
         Extracted text from page views & standardised breadcrumbs Dan Brown 2016-12-03 18:35:40 +0000
  • 066adf3cea
         Moved text for errors and form views. Dan Brown 2016-12-03 13:31:54 +0000
  • 581881d0ca Merging gitignore. Abijeet 2016-11-29 00:24:15 +0530
  • d2efc2f47f Merge pull request #2 from BookStackApp/master Abijeet Patro 2016-11-29 00:23:30 +0530
  • 65874d7b96
         Updated assets for release v0.13.1 Dan Brown 2016-11-27 19:42:33 +0000
  • ac9b8f405c
         Merge fixes from master for release v0.13.1 Dan Brown 2016-11-27 19:41:12 +0000
  • 286f9b0c7d
         Moved page tags to sidebar Dan Brown 2016-11-27 19:37:57 +0000
  • c403d05755
         Fixed social login routes Dan Brown 2016-11-27 19:11:15 +0000
  • 57dc53ceff
         Extracted text from book & chapter views Dan Brown 2016-11-17 13:33:07 +0000
  • 340d3f833b Update Ldap.php Frederic Mohr 2016-11-15 11:10:12 +0100
  • 694a9459c1
         Moved text from auth views into lang files Dan Brown 2016-11-13 16:34:28 +0000
  • 8d1419a12e
         Update assets and version for release v0.13 Dan Brown 2016-11-13 12:29:52 +0000
  • 04f7a7d301
         Merge branch 'master' into release Dan Brown 2016-11-13 12:26:56 +0000