223 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Fergal Moran	acefac646b	32	2015-12-02 23:47:21 +00:00
Fergal Moran	ff4f36bb2e	32	2015-12-02 23:46:30 +00:00
Fergal Moran	51de2fb91c	Fixed image sizing and display name	2015-12-02 22:56:22 +00:00
Fergal Moran	8d581d78da	Fuck playlists	2015-12-01 00:42:51 +00:00
Fergal Moran	79d3d894ea	Merge tag 'speed_fix' into develop ... asjdasldk	2015-11-19 22:28:46 +00:00
Fergal Moran	28a8114d99	Merge branch 'hotfix/speed_fix'	2015-11-19 22:28:41 +00:00
Fergal Moran	d3b636fe41	Fixed play count slowness	2015-11-19 22:28:34 +00:00
Fergal Moran	ae7f4a14df	Merge branch 'develop'	2015-11-19 20:33:27 +00:00
Fergal Moran	8d3c934c77	Fixed python version in Dockerfile	2015-11-19 19:28:42 +00:00
Fergal Moran	fb0c7f0d6e	Bumped python version	2015-11-18 20:50:20 +00:00
Fergal Moran	1abd03fad8	Merge tag 'user_mixes_missing' into develop ... Fixed some sorting on mixes	2015-11-18 20:39:05 +00:00
Fergal Moran	f30f94e423	Merge branch 'hotfix/user_mixes_missing'	2015-11-18 20:38:54 +00:00
Fergal Moran	a3f2e692ed	Fixed user mix listing	2015-11-18 20:38:51 +00:00
Fergal Moran	e844ca6ed4	Added variable for CDN name	2015-11-16 19:24:46 +00:00
Fergal Moran	1b4640e932	Fixed parameters in post waveform messages	2015-11-13 21:28:13 +00:00
Fergal Moran	2d6acb6281	Fixed comments bug	2015-11-13 20:33:47 +00:00
Fergal Moran	9f03b916d7	Merge branch 'feature/embed' into develop	2015-11-12 23:03:21 +00:00
Fergal Moran	384890727e	Finished	2015-11-12 23:03:19 +00:00
Fergal Moran	01bb6ba49b	Merge tag '2.13.04' into develop ... Release	2015-11-11 22:15:38 +00:00
Fergal Moran	fc0172553d	Merge branch 'release/2.13.04'	2015-11-11 22:15:31 +00:00
Fergal Moran	c6410cbe91	Version bump	2015-11-11 22:15:24 +00:00
Fergal Moran	9aae077784	Merge branch 'feature/pipeline' into develop	2015-11-11 22:14:43 +00:00
Fergal Moran	aed346a897	Finished feature	2015-11-11 22:14:31 +00:00
Fergal Moran	f8b69568e7	Merge branch 'develop'	2015-11-11 00:12:58 +00:00
Fergal Moran	e1ba06955b	Merge conflicts	2015-11-11 00:12:46 +00:00
Fergal Moran	4a98536ddb	Embed kinda done	2015-11-11 00:10:33 +00:00
Fergal Moran	6fbbbc04a5	Added back djworker (for celery)	2015-11-09 21:19:44 +00:00
Fergal Moran	241927380f	Fixed celery start	2015-11-09 20:59:59 +00:00
Fergal Moran	0df0452e4d	Added DEBUG to settings	2015-11-09 20:19:24 +00:00
Fergal Moran	1de167ff0a	Logging to user image	2015-11-09 19:39:46 +00:00
Fergal Moran	8a73a22b68	Moved to gunicorn	2015-11-08 23:24:34 +00:00
Fergal Moran	5ed9a0bd7c	Moved to gunicorn	2015-11-08 22:41:43 +00:00
Fergal Moran	9153ec8d22	Mods	2015-11-08 21:56:09 +00:00
Fergal Moran	bc884efab2	Added migrations to startup	2015-11-08 21:30:46 +00:00
Fergal Moran	60559a55c4	Changes	2015-11-08 21:30:32 +00:00
Fergal Moran	ba79ebe44f	Merge tag '2.13.02' into develop ... git flow release finish '2.13.02'	2015-11-08 21:09:05 +00:00
Fergal Moran	2e34c9592f	Merge branch 'release/2.13.02'	2015-11-08 21:08:59 +00:00
Fergal Moran	50161d7900	Version bump	2015-11-08 21:08:54 +00:00
Fergal Moran	1bef8dd97b	Merge tag 'devsettings' into develop ... iFixxed devsettings	2015-11-08 21:08:05 +00:00
Fergal Moran	1d7904ea7d	Merge branch 'hotfix/devsettings'	2015-11-08 21:07:57 +00:00
Fergal Moran	5beedfa899	Blanked devsettings	2015-11-08 21:07:50 +00:00
Fergal Moran	1d284cf4dc	?	2015-11-08 21:06:54 +00:00
Fergal Moran	e0af6d9b3a	Merge conflicts	2015-11-08 20:39:46 +00:00
Fergal Moran	eda5a2d6c0	Fixed merge conflicts	2015-11-08 20:27:06 +00:00
Fergal Moran	02861ac79e	Version bump	2015-11-08 20:25:41 +00:00
Fergal Moran	f39430d6dd	Fixed merge conflicts	2015-11-08 20:23:28 +00:00
Fergal Moran	73b028e7f0	Fixed chunked backup	2015-11-08 20:22:26 +00:00
Fergal Moran	3981ce288c	Altered backup	2015-11-08 20:17:59 +00:00
Fergal Moran	df75db05a2	Merge conflicts	2015-11-08 20:15:30 +00:00
Fergal Moran	2b6ba4c113	Settings	2015-11-08 19:59:39 +00:00