Commit Graph

558 Commits

Author SHA1 Message Date
PCoder ac97190ce0 Get changes to original Makefile before merge 2021-06-22 08:26:56 +05:30
PCoder 0f6cb6bbdb Merge branch 'master' into new_makefile 2021-06-22 08:24:19 +05:30
datalets 33c6203922
Merge pull request #38 from loleg/wagtail-2-11
Upgrade to Wagtail 2.13
2021-06-21 16:12:51 +02:00
datalets 53a295c953 Added README note about libpq-dev 2021-06-21 15:52:06 +02:00
datalets 66b4f3dceb Wagtail 2.12.5 2021-06-21 15:15:37 +02:00
PCoder 7a606b9b76 Create a new Makefile
As we are moving away from docker, I propose to save the current
`Makefile` as `Makefile.docker-compose` and create a new makefile
`Makefile.native` and soft link it to Makefile

`Makefile.native` is identical to `Makefile.docker-compose`
2021-06-20 16:47:12 +05:30
datalets b860c2e67c Wagtail at 2.12.4 2021-06-14 16:54:13 +02:00
datalets cab4a2b25f Added dotenv to wsgi 2021-06-14 16:32:31 +02:00
datalets 819cc1f055 Wagtail 2.13 migration 2021-06-07 17:44:16 +02:00
datalets ee694962bc Wagtail 2.13 tweaks 2021-06-07 17:43:12 +02:00
datalets c18af280d9 Merged with upstream 2021-06-07 15:40:43 +02:00
datalets d0ee9df1e0
Merge pull request #41 from datalets/dependabot/npm_and_yarn/y18n-3.2.2
Bump y18n from 3.2.1 to 3.2.2
2021-06-07 14:38:38 +02:00
datalets 97d3ca7989
Merge pull request #43 from datalets/dependabot/npm_and_yarn/lodash-4.17.21
Bump lodash from 4.17.15 to 4.17.21
2021-06-07 14:37:59 +02:00
datalets 9727e1165c
Merge pull request #44 from datalets/dependabot/npm_and_yarn/hosted-git-info-2.8.9
Bump hosted-git-info from 2.8.8 to 2.8.9
2021-06-07 14:37:49 +02:00
datalets 91f920faa5 Recommend node LTS 2021-06-07 12:26:31 +02:00
datalets 87f8ac5d53 Frontend updates 2021-06-07 12:17:49 +02:00
datalets aa58a58a67 Wagtail 2.13, Django-Redis 5, and minor dep updates 2021-06-07 12:16:25 +02:00
dependabot[bot] 81edde5b14
Bump hosted-git-info from 2.8.8 to 2.8.9
Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.8.8 to 2.8.9.
- [Release notes](https://github.com/npm/hosted-git-info/releases)
- [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md)
- [Commits](https://github.com/npm/hosted-git-info/compare/v2.8.8...v2.8.9)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-11 02:57:55 +00:00
dependabot[bot] 888f3a4ff4
Bump lodash from 4.17.15 to 4.17.21
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.21)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-10 13:21:57 +00:00
dependabot[bot] 6ff20c6513
Bump y18n from 3.2.1 to 3.2.2
Bumps [y18n](https://github.com/yargs/y18n) from 3.2.1 to 3.2.2.
- [Release notes](https://github.com/yargs/y18n/releases)
- [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/y18n/commits)

Signed-off-by: dependabot[bot] <support@github.com>
2021-03-30 23:59:26 +00:00
datalets f997ad37f5 nginx ipv6 support 2021-02-24 14:49:12 +01:00
datalets f750be22a9
Merge pull request #40 from datalets/dependabot/npm_and_yarn/bl-1.2.3
Bump bl from 1.2.2 to 1.2.3
2021-02-20 15:35:48 +01:00
datalets a7c55c45b5 Deployment corrections 2021-02-20 15:34:47 +01:00
datalets bab65fbb1c Add g++ for node-sass build 2021-02-20 15:16:57 +01:00
datalets c4c132bd1a Ansible role update 2021-02-20 15:00:27 +01:00
datalets c7582f61e2 Ansible scripts revised 2021-02-20 15:00:04 +01:00
datalets 127d295cec Added coffeescript 2021-02-20 14:05:22 +01:00
datalets 4500e48c76 Frontend updates 2021-02-20 14:03:15 +01:00
datalets 58c5a29f0c Clean up bower setup 2021-02-20 13:55:55 +01:00
datalets 75ddc7aa22 Cert files 2021-02-18 16:46:00 +01:00
datalets 9f38db5775 Ansible roles updated 2021-02-18 16:40:18 +01:00
datalets cbb3447f0c Merged master 2021-02-18 16:10:31 +01:00
dependabot[bot] 892131c6f1
Bump bl from 1.2.2 to 1.2.3
Bumps [bl](https://github.com/rvagg/bl) from 1.2.2 to 1.2.3.
- [Release notes](https://github.com/rvagg/bl/releases)
- [Commits](https://github.com/rvagg/bl/compare/v1.2.2...v1.2.3)

Signed-off-by: dependabot[bot] <support@github.com>
2020-12-23 11:02:39 +00:00
datalets 62c7e95447
Merge pull request #39 from datalets/dependabot/npm_and_yarn/ini-1.3.7
Bump ini from 1.3.5 to 1.3.7
2020-12-23 12:02:01 +01:00
dependabot[bot] ed78941988
Bump ini from 1.3.5 to 1.3.7
Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.7.
- [Release notes](https://github.com/isaacs/ini/releases)
- [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.7)

Signed-off-by: dependabot[bot] <support@github.com>
2020-12-11 20:18:28 +00:00
datalets 4829847313 form_classname argument on StreamField blocks 2020-12-11 11:46:24 +01:00
datalets 32cb2abca2 2.11 run_before fix 2020-12-11 11:41:26 +01:00
datalets 296625787d Update npm deps, including lodash and websocket-extensions 2020-12-11 11:37:40 +01:00
datalets 38b55fcf63 Updated to Wagtail 2.11 2020-12-11 11:32:59 +01:00
Oleg Lavrovsky b8787941b1 Makefile and extra conf 2020-05-27 15:42:22 +02:00
datalets d8baad94ba
Merge pull request #33 from loleg/master
Frontend updates v0.4.1
2020-05-27 12:36:44 +02:00
Oleg Lavrovsky 18cd60ded3 Add fix to scss 2020-05-27 12:33:57 +02:00
Oleg Lavrovsky 0db6812d84 Updated Bootstrap 3 frontend components 2020-05-27 12:16:55 +02:00
Oleg Lavrovsky c6fe419569 Merge branch 'master' of github.com:loleg/public-health-ch 2020-05-27 11:46:46 +02:00
datalets 5f2b31ecef
Merge pull request #32 from loleg/wagtail-2.8
Wagtail 2.9 upgrade
2020-05-19 14:42:56 +02:00
datalets fb74831390 Added local-loaddata to Makefile 2020-05-19 14:18:36 +02:00
Oleg Lavrovsky 65aae0e87b Updated Makefile 2020-05-18 14:40:26 +02:00
Oleg Lavrovsky 3fe4a8ecae Loaddata command 2020-05-18 14:17:45 +02:00
Oleg Lavrovsky 9e39e199cb Run in background after rebuild 2020-05-18 14:16:38 +02:00
Oleg Lavrovsky 6657d3b7b7 Remove comments model due to django sites error 2020-05-18 14:13:12 +02:00