581e14f7ef
Merge branch 'dsprenkels/issue_15' into 'marietje-zuid'
...
Set all cache TTLs to 2 days
Closes #15
See merge request dsprenkels/MarietjeDjango!39
2019-10-25 19:35:59 +02:00
d0ed0a0a62
Set all cache TTLs to 2 days
...
Fixes #15 .
2019-10-25 19:33:12 +02:00
ce3bfb02d5
Merge branch 'cron' into 'marietje-zuid'
...
Regenerate caches after apply patch
Closes #14
See merge request dsprenkels/MarietjeDjango!38
2019-10-25 19:20:51 +02:00
065f29fe55
gitlab-ci: Regenerate caches after apply patch
...
This commit fixes #14 .
2019-10-25 19:18:54 +02:00
3bdac86bfb
Merge branch 'new_stat' into 'marietje-zuid'
...
Extra statistic: biggest fans
See merge request dsprenkels/MarietjeDjango!37
2019-10-23 21:03:43 +02:00
a864e8f535
Extra statistic: biggest fans
2019-10-23 20:13:12 +02:00
48dd3bd0df
Merge branch 'visual_changes' into 'marietje-zuid'
...
Visual changes
See merge request dsprenkels/MarietjeDjango!36
2019-04-08 18:09:16 +02:00
2fcd827b85
Visual changes
2019-04-08 18:09:14 +02:00
1ca9080017
Merge branch 'bugfix' into 'marietje-zuid'
...
skip-button fix
See merge request dsprenkels/MarietjeDjango!34
2019-04-01 18:41:01 +02:00
7aa9d6ab2a
changed the way it fixes the bug
2019-04-01 18:37:22 +02:00
b4b0d224ce
fix visible skip-button for non-mods
2019-04-01 10:57:48 +02:00
1ec7d817fb
Merge branch 'marietje-zuid' of ssh://gitlab.science.ru.nl/dsprenkels/MarietjeDjango into marietje-zuid
2019-03-31 14:54:01 +02:00
55960dff66
ci: Set --work-dir to MarietjeDjango repo
2019-03-31 14:53:11 +02:00
81ff76a2ef
Merge branch 'dsprenkels/privacy' into 'marietje-zuid'
...
Update privacy statement
See merge request dsprenkels/MarietjeDjango!33
2019-03-31 14:38:46 +02:00
9f72e07a71
privacy: Update context around a15f922 changes
...
Was decided 29/03 by Daan, Gerdriaan, Olaf.
2019-03-31 14:36:57 +02:00
a15f922d49
privacy: Do not delete name
2019-03-29 17:43:54 +01:00
9c40eb228e
ci/deploy: Properly escape $'s
2019-03-29 15:42:01 +01:00
8bc3a288ee
ci/deploy: Pull code instead of push
2019-03-29 15:29:59 +01:00
576ed475f1
ci/deploy: Install git and no pylint deps
2019-03-29 15:11:50 +01:00
639d57d221
ci: Fix .gitlab-ci.yml syntax
2019-03-29 15:06:18 +01:00
2dcd23a28c
ci: Add deploy stage
2019-03-29 15:01:26 +01:00
1c47cfda7c
Merge branch 'dsprenkels/button-nav-class' into 'marietje-zuid'
...
Dsprenkels/button nav class
See merge request dsprenkels/MarietjeDjango!32
2019-03-29 14:32:31 +01:00
00b2609f17
interface: Align button nav with other content
2019-03-29 14:29:24 +01:00
810e071eb4
Revert "Revert "Merge branch 'marietje-zuid-interface' into 'marietje-zuid'""
...
This reverts commit 102874cc86
2019-03-29 14:25:55 +01:00
b8aa4604fd
Merge branch 'revert-e4fcdd74' into 'marietje-zuid'
...
Revert "Merge branch 'marietje-zuid-interface' into 'marietje-zuid'"
See merge request dsprenkels/MarietjeDjango!31
2019-03-28 19:06:57 +01:00
102874cc86
Revert "Merge branch 'marietje-zuid-interface' into 'marietje-zuid'"
...
This reverts merge request !30
2019-03-28 19:05:09 +01:00
e4fcdd7434
Merge branch 'marietje-zuid-interface' into 'marietje-zuid'
...
Marietje zuid interface
See merge request dsprenkels/MarietjeDjango!30
2019-03-28 18:54:46 +01:00
d0c82f33df
Updated interface
...
- added a bar on the top which shows some info
- moved mod buttons to the bar
- added some information about your queue to the bar
- merged the table for current song and full queue
- some more small fixes
2019-03-28 18:54:46 +01:00
568f7c6a50
Add missing migration
2019-03-20 11:31:33 +01:00
bc3488557c
Merge branch 'marietje-zuid' of marietje-zuid.science.ru.nl:/srv/MarietjeDjango into marietje-zuid
2019-03-20 11:26:04 +01:00
22a8c3bd4a
Merge branch 'playlistsongs' into 'marietje-zuid'
...
Make song read-only in admin/playlistsong
See merge request dsprenkels/MarietjeDjango!27
2019-03-20 11:24:22 +01:00
dff15663f4
Merge branch 'dsprenkels/remove_executed' into 'marietje-zuid'
...
Remove executed field from QueueCommand
This change was already added. But accidentally pushed to marietje-zuid. This commit fixes that buggy change.
See merge request dsprenkels/MarietjeDjango!29
2019-03-20 11:22:57 +01:00
fc60135d6c
Merge branch 'dsprenkels/remove_executed' of ssh://gitlab.science.ru.nl/dsprenkels/MarietjeDjango into dsprenkels/remove_executed
2019-03-20 11:20:09 +01:00
0f840c2470
Merge branch 'marietje-zuid' into dsprenkels/remove_executed
2019-03-20 11:19:50 +01:00
9b559cb3f2
Add production requirements.txt in a separate file
2019-03-20 11:18:28 +01:00
bc9108a237
Revert "Update requirements.txt"
...
This reverts commit 6ae7da5797
2019-03-20 11:17:40 +01:00
6d568851d3
Merge branch 'marietje-zuid' into 'dsprenkels/remove_executed'
...
# Conflicts:
# marietje/playerapi/views.py
2019-03-20 11:15:03 +01:00
58b96cb159
Revert "Update requirements.txt"
...
This reverts commit 6ae7da5797
2019-03-20 11:12:59 +01:00
0b1dfaf020
Remove executed field from QueueCommand
2019-03-20 11:09:06 +01:00
6fed97f62c
Remove executed field from QueueCommand
2019-03-20 10:56:44 +01:00
6ae7da5797
Update requirements.txt
2019-03-20 10:32:55 +01:00
be083fecfd
made song read-only
2019-03-06 04:04:54 +01:00
edbbabe657
Merge branch 'marietje-zuid' of gitlab.science.ru.nl:dsprenkels/MarietjeDjango into marietje-zuid
2019-03-05 19:38:08 +01:00
94ebe3465c
Merge branch 'fix/issue-2' into 'marietje-zuid'
...
Correctly save `PlaylistSong.played_at`, fixes #2
Closes #2
See merge request dsprenkels/MarietjeDjango!26
2019-03-05 19:37:37 +01:00
2587ea0fb6
Correctly save PlaylistSong.played_at, fixes #2
2019-03-05 19:37:37 +01:00
347c15d4b9
Merge branch 'marietje-zuid' of gitlab.science.ru.nl:dsprenkels/MarietjeDjango into marietje-zuid
2019-03-05 18:30:02 +01:00
c7f6ee1e61
Merge branch 'revert-289e9375' into 'marietje-zuid'
...
Revert "Merge branch '14-day-stat' into 'marietje-zuid'"
See merge request dsprenkels/MarietjeDjango!25
2019-03-05 18:28:02 +01:00
83b0cdf790
Revert "Merge branch '14-day-stat' into 'marietje-zuid'"
...
This reverts merge request !24
2019-03-05 18:09:45 +01:00
0554b6e059
Merge branch 'marietje-zuid' of gitlab.science.ru.nl:dsprenkels/MarietjeDjango into marietje-zuid
2019-03-05 18:04:55 +01:00
289e93755b
Merge branch '14-day-stat' into 'marietje-zuid'
...
Fixed the 14-days stat being broken.
See merge request dsprenkels/MarietjeDjango!24
2019-03-05 18:04:39 +01:00
