Commit Graph

223 Commits

Author SHA1 Message Date
Fergal Moran
41362ee1f1 Pre-merge 2015-11-08 19:45:45 +00:00
Fergal Moran
82494e4b23 Pre-merge 2015-11-08 19:39:19 +00:00
Fergal Moran
2c38baf18a Stuff 2015-11-08 19:17:18 +00:00
Fergal Moran
fcfc1044c0 Initial scaffolding 2015-11-01 17:19:51 +00:00
Fergal Moran
7391247f01 Merge conflicts 2015-11-01 17:03:14 +00:00
Fergal Moran
d53c90486e Settings changes 2015-11-01 17:02:43 +00:00
Fergal Moran
08241d3127 Changed azure import 2015-11-01 16:13:00 +00:00
Fergal Moran
a38401efe2 Added redis host to settings 2015-10-30 22:47:04 +00:00
Fergal Moran
124a3c31bd Fixed broken keys 2015-10-30 22:12:43 +00:00
Fergal Moran
6e0b118cd8 Fixed waveform url 2015-10-29 21:52:06 +00:00
Fergal Moran
c3a94b2104 Added storage settings 2015-10-29 20:58:53 +00:00
Fergal Moran
3f49076251 Mod gitignore 2015-10-28 21:07:29 +00:00
Fergal Moran
0b5995a11e Added localsettings 2015-10-28 21:07:06 +00:00
Fergal Moran
bd10dce7f4 Moved secrets to env file 2015-10-28 20:45:47 +00:00
Fergal Moran
462074664e Removed azure uninstall 2015-10-25 20:53:51 +00:00
Fergal Moran
2d883f5eb0 Merge branch 'feature/radio_admin' into develop 2015-10-19 21:06:56 +01:00
Fergal Moran
8434b49667 Fixed post flow 2015-10-19 21:06:54 +01:00
Fergal Moran
2013130458 Fixed some db stuff and fuck up 2015-10-19 19:10:48 +01:00
Fergal Moran
25bd272b6d Removed broken user agents package 2015-10-15 21:01:00 +01:00
Fergal Moran
fbcbe32b57 Merge tag 'backup_timeout' into develop
Increased pexpect timeout in backup management command
2015-10-15 20:26:17 +01:00
Fergal Moran
65fa628f09 Merge branch 'hotfix/backup_timeout' 2015-10-15 20:26:03 +01:00
Fergal Moran
0e2cdeb426 Increased pexpect timeout 2015-10-15 20:26:01 +01:00
Fergal Moran
e5fc34ed47 Pre switch 2015-10-15 20:03:32 +01:00
Fergal Moran
d5b53c2686 Fixy uppy thingy 2015-10-13 19:21:06 +01:00
Fergal Moran
0d6f3a1a40 Fixed radio check 2015-10-11 18:40:58 +01:00
Fergal Moran
e3736f6fb1 Fixed azure renames 2015-10-11 16:11:25 +01:00
Fergal Moran
d035975f32 Azure gone bonkers? 2015-10-11 15:35:15 +01:00
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
c303a5ce9f Some celery stuff 2015-09-25 19:10:40 +01:00
Fergal Moran
8d9c2623c8 Added celery schedules 2015-09-25 19:01:26 +01:00
Fergal Moran
d446711391 Added celerybeat 2015-09-20 19:30:16 +01:00
Fergal Moran
261e547202 Initial 10 second schedule 2015-09-20 17:25:00 +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