81 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Fergal Moran	232e8efc19	Merge branch 'master' into develop	2015-08-13 20:10:25 +01:00
Fergal Moran	1b76a08170	Fixed migrations	2015-08-12 23:12:43 +01:00
Fergal Moran	a8292b621c	Cleaned up notifications	2015-08-12 20:41:16 +01:00
Fergal Moran	275ca511e2	Fixed waveform flow and socket.io push	2015-08-10 21:25:13 +01:00
Fergal Moran	9766ba2c4c	Altered content management command	2015-08-07 11:32:56 +01:00
Fergal Moran	cb1a08ce5e	Fixed api url	2015-08-03 22:27:53 +01:00
Fergal Moran	967f0d0d2a	Made avatar images local again	2015-08-03 20:53:07 +01:00
Fergal Moran	bacb9b5e2e	Fixed type in kwargs extraction	2015-08-02 15:56:50 +01:00
Fergal Moran	baa2d87ec0	Added path as parameter to waveform_generated_signal	2015-08-02 15:37:19 +01:00
Fergal Moran	4b181d8482	Fixed basemodel static url	2015-07-31 23:32:10 +01:00
Fergal Moran	058e01cbe1	Removed unused imports	2015-07-31 22:59:48 +01:00
Fergal Moran	fa9c6ba3d7	Fixed media serving	2015-07-31 22:53:15 +01:00
Fergal Moran	0b7d65e716	Fixed mix image url	2015-07-30 22:27:30 +01:00
Fergal Moran	c636c4afa2	Updated some CDN urls	2015-07-30 22:06:43 +01:00
Fergal Moran	71fa592f4b	Fixed some celery stuff	2015-07-29 21:49:53 +01:00
Fergal Moran	66a8195141	Removed djcelery	2015-07-29 17:11:22 +01:00
Fergal Moran	671ec9bf3d	Fixed some waveform/cdn stuff	2015-07-29 16:48:31 +01:00
Fergal Moran	4d3353e396	Fixed wave generation	2015-07-29 12:01:32 +01:00
Fergal Moran	535b60759b	Added bin dir	2015-07-28 22:40:41 +01:00
Fergal Moran	8f300d264d	Merge conflicts	2015-07-28 22:05:13 +01:00
Fergal Moran	364ad61431	Updated tasks	2015-07-28 22:04:38 +01:00
Fergal Moran	bcf0b37f81	Altered some celery stuff	2015-07-28 22:03:30 +01:00
Fergal Moran	a6e70a929f	Added untracked	2015-07-27 22:05:38 +01:00
Fergal Moran	0d69cda5b1	Merge branch 'master' of github.com:fergalmoran/dss.api	2015-07-27 22:05:05 +01:00
Fergal Moran	de4ac4dadd	Celery and stuff	2015-07-27 22:04:57 +01:00
Fergal Moran	8e0d15399f	Azure all the things	2015-07-27 22:04:10 +01:00
Fergal Moran	69c779c90e	Altered logging	2015-07-26 21:06:14 +01:00
Fergal Moran	cb14778dfe	Fixed typo	2015-07-26 20:48:32 +01:00
Fergal Moran	d4cfae3add	Fixed console logging	2015-07-26 20:43:24 +01:00
Fergal Moran	6f262f1ec5	Merge branch 'master' of github.com:fergalmoran/dss.api	2015-07-26 16:43:00 +01:00
Fergal Moran	5f61fb280c	Altered settings	2015-07-26 16:42:57 +01:00
Fergal Moran	09c3177de6	Merge branch 'master' of github.com:fergalmoran/dss.api	2015-07-26 16:42:00 +01:00
Fergal Moran	ffddf5101c	Settings changes and logging	2015-07-26 16:41:38 +01:00
Fergal Moran	70b627d59f	Fixed settings import	2015-07-26 00:48:04 +01:00
Fergal Moran	59cb70b120	Added var for redis host	2015-07-26 00:34:18 +01:00
Fergal Moran	a98f3731ee	Pre docker commit	2015-07-24 19:32:43 +01:00
Fergal Moran	df4d14a6f7	Added docker files	2015-07-23 18:23:43 +00:00
Fergal Moran	3b19f19708	Removed 500 handler	2015-07-19 22:08:16 +01:00
Fergal Moran	ec1c744148	Added richer payload to redis post	2015-07-19 21:40:16 +01:00
Fergal Moran	013d0f37be	Extended JWT expiry time	2015-07-17 23:58:16 +01:00
Fergal Moran	60907f2db0	Upped JWT expiration to 30 minutes	2015-07-17 20:29:12 +01:00
Fergal Moran	bd0cf82254	Merge tag '2.1.0' into develop ... 2.1.0	2015-07-13 22:51:58 +01:00
Fergal Moran	10408a10fe	Merge branch 'release/2.1.0'	2015-07-13 22:51:45 +01:00
Fergal Moran	f0f8c1986d	JWT implemented and hopefully more stable logins	2015-07-13 22:49:47 +01:00
Fergal Moran	33e0e58b5e	Pre feature branch	2015-07-12 15:06:49 +01:00
Fergal Moran	deee17c1b1	Altered log settings	2015-07-01 21:06:43 +01:00
Fergal Moran	e3f9b8b791	Added extra logging to social redirect	2015-07-01 20:38:43 +01:00
Fergal Moran	4a13fd4b0f	Changed DATABASE ADMINUSER to db user	2015-06-30 19:35:31 +01:00
Fergal Moran	de754dd18d	Fixed following	2015-06-26 21:47:48 +01:00
Fergal Moran	dab636a514	FuckedIfIKnow	2015-06-22 22:46:41 +01:00