Commit graph

437 commits

Author SHA1 Message Date
64a3d2aab5 Merge branch 'master' into development 2020-08-31 23:09:01 +02:00
b035526848 Fix npm vulnerabilities & update deploy job 2020-08-31 23:08:37 +02:00
af7fbaf1e8 Merge branch 'master' into development 2020-08-31 22:49:14 +02:00
30bd140483 0.2.6
- Fix sorting posts by rule
2020-08-31 22:42:18 +02:00
7ee5ad7879 Merge branch 'post-sorting' into 'development'
Fix post sorting by rule

See merge request sonny/newsreader!36
2020-08-31 22:38:59 +02:00
1429e5a7ec Fix post sorting by rule 2020-08-31 22:38:59 +02:00
e0af3dcc20 Merge branch 'master' into development 2020-08-12 20:40:46 +02:00
c94158a3a6 Make vault file executable 2020-08-12 20:31:43 +02:00
34c5318c42 Update deploy job 2020-08-12 20:22:00 +02:00
52a71a3f4e Fix FeedTask collecting reddit rules & update deploy job 2020-08-12 19:58:59 +02:00
d14aff1baa Update deploy job 2020-08-12 19:48:31 +02:00
03ac016dd3 Fix FeedTask collecting reddit rules 2020-08-12 19:38:16 +02:00
e58c5a4559 Merge branch 'master' into development 2020-08-12 09:54:56 +02:00
128284dca3 Show URL's during feed exceptions & use version number in User-Agent 2020-08-12 09:35:45 +02:00
ad51d17d2d Show feed URL's when catching feed client exceptions 2020-08-12 09:31:50 +02:00
bd9573cebc Show current version number in user agent 2020-08-05 21:39:13 +02:00
285da805cb Merge branch 'master' into development 2020-08-05 21:34:34 +02:00
aff108d7fc Allow using non-annotated tags for version 2020-08-04 22:30:17 +02:00
6fb848d90e Fix wrong url in deploy job 2020-08-04 21:06:54 +02:00
cad6a62a17 Merge branch 'development' into 'master'
Development

See merge request sonny/newsreader!35
2020-08-04 20:56:22 +02:00
a820155fc0 Fix category action test
This was the same test as before -.-
2020-08-04 20:56:22 +02:00
78bc696294 Fix white text in transparent error messages 2020-08-04 20:34:09 +02:00
286971649a Add version number to django settings
Fixes #54
2020-08-04 20:20:28 +02:00
4bca6a432f Fix invalid release job 2020-07-30 23:14:15 +02:00
7adb1cddb8 Add release job & update deploy job 2020-07-30 23:09:46 +02:00
cba167c98c Merge branch 'master' into development 2020-07-29 22:50:14 +02:00
bea0257cae Update CI jobs 2020-07-29 22:47:32 +02:00
7af681887f Update CI jobs 2020-07-29 22:43:42 +02:00
6ff996b674 Merge branch 'master' into development 2020-07-27 22:33:01 +02:00
7dab98ef5a Show error info in rule detail pages 2020-07-27 21:11:31 +02:00
7d803bbfa0 Show rule errors
Fixes #56
2020-07-27 20:56:01 +02:00
5a7222d9a4 Merge branch 'master' into development 2020-07-26 22:10:01 +02:00
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