Commit graph

405 commits

Author SHA1 Message Date
fd432a87d1 Merge branch 'development' into 'master'
Various improvements

See merge request sonny/newsreader!33
2020-07-26 21:45:51 +02:00
b25cdcf4db Fix category action test
This was the same test as before -.-
2020-07-26 21:45:51 +02:00
a1c11baa3d Update table row error styling 2020-07-26 21:23:19 +02:00
fd16478909 Update rule table styling 2020-07-26 19:41:17 +02:00
6a13c58712 Show icons instead of boolean values in rules table
Fixes #58
2020-07-26 19:02:51 +02:00
629b35b69b Update post modal list styling
Fixes #60
2020-07-26 18:39:49 +02:00
c04f23b3ee Dont't overwrite default checkbox
This caused issues in the admin
2020-07-26 18:33:52 +02:00
2b10612304 Add branding to admin 2020-07-26 12:32:22 +02:00
c52c30fb08 Update default fixture 2020-07-26 12:03:30 +02:00
632b3b14f1 Extend UserAdmin
To allow changing password
2020-07-26 11:57:48 +02:00
ac9e6a7224 Remove rounded component styling 2020-07-25 22:11:41 +02:00
5ec7239a1b Merge branch 'master' into development 2020-07-25 16:55:50 +02:00
f513a494d9 Merge branch 'development' into 'master'
Fix multiline yaml

See merge request sonny/newsreader!32
2020-07-25 16:55:23 +02:00
9d6a79d55d 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-07-25 16:55:23 +02:00
2d640eac04 Merge branch 'master' into development 2020-07-25 16:54:18 +02:00
4df50b3a16 Fix multiline yaml statement 2020-07-25 16:53:13 +02:00
96422a1532 Merge branch 'development' into 'master'
0.2.4.4

- Update deploy job

See merge request sonny/newsreader!31
2020-07-25 16:40:37 +02:00
2a40311a87 Update deploy job 2020-07-25 16:40:37 +02:00
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