112 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Fergal Moran	713ce6c7fb	Stuff	2015-08-18 22:49:40 +01:00
Fergal Moran	4d394a40e0	Fixed invalid userprofile request	2015-08-18 22:41:44 +01:00
Fergal Moran	b150381c94	Merge branch 'develop'	2015-08-18 21:52:59 +01:00
Fergal Moran	139e23d4c0	Update to django 1.8	2015-08-18 21:52:47 +01:00
Fergal Moran	49c78ab242	Fixed settings	2015-08-18 20:48:28 +01:00
Fergal Moran	ff80c00700	Popped changes	2015-08-18 19:58:12 +01:00
Fergal Moran	17d045249e	Merge branch 'feature/messaging' into develop	2015-08-16 22:34:22 +01:00
Fergal Moran	1486bbd1f6	Realtime messaging enabled	2015-08-16 22:31:51 +01:00
Fergal Moran	b1c1662054	Merge branch 'master' into feature/messaging	2015-08-13 20:41:27 +01:00
Fergal Moran	05460eb0e4	Added date to create notification	2015-08-13 20:37:03 +01:00
Fergal Moran	038737d918	Added initial model	2015-08-13 20:36:02 +01:00
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