337 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Schuyler Erle	3aae781761	Add apache config.	2011-09-02 09:46:30 +02:00
Schuyler Erle	add230cd03	Add feature_json() view.	2011-09-01 23:07:03 -07:00
Schuyler Erle	958264127a	Fix time frame links	2011-09-01 16:58:27 -07:00
Schuyler Erle	eb9ee6965c	cleanup search_json a bit	2011-09-01 16:56:02 -07:00
Karen	494947c15b	buttons	2011-09-01 20:44:26 +05:30
Karen	65b51bb1ab	remove admin panel	2011-09-01 20:21:21 +05:30
Karen	0ce5d3ae97	alignment	2011-09-01 20:14:28 +05:30
Karen	7e946b11d1	changes alignment	2011-09-01 20:07:35 +05:30
Karen	bf367853af	alignment changes	2011-09-01 19:59:07 +05:30
Karen	adfa773d52	next previous	2011-09-01 19:36:56 +05:30
Karen	c36f2bc298	changes in next previous	2011-09-01 19:33:32 +05:30
Karen	ae37d9695b	alignment of next and previous	2011-09-01 19:28:25 +05:30
Schuyler Erle	0bcd71fbfd	merge	2011-09-01 03:44:15 -07:00
Schuyler Erle	b4909e161c	Return is_primary to True if removing a "conflates" relation.	2011-09-01 03:43:06 -07:00
Karen	c97878eabf	added login details again	2011-09-01 15:49:47 +05:30
Schuyler Erle	171caadf0d	find() returns only records with is_primary=True.	2011-09-01 03:18:13 -07:00
Schuyler Erle	4d578c156d	Add flexible threshold, bump up max_distance a bit.	2011-09-01 09:31:55 +02:00
Schuyler Erle	0a4bae4b43	Make the relations all work.	2011-09-01 09:19:46 +02:00
Schuyler Erle	dcccbb3f66	Fixup Sanjay's todos.	2011-08-31 21:51:56 -07:00
Sanj	0d96fc6d6f	minor ups	2011-09-01 08:53:22 +05:30
Sanj	b3abe1e12d	make add_relation view cleaner for schuyler to work on:P; correct RELATIONSHIP_OPTIONS based on changes in models.py	2011-09-01 08:39:23 +05:30
Sanj	439b063cee	handle responses in JS; clarify TODOs in views.py	2011-09-01 08:30:49 +05:30
Sanj	a61d8dd6fe	add JS to edit relations; add TODOs in views.py	2011-09-01 08:28:02 +05:30
Schuyler Erle	1f4333bf94	merge	2011-08-31 19:25:38 -07:00
Schuyler Erle	a82c241e18	Rename relations.	2011-08-31 19:25:01 -07:00
Sanj	f30835b1fa	argh, wrong search_related view function; commented out unneeded function / view / url	2011-09-01 07:44:49 +05:30
Sanj	fad3cc2755	minor, comment in Relations in <thead>	2011-09-01 07:38:01 +05:30
Sanj	385e3bc467	JS handler to display initial relations, drop-down, etc.	2011-09-01 07:34:48 +05:30
Sanj	7301d5157a	forget about formsets and make things work again	2011-09-01 07:21:46 +05:30
Sanj	df8415e718	goh	2011-09-01 06:59:04 +05:30
Sanj	1114d47a41	gah	2011-09-01 06:57:35 +05:30
Sanj	a46df58e34	um, sorry?	2011-09-01 06:54:45 +05:30
Sanj	c9703c7796	formset weirdo	2011-09-01 06:52:31 +05:30
Sanj	f7150de6e4	er, Relationship	2011-09-01 06:51:00 +05:30
Sanj	26081fb1f8	er, import	2011-09-01 06:49:48 +05:30
Sanj	cd5272bfde	django formset foo to get relation inline	2011-09-01 06:43:26 +05:30
Sanj	c82f7767a6	if you're doing something important, at least do it right:)	2011-09-01 05:52:34 +05:30
Sanj	393ecc8a98	sorry karen, the css shall have an important :/	2011-09-01 05:50:10 +05:30
Sanj	5de591907f	add nav bar to admin	2011-09-01 05:47:13 +05:30
Sanj	2553037177	add links to nav bar	2011-09-01 05:10:56 +05:30
Sanj	d952544b8a	restrict similar features to 12 in display	2011-09-01 05:07:57 +05:30
Sanj	b7042e1fcc	merged	2011-09-01 04:58:56 +05:30
Sanj	50ae6b00b3	feed link	2011-09-01 04:57:18 +05:30
Karen	3806baa670	an ode to jSonj	2011-09-01 04:35:52 +05:30
Karen	fcc604b8d9	i hate pushingcode online every 2min	2011-09-01 04:14:02 +05:30
Karen	3acbc3260a	dfdf	2011-09-01 04:12:16 +05:30
Karen	6cf6af780c	aliugnment	2011-09-01 04:05:26 +05:30
Karen	b37a1fddd6	aaargh	2011-09-01 04:00:55 +05:30
Sanj	03146ae756	er	2011-09-01 04:00:03 +05:30
Karen	843ea6b943	undid changes becase i dont have LOCALHOST	2011-09-01 03:59:30 +05:30