Commit Graph

91 Commits

Author SHA1 Message Date
Fergal Moran
ae61e384f8 Dunno 2015-08-20 10:04:52 +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
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
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