142 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Fergal Moran	d51919ffdd	Remove dbbackup (killing docker build)	2015-10-11 14:36:54 +01:00
Fergal Moran	dcfb843da0	Added beautiful soup to requirements	2015-10-11 14:32:13 +01:00
Fergal Moran	3fd1ebd1e0	Merge branch 'feature/radio_player' into develop	2015-10-11 13:45:55 +01:00
Fergal Moran	5f6b0fd6cf	Added metadata to radio	2015-10-11 13:45:49 +01:00
Fergal Moran	e51176cbe0	Added radio api endpoint	2015-10-07 21:47:08 +01:00
Fergal Moran	4d95a27fde	Merge branch 'develop' into feature/radio_player	2015-10-07 21:02:18 +01:00
Fergal Moran	6dd662271b	Pre merge	2015-10-07 21:01:40 +01:00
Fergal Moran	b715a7f40e	Added random param to mix api	2015-10-02 20:13:48 +01:00
Fergal Moran	5de88ed688	Merge tag 'wave_management' into develop ... Fixed waveform management command chain	2015-09-30 22:08:43 +01:00
Fergal Moran	0a9e194306	Merge branch 'hotfix/wave_management'	2015-09-30 22:08:36 +01:00
Fergal Moran	f918408fb2	Fixed waveform management command chain	2015-09-30 22:08:30 +01:00
Fergal Moran	bf342ffbe6	Merge tag 'port_change' into develop ... Changed port to 8001	2015-09-25 20:10:50 +01:00
Fergal Moran	bf2f7d9edc	Merge branch 'hotfix/port_change'	2015-09-25 20:10:43 +01:00
Fergal Moran	fa6474c413	Changed port to 8001	2015-09-25 20:10:38 +01:00
Fergal Moran	6633dfa5c5	Commented auto-facebook share	2015-09-20 17:09:10 +01:00
Fergal Moran	086fac87bc	Merge tag 'azure_header_extension' into develop ... Added mp3 extension	2015-09-17 21:34:26 +01:00
Fergal Moran	6a799acffa	Merge branch 'hotfix/azure_header_extension'	2015-09-17 21:34:19 +01:00
Fergal Moran	c0067cca0f	Added mp3 extension	2015-09-17 21:34:16 +01:00
Fergal Moran	1b244303eb	Merge tag 'login_500' into develop ... Non fix	2015-09-17 21:23:35 +01:00
Fergal Moran	8429c1efd0	Fixed some backup stuff	2015-09-17 21:04:57 +01:00
Fergal Moran	c23a46393c	Fixed backup management command	2015-09-13 22:55:27 +01:00
Fergal Moran	6bb00b55b8	Merge branch 'develop'	2015-09-13 21:04:27 +01:00
Fergal Moran	fd92a9062b	Fixed userprofile	2015-09-13 21:03:51 +01:00
Fergal Moran	ed0502a217	Added backup management command	2015-09-13 19:14:00 +01:00
Fergal Moran	b0aa02a632	Merge branch 'feature/scheduler' into develop	2015-09-13 14:54:03 +01:00
Fergal Moran	42b30b8e3a	Updated azure headers management command	2015-09-13 14:53:52 +01:00
Fergal Moran	a87ebafdfa	Merge tag 'notification_text' into develop ... Fixed notifiction update	2015-09-04 22:18:53 +01:00
Fergal Moran	b2f6be7bea	Merge branch 'hotfix/notification_text'	2015-09-04 22:18:42 +01:00
Fergal Moran	0a837b0a8b	Fixed notifications	2015-09-04 22:18:40 +01:00
Fergal Moran	26dd4d71df	Removed messages from notifications	2015-09-04 21:43:10 +01:00
Fergal Moran	f6dc97c1c8	Fixed low jwt timeout	2015-09-04 20:03:51 +01:00
Fergal Moran	51568f79dd	Fixed re-link of mix upload	2015-09-04 19:56:30 +01:00
Fergal Moran	9866cf4a94	Merge tag 'login_expiry' into develop ... Seems to work?	2015-08-31 19:34:45 +01:00
Fergal Moran	73c3c6078a	Fixes to waveform callback and cdn tidy	2015-08-28 20:42:14 +01:00
Fergal Moran	a0f1208ded	Fixed urllib	2015-08-26 21:15:18 +01:00
Fergal Moran	5966331b0b	Fixed get_avatars command	2015-08-26 21:01:53 +01:00
Fergal Moran	f9c9d987ea	Fixed null middleware import GAAAAAAHHHHHHHHHHgit add .git add .	2015-08-26 20:39:24 +01:00
Fergal Moran	687a00e320	Added version to dropbox requirement	2015-08-25 20:35:20 +01:00
Fergal Moran	505ad537b7	Added django-recurrence to requirements	2015-08-24 23:40:29 +01:00
Fergal Moran	7989af7af3	Fixed CDN upload	2015-08-24 22:59:30 +01:00
Fergal Moran	45e345c9d0	Merge conflicts	2015-08-20 21:12:18 +01:00
Fergal Moran	db3dc6f3dc	Fixed docker python version	2015-08-20 16:41:31 +01:00
Fergal Moran	da374d7a48	Added rsync to dockerfile	2015-08-20 15:55:57 +01:00
Fergal Moran	8fc0ba6090	Merge conflicts	2015-08-20 15:49:46 +01:00
Fergal Moran	a5fbcd0238	Added backup script	2015-08-20 15:48:35 +01:00
Fergal Moran	23a2e1bc7e	Added initial migration	2015-08-20 15:45:51 +01:00
Fergal Moran	d7f952569c	Python 3 upgrade	2015-08-20 15:45:36 +01:00
Fergal Moran	f5be1d3f7b	Merge conflicts	2015-08-20 11:20:40 +01:00
Fergal Moran	dfa82d4e76	Python 3 upgrade finished	2015-08-20 11:18:53 +01:00
Fergal Moran	ae61e384f8	Dunno	2015-08-20 10:04:52 +01:00