284 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
fergalmoran	939997b8a5	Fixed 404 on share link..	2013-02-08 09:50:22 +00:00
Fergal Moran	c86cab9b4a	Fixed social image in activity sizing	2013-02-07 20:15:29 +00:00
Fergal Moran	227c089602	Fixed image in activity	2013-02-07 19:33:51 +00:00
Fergal Moran	37122b067e	Added anonymous users to activity feed	2013-02-07 19:30:12 +00:00
Fergal Moran	aa16876b16	Added abc overrides to Mix activities	2013-02-07 19:19:30 +00:00
Fergal Moran	c6130e002e	Added activity to main feed	2013-02-07 19:03:09 +00:00
Fergal Moran	38f20505eb	Merge branch 'master' of https://github.com/fergalmoran/dss	2013-02-07 12:53:23 +00:00
Fergal Moran	919fefd815	Fixed comments api url	2013-02-07 12:52:10 +00:00
fergalmoran	d20543a111	Fixed git conflict in MixResource	2013-01-25 17:39:51 +00:00
fergalmoran	5bafbc0b25	Fixed line ending	2013-01-25 17:37:31 +00:00
Fergal Moran	9fc02b03a1	Fixed broken activity child on MixResource	2013-01-25 17:37:03 +00:00
Fergal Moran	e04015c0d2	Added missing migration	2013-01-25 17:20:41 +00:00
fergalmoran	50a1a4c3c0	Merge branch 'master' of github.com:fergalmoran/dss	2013-01-23 20:01:44 +00:00
fergalmoran	1f754a8dda	Minor change to image URL	2013-01-23 20:01:38 +00:00
Fergal Moran	4946598b57	Updated requirements.txt	2013-01-08 22:56:25 +00:00
Fergal Moran	f9bd5e8119	Changed db user	2013-01-08 22:50:47 +00:00
Fergal Moran	a8b5436b05	Added default initialsettings.py	2013-01-08 22:39:00 +00:00
=	8b7e5637b2	Altered MixResource to use prepend_urls. Temporary for now, need to refactor out to BaseModelResource	2012-12-06 21:47:11 +00:00
Fergal Moran	19297bab1d	Removed supression of override_urls warning as no longer being used.	2012-12-04 21:04:01 +00:00
Fergal Moran	43e7ae6f15	Removed supression of override_urls warning as no longer being used.	2012-12-04 21:01:46 +00:00
Fergal Moran	7b95bb84ee	Code reformat	2012-12-04 20:58:14 +00:00
Fergal Moran	9380aec2f8	Changed base resource to use prepend_urls	2012-12-04 20:50:33 +00:00
Fergal Moran	9ea6a331dd	Removed redundant override_urls call from base api resource.	2012-12-04 20:23:07 +00:00
Fergal Moran	acf7822ccc	Merge remote-tracking branch 'origin/master'	2012-12-03 21:15:55 +00:00
Fergal Moran	871ba55041	Altered paths to glyph icons after bootstrap upgrade	2012-12-03 21:15:18 +00:00
fergalmoran	0a93570d26	Fixed borked resources	2012-12-03 21:08:00 +00:00
Fergal Moran	b85587e7dd	Removed crispy forms references	2012-12-03 21:02:06 +00:00
fergalmoran	126e5e693b	Farting about with tastypie	2012-12-03 20:41:06 +00:00
Fergal Moran	2173b6980e	Housekeeping	2012-12-03 19:34:29 +00:00
Fergal Moran	2d3557ba36	Updated .gitignore and removed some cruft	2012-12-03 19:28:07 +00:00
Fergal Moran	de88606191	Added some missing files	2012-12-03 19:15:26 +00:00
Fergal Moran	96ff1bbf3d	Added missing packages to requirements.txt	2012-12-03 19:14:38 +00:00
Fergal Moran	83e90d2383	Interim commit to get polymorphic migrations working	2012-12-03 19:00:32 +00:00
Fergal Moran	8c521099eb	Changed to use avatar image for missing mix images	2012-11-20 20:45:39 +00:00
Fergal Moran	4db7565830	Fixed non-custom thumbnails	2012-11-20 20:19:44 +00:00
Fergal Moran	58d8b728e2	Fixed thumbnail generation	2012-11-20 20:14:06 +00:00
fergalmoran	9e0516d9e4	Fixed invalid mix listing with dodgy image URL	2012-10-30 10:03:25 +00:00
Fergal Moran	0069bd500a	Fixed invalid URL handling with infiniscroll	2012-10-27 23:18:25 +01:00
fergalmoran	508313ad16	Fixed slugify in UserProfile	2012-10-27 23:12:36 +01:00
Fergal Moran	e76f6ab196	Added profile link under mix image in mix listing	2012-10-27 21:09:47 +01:00
fergalmoran	fbb3195b32	Remove merge conflicts	2012-10-27 19:22:53 +01:00
Fergal Moran	82b4bb6700	Removed test code from _MixItemInsert	2012-10-27 19:05:03 +01:00
Fergal Moran	830a4b8806	Merge remote-tracking branch 'origin/master'	2012-10-27 19:04:10 +01:00
Fergal Moran	f0d783f508	Removed test code from _MixItemInsert	2012-10-27 19:03:55 +01:00
fergalmoran	b5078d9fab	Merge branch 'master' of github.com:fergalmoran/dss ... Conflicts: spa/api/v1/MixResource.py	2012-10-27 18:29:24 +01:00
fergalmoran	0cb1425a58	Fixed typo	2012-10-27 17:57:12 +01:00
Fergal Moran	e98519493c	Fixed typo in api	2012-10-27 17:56:17 +01:00
Fergal Moran	c09598f3eb	Fixed typo in api	2012-10-27 17:52:01 +01:00
fergalmoran	f475e67615	Added missing migration	2012-10-27 17:16:28 +01:00
fergalmoran	52a0aff32c	Added MixDownload.py	2012-10-27 17:15:32 +01:00