Commit graph

437 commits

Author SHA1 Message Date
2e56d3208b Update deploy job 2020-07-25 16:35:28 +02:00
96f016260d Merge branch 'master' into development 2020-07-22 23:51:10 +02:00
1cae7e0b06 Merge branch 'development' into 'master'
0.2.4.3

See merge request sonny/newsreader!30
2020-07-22 23:49:18 +02:00
a6827e604d 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-07-22 23:49:18 +02:00
e73edd5083 Adjust reddit token expiry loglevel
Fixes #51
2020-07-22 23:39:37 +02:00
a3a812b949 Merge branch 'fix-reddit-form-urls' into 'development'
Fix reddit form urls

Closes #53

See merge request sonny/newsreader!29
2020-07-22 23:29:23 +02:00
9a212c6288 Fix reddit form urls 2020-07-22 23:29:23 +02:00
0f5e9e7fca Fix post modal rules not linking properly 2020-07-22 22:56:00 +02:00
296202b69f Merge branch 'fix-reddit-post-urls' into 'development'
Fix reddit post urls

Closes #52

See merge request sonny/newsreader!28
2020-07-22 22:50:17 +02:00
863e8671da Fix reddit post urls 2020-07-22 22:50:17 +02:00
21dff8eb15 Show reddit images/videos or a direct url whenever possbile 2020-07-21 23:04:16 +02:00
b5b174a213 Merge branch 'master' into development 2020-07-13 23:48:00 +02:00
ec45a661e5 Merge branch 'development' into 'master'
0.2.4.2

- Fix reddit duplicate posts

See merge request sonny/newsreader!27
2020-07-13 23:18:52 +02:00
e8947d1182 Squashed commit of the following:
commit 99fd94580f95dcbfb77b73e2de846f76a5709ef9
Author: Sonny <sonnyba871@gmail.com>
Date:   Sat Feb 15 21:45:16 2020 +0100

    Use postgres password

    As of https://gitlab.com/gitlab-com/support-forum/issues/5199
2020-07-13 23:18:52 +02:00
ed8584603e Deduplicate reddit posts 2020-07-13 23:14:43 +02:00
24b1704da6 Update subreddit helptext 2020-07-12 22:33:40 +02:00
5ce5c5cfe1 Set reddit callback url through env var 2020-07-12 22:26:49 +02:00
046117cfb3 Merge branch 'master' into development 2020-07-12 21:09:49 +02:00
fb03d6b86f Merge branch 'development' into 'master'
0.2.4.1

- Fix Reddit redirect url

See merge request sonny/newsreader!26
2020-07-12 20:56:47 +02:00
7d28dd854f Squashed commit of the following:
commit 99fd94580f95dcbfb77b73e2de846f76a5709ef9
Author: Sonny <sonnyba871@gmail.com>
Date:   Sat Feb 15 21:45:16 2020 +0100

    Use postgres password

    As of https://gitlab.com/gitlab-com/support-forum/issues/5199
2020-07-12 20:56:47 +02:00
7cef924c37 Fix reddit redirect url 2020-07-12 20:52:56 +02:00
e57a4c656d Merge branch 'master' into development 2020-07-12 20:50:28 +02:00
854d086340 Merge branch 'development' into 'master'
0.2.4

- Add Reddit integration
- Fix admin favicon

See merge request sonny/newsreader!25
2020-07-12 20:26:14 +02:00
177755e302 Squashed commit of the following:
commit 99fd94580f95dcbfb77b73e2de846f76a5709ef9
Author: Sonny <sonnyba871@gmail.com>
Date:   Sat Feb 15 21:45:16 2020 +0100

    Use postgres password

    As of https://gitlab.com/gitlab-com/support-forum/issues/5199
2020-07-12 20:26:14 +02:00
d4b58624d6 Fix favicon not showing in admin 2020-07-12 20:22:23 +02:00
ec72827bd8 Merge branch '25-sub-reddit-integration' into 'development'
Resolve "(Sub)Reddit integration"

Closes #25

See merge request sonny/newsreader!13
2020-07-12 20:10:57 +02:00
6ce013d0d4 Add reddit integration 2020-07-12 20:10:57 +02:00
6f30571dd1 Merge branch 'master' into development 2020-06-30 22:58:52 +02:00
391796a0c0 0.2.3.10
- Fixed tasks using disabled rules
2020-06-30 22:57:49 +02:00
03d673e6c0 Fixed task passing through disabled rules 2020-06-30 20:27:17 +02:00
78608b2b57 Merge branch 'master' into development 2020-06-29 21:28:43 +02:00
04043fbe98 0.2.3.9
-Ugh this should be fixed now
2020-06-29 21:06:38 +02:00
2254f22023 0.2.3.8
-Update logging configuration
-Fix sentry import error
2020-06-29 20:57:35 +02:00
fcf49fa123 Update logging calls 2020-06-29 20:54:46 +02:00
73ddb785e0 Update logging 2020-06-29 20:42:58 +02:00
3c080e1300 Merge branch 'master' into development 2020-06-28 23:37:35 +02:00
1993338120 0.2.3.7
- Add optional sentry integration
2020-06-28 20:42:44 +02:00
6661b69094 Optionally load sentry 2020-06-28 20:35:58 +02:00
eb09c4f729 Merge branch 'master' into development 2020-06-18 20:31:56 +02:00
2be35bce53 0.2.3.6
- Update logging
- Update FeedDuplicateHandler
2020-06-18 20:29:48 +02:00
017dd9a582 Make poetry/pip less verbose 2020-06-18 20:23:47 +02:00
bcd051e992 Update logging 2020-06-18 20:18:05 +02:00
a46b6fade5 Merge branch 'update-duplicate-handler' into 'development'
Update duplicate handler

See merge request sonny/newsreader!24
2020-06-18 20:07:37 +02:00
0bd47f1bb0 Update duplicate handler 2020-06-18 20:07:37 +02:00
68bba5f835 Merge branch 'master' into development 2020-06-16 21:22:31 +02:00
00f6427c57 0.2.3.5
- Fix sidebar category overflow
2020-06-16 21:04:49 +02:00
722afe8c12 Fix sidebar category overflow 2020-06-16 20:56:38 +02:00
083f728404 Use celery configuration similar to production 2020-06-16 20:48:21 +02:00
c8771cb272 Update post admin 2020-06-16 09:24:52 +02:00
d3ccc16f81 Merge branch 'master' into development 2020-06-16 09:07:16 +02:00