1538 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ansis Brammanis	ecbfbb9ff2	Add whitespace to convert_josm.py	2013-02-01 12:21:45 -05:00
Ansis Brammanis	cb6ae40ef0	Include keys when processing josm presets	2013-02-01 12:14:48 -05:00
Tom MacWright	72536229c7	Merge branch 'master' into presets ... Conflicts: test/index.html	2013-02-01 12:03:40 -05:00
Tom MacWright	ab7290a865	Fix re-requesting failed tiles. Fixes #594	2013-02-01 11:31:31 -05:00
Tom MacWright	60850f303f	Merge branch 'master' of github.com:systemed/iD	2013-02-01 11:24:38 -05:00
Ansis Brammanis	559f3c9037	Remove unecessary line	2013-02-01 11:00:55 -05:00
John Firebaugh	9494d8d468	Remove unused	2013-02-01 10:47:40 -05:00
Tom MacWright	3334649354	Merge	2013-01-31 19:42:24 -05:00
Tom MacWright	8eb04ddb4d	combobox	2013-01-31 19:41:52 -05:00
Saman Bemel-Benrud	844e674ea5	refine misalignment ui.	2013-01-31 19:24:35 -05:00
Saman Bemel-Benrud	5f8e7ec8cc	Merge branch 'master' of github.com:systemed/iD	2013-01-31 19:20:32 -05:00
Saman Bemel-Benrud	dcfe8ac85b	design pass on alignment toggles.	2013-01-31 19:20:13 -05:00
John Firebaugh	bbccec75be	Convert Hash to a behavior	2013-01-31 18:28:24 -05:00
Tom MacWright	fd3ad9e8bd	Merge branch 'master' into presets	2013-01-31 17:51:42 -05:00
Ansis Brammanis	9cb0879818	Selecting implicitly sets data	2013-01-31 17:47:24 -05:00
Ansis Brammanis	b9d77a8de6	Set data on midpoint circles	2013-01-31 17:44:14 -05:00
Tom MacWright	9f37249393	Merge branch 'master' into presets	2013-01-31 17:20:15 -05:00
Ansis Brammanis	f430ecd622	Fix keyboard-initiated way moving	2013-01-31 17:12:37 -05:00
Tom MacWright	410e534952	Use proper labels	2013-01-31 17:08:41 -05:00
Tom MacWright	e8dc356645	Reversible tag editing, save real changes	2013-01-31 17:05:27 -05:00
Ansis Brammanis	7ca6934f8a	Fix #580	2013-01-31 16:42:28 -05:00
Tom MacWright	3755d80778	Editable name field for the inspector	2013-01-31 16:38:31 -05:00
John Firebaugh	5f41b74955	Remove controller.exit	2013-01-31 16:00:02 -05:00
John Firebaugh	7ea7326f92	Extract Select behavior	2013-01-31 15:56:24 -05:00
Saman Bemel-Benrud	116289ae53	minor fixes.	2013-01-31 15:54:14 -05:00
Ansis Brammanis	8dcb215fe3	Hide labels on mouseover	2013-01-31 15:40:17 -05:00
Tom MacWright	681bf7c724	Be more specific in tests about which form we are interested in	2013-01-31 15:24:45 -05:00
Tom MacWright	ecb27eaf2f	Merge branch 'master' into presets ... Conflicts: js/id/modes/select.js	2013-01-31 15:14:28 -05:00
Tom MacWright	9741d28493	Fixing tests	2013-01-31 15:09:07 -05:00
Tom MacWright	5bd95f6e6a	Grab favorites, display them. ... Show stuff nested in optional tags. Fixes #582	2013-01-31 14:59:59 -05:00
Ansis Brammanis	26dfaf8161	Revise label stack	2013-01-31 14:43:41 -05:00
Tom MacWright	095ed4b486	Pay attention to field types, style things a little bit better.	2013-01-31 14:38:24 -05:00
Tom MacWright	60c14dc7ac	Use typeahead for preset search, support changing presets. Fixes #577	2013-01-31 14:24:05 -05:00
Tom MacWright	28ba323e9d	Fix preset filtering	2013-01-31 13:55:52 -05:00
John Firebaugh	402a9424c0	Make selection an array of entity IDs ... Should have no visible effect yet.	2013-01-31 13:51:12 -05:00
Tom MacWright	c871361bad	Add preset search.	2013-01-31 13:50:19 -05:00
Ansis Brammanis	846cf6e43d	Add difference tests	2013-01-31 13:37:54 -05:00
Tom MacWright	2613312d12	Add google analytics.	2013-01-31 13:30:54 -05:00
John Firebaugh	dea18306d0	Uncomment localStorage	2013-01-31 13:30:18 -05:00
Saman Bemel-Benrud	bd4c91c612	modal touch-ups.	2013-01-31 13:25:20 -05:00
Tom MacWright	e6e0306953	Improve preset form display	2013-01-31 13:07:21 -05:00
John Firebaugh	a48453c6ed	Selected style should take precedence over hover (fixes #568)	2013-01-31 13:03:50 -05:00
John Firebaugh	8bece3de15	Remove unused	2013-01-31 12:55:35 -05:00
John Firebaugh	d5133b1a5e	Fix build	2013-01-31 12:54:10 -05:00
Ansis Brammanis	5c8aa46e1f	Fix graph.difference	2013-01-31 12:47:02 -05:00
John Firebaugh	15e1bee3ec	Move controller	2013-01-31 12:45:39 -05:00
John Firebaugh	514ec1e28b	Move validate	2013-01-31 12:44:11 -05:00
John Firebaugh	3bdd314eb8	Fix global leak	2013-01-31 12:42:37 -05:00
John Firebaugh	3605895dfa	ChangeEntityTags -> ChangeTags	2013-01-31 12:41:29 -05:00
Tom MacWright	4e7ed7250b	Add josm converter and converted, switch to it.	2013-01-31 12:18:06 -05:00