Commit Graph

204 Commits

Author SHA1 Message Date
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
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