 Gerdriaan Mulder
|
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 |
|
|
Gerdriaan Mulder
|
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 |
|
|
Gerdriaan Mulder
|
2587ea0fb6
|
Correctly save PlaylistSong.played_at, fixes #2
|
2019-03-05 19:37:37 +01:00 |
|
|
Gerdriaan Mulder
|
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 |
|
|
Gerdriaan Mulder
|
83b0cdf790
|
Revert "Merge branch '14-day-stat' into 'marietje-zuid'"
This reverts merge request !24
|
2019-03-05 18:09:45 +01:00 |
|
|
Gerdriaan Mulder
|
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 |
|
|
Gerdriaan Mulder
|
a67ca0ba9a
|
Merge branch 'admin-fix' into 'marietje-zuid'
Admin fix
See merge request dsprenkels/MarietjeDjango!23
|
2019-03-01 21:34:39 +01:00 |
|
|
Gerdriaan Mulder
|
65a77079a7
|
Merge branch 'percentages' into 'marietje-zuid'
Percentages
See merge request dsprenkels/MarietjeDjango!22
|
2019-02-28 17:22:40 +01:00 |
|
|
Gerdriaan Mulder
|
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 |
|
|
Gerdriaan Mulder
|
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 |
|