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
d8c7f82c94
Fixed the 14-days stat being broken.
2019-03-01 23:50:53 +01:00
a67ca0ba9a
Merge branch 'admin-fix' into 'marietje-zuid'
...
Admin fix
See merge request dsprenkels/MarietjeDjango!23
2019-03-01 21:34:39 +01:00
88f709f34c
Admin fix
2019-03-01 21:34:39 +01:00
7f100ac1df
broken admin-search fixed
2019-03-01 19:57:33 +01:00
903cea3033
Merge branch 'marietje-zuid' of gitlab.science.ru.nl:dsprenkels/MarietjeDjango into marietje-zuid
2019-02-28 17:31:01 +01:00
65a77079a7
Merge branch 'percentages' into 'marietje-zuid'
...
Percentages
See merge request dsprenkels/MarietjeDjango!22
2019-02-28 17:22:40 +01:00
2d721bf51a
Percentages
2019-02-28 17:22:40 +01:00
98a8332cb4
Merge branch 'marietje-zuid' of gitlab.science.ru.nl:dsprenkels/MarietjeDjango into marietje-zuid
2019-02-28 16:27:51 +01:00
0f6a69626b
Merge branch 'oslomp/stats_bugfixes' into 'marietje-zuid'
...
Oslomp/stats bugfixes
See merge request dsprenkels/MarietjeDjango!21
2019-02-28 10:45:01 +01:00
3f263ae429
Oslomp/stats bugfixes
2019-02-28 10:45:01 +01:00
25769d40e0
small fixes
2019-02-15 22:58:21 +01:00
530c44affa
bugfixes stats
2019-02-15 22:19:55 +01:00
3c35fc6b6c
merging from rep in production
2019-02-15 17:41:40 +01:00
409c5b2930
Merge branch 'oslomp/MarietjeDjango-improved_stats' into 'marietje-zuid'
...
Oslomp/marietje django improved stats
See merge request dsprenkels/MarietjeDjango!20
2019-02-15 17:04:13 +01:00
6dc36f2092
pylint fixes
2019-02-04 19:53:20 +01:00
1b4108c5d0
fix indentations
2019-01-30 16:47:43 +01:00
add542a5c4
fix merge conflicts
2019-01-30 15:55:10 +01:00
d214d8f72d
Merge branch 'dsprenkels/faster-report-admin' into 'marietje-zuid'
...
reports: Make songs readonly for performance
See merge request dsprenkels/MarietjeDjango!17
2019-01-30 13:57:53 +01:00
4ac3d6e425
reports: Make songs readonly for performance
2019-01-30 13:43:05 +01:00
3c080ced24
Fix bug introduced by 19c1c70
2019-01-30 13:38:35 +01:00
19c1c70cd3
fix all pylint complaints
2019-01-23 19:44:38 +01:00
2c41e85753
ci: Make pylint modules more explicit
2019-01-20 22:36:19 +01:00
14bfa8a9a0
ci: Install django
2019-01-20 22:31:34 +01:00
a40a5c7593
Merge branch 'marietje-zuid' of ssh://gitlab.science.ru.nl/dsprenkels/MarietjeDjango into marietje-zuid
2019-01-20 22:28:45 +01:00
