Commit graph

405 commits

Author SHA1 Message Date
7fc899937d Refactor much needed docker setup
- Build static files inside seperate container
- Remove unnecessary env variables
2020-05-02 20:21:22 +02:00
d61b3a9498 Merge branch 'master' into development 2020-04-26 21:29:15 +02:00
428cd39d13 0.2.2.1
- Update logging settings
- Add admins setting
2020-04-26 21:28:29 +02:00
57e9073f6b Allow admins to be specified through env variables 2020-04-26 21:17:55 +02:00
62da6e0d8e Fix wrong axes handler 2020-04-26 21:12:02 +02:00
b811d1945b Update logging 2020-04-26 21:06:29 +02:00
3152254f43 Merge branch 'master' into development 2020-04-22 23:16:05 +02:00
14d484ea3e Merge branch 'development' into 'master'
0.2.2

See merge request sonny/newsreader!15
2020-04-22 23:15:36 +02:00
d34cc5d507 0.2.2 2020-04-22 23:15:36 +02:00
e9f05868c1 Update data migration 2020-04-22 23:11:24 +02:00
708076b2ab Change collection task to class based task & update behavior 2020-04-22 23:04:53 +02:00
992df528f6 Merge branch 'master' into development 2020-04-19 21:26:22 +02:00
85d0d6a721 0.2.1 2020-04-19 21:25:58 +02:00
6ff26c71a0 Update navbar styling 2020-04-19 21:13:38 +02:00
9b56cf53e3 Merge branch '44-error-pages' into 'development'
Resolve "Error pages"

Closes #44

See merge request sonny/newsreader!14
2020-04-19 20:59:14 +02:00
6f00da37b9 Resolve "Error pages" 2020-04-19 20:59:14 +02:00
cac71d5475 Merge branch 'master' into development 2020-04-15 22:08:17 +02:00
18479a3f56 0.2 release 2020-04-15 22:07:12 +02:00
7d86cea6ec Update project / gitlab ci settings 2020-04-15 21:59:34 +02:00
e495d7c188 Use poetry for dependency management 2020-04-13 17:06:31 +02:00
cda2654573 Merge branch '41-javascript-error-handling' into 'development'
Resolve "Javascript error handling"

Closes #41

See merge request sonny/newsreader!12
2020-04-11 09:49:08 +02:00
ae942f5ef9 Fix category action test
This was the same test as before -.-
2020-04-11 09:49:07 +02:00
73ae0271e4 Update npm commands 2020-03-25 22:38:56 +01:00
66408cc218 Merge branch '42-replace-gulp-with-webpack' into 'development'
Resolve "Replace Gulp with Webpack"

Closes #42

See merge request sonny/newsreader!11
2020-03-25 22:24:32 +01:00
b28d42b97b Resolve "Replace Gulp with Webpack" 2020-03-25 22:24:32 +01:00
16230a11f3 Merge branch '39-celery-task-deduplication' into 'development'
Resolve "Celery task deduplication"

Closes #39

See merge request sonny/newsreader!10
2020-03-24 19:40:33 +01:00
a3a2033e37 Resolve "Celery task deduplication" 2020-03-24 19:40:33 +01:00
7c888c1461 Merge branch 'new-icons' into 'development'
Icon refactor

See merge request sonny/newsreader!8
2020-03-22 22:26:14 +01:00
ab5d9ea46d Icon refactor 2020-03-22 22:26:14 +01:00
dc2fb681d0 Merge branch '40-set-default_from_email' into 'development'
Resolve "Set DEFAULT_FROM_EMAIL"

Closes #40

See merge request sonny/newsreader!9
2020-03-22 20:55:11 +01:00
fdb90525a8 Set default_from_email 2020-03-22 20:50:51 +01:00
6bfb84dab9 Remove manual tag & multiline statement 2020-03-22 20:27:15 +01:00
b5b59c5baf Remove deploy_hosts 2020-03-22 20:18:28 +01:00
770ace2f5d Set correct file permissions 2020-03-22 19:24:26 +01:00
f6100416c3 Add (known) ssh host key 2020-03-22 19:17:54 +01:00
99ba773b91 Another attempt 2020-03-22 19:03:37 +01:00
fdec1efcf0 Attempt 2 2020-03-22 18:50:40 +01:00
9ecca7a80b Install git in deploy stage 2020-03-22 18:41:00 +01:00
e4e4e97cfd Add a deployment stage 2020-03-22 18:34:05 +01:00
420481f18a Squashed commit of the following:
commit f1db9b9dc1026760a43028e548572db4e639976e
Author: Sonny <sonnyba871@gmail.com>
Date:   Mon Mar 16 20:47:15 2020 +0100

    Add port setting
2020-03-20 21:58:22 +01:00
4da301eb3e Add production settings 2020-03-15 21:10:10 +01:00
4345a006a6 Merge branch 'fix-data-error' into 'development'
Fix data errors

See merge request sonny/newsreader!7
2020-03-05 00:02:40 +01:00
533561ba1e Fix data errors 2020-03-05 00:02:40 +01:00
afc3c11775 Set celery logging level 2020-03-02 23:34:57 +01:00
8b47fd8216 Merge branch '28-swagger-response-examples' into 'development'
Resolve "Swagger response examples"

Closes #28

See merge request sonny/newsreader!6
2020-03-02 20:14:38 +01:00
a87d4f387f Replace rest_framework_swagger with drf_yasg
rest_framework is deprecated see https://github.com/marcgibbons/django-rest-swagger#django-rest-swagger-deprecated-2019-06-04
2020-03-02 20:14:38 +01:00
acd9bd30cb Update isort 2020-03-01 22:35:48 +01:00
c22fdfe4ce More formatting ugh 2020-03-01 22:31:03 +01:00
21b9e4f0fd Set black to default line length (88) 2020-03-01 22:25:47 +01:00
a5de001f35 Apply hooks 2020-03-01 22:17:09 +01:00