379 Commits

Author	SHA1	Message	Date
Ansis Brammanis	2fd5deb2e9	Fix additional tag collapsed icon	2013-02-21 00:27:38 -05:00
Ansis Brammanis	a396cde295	misc style tweaks, don't use select box ... scroll when expanding additional tags	2013-02-20 22:14:50 -05:00
Saman Bemel-Benrud	c52758dc79	layout adjustments.	2013-02-20 20:08:34 -05:00
Ansis Brammanis	2dab162fac	Couple more merge fixes	2013-02-20 18:43:44 -05:00
Ansis Brammanis	a4502c2732	Fix search	2013-02-20 18:28:27 -05:00
Saman Bemel-Benrud	06cd65a336	resolve conflict.	2013-02-20 18:03:38 -05:00
Saman Bemel-Benrud	d4d776bc21	resolved conflicts.	2013-02-20 18:01:31 -05:00
Ansis Brammanis	588ef09138	Select filtered preset with Enter	2013-02-20 17:58:08 -05:00
Saman Bemel-Benrud	1c7add8e42	progress on preset ui styling.	2013-02-20 17:44:46 -05:00
Ansis Brammanis	49e5eb8317	Fix name input saving and updating	2013-02-20 17:35:50 -05:00
Ansis Brammanis	e17d7ecd63	Limit backgrounds to areas	2013-02-20 16:49:55 -05:00
Ansis Brammanis	270676c548	Add backgrounds to area icons	2013-02-20 16:45:58 -05:00
Ansis Brammanis	edbbc810f0	Add address ui	2013-02-20 12:28:13 -05:00
Saman Bemel-Benrud	c16bef5f12	style tweaks.	2013-02-19 20:40:32 -05:00
Ansis Brammanis	85f39134b5	Add address ui element with street suggestions	2013-02-19 19:25:35 -05:00
Ansis Brammanis	5a61ccade4	Fix leaking global	2013-02-19 18:11:32 -05:00
Ansis Brammanis	bb47f44a1e	misc preset and tag fixes	2013-02-19 17:00:21 -05:00
Saman Bemel-Benrud	cb2f8b2ca3	adding lasso class to body.	2013-02-19 16:38:20 -05:00
Saman Bemel-Benrud	c2ca010d8f	layout improvements.	2013-02-19 16:01:27 -05:00
Saman Bemel-Benrud	01185f1a92	Merge branch 'master' of github.com:systemed/iD	2013-02-19 15:03:05 -05:00
Saman Bemel-Benrud	107ef2b794	basic pass on grid styles.	2013-02-19 15:02:44 -05:00
Ansis Brammanis	a77e1188c7	Merge pull request #820 from yohanboniface/tab-shiftKey ... Taglist: do not addTag when presssing TAB in shiftKey mode	2013-02-19 09:13:34 -08:00
Yohan Boniface	5d70ba79d3	Taglist: do not addTag when presssing TAB in shiftKey mode	2013-02-19 17:49:01 +01:00
Ansis Brammanis	4069df8f7c	Switch to using sprite	2013-02-19 11:31:02 -05:00
Ansis Brammanis	f99a80b52f	Use taginfo for preset comboboxes	2013-02-18 16:52:40 -05:00
Ansis Brammanis	f568985bcf	misc preset work	2013-02-18 14:42:54 -05:00
Ansis Brammanis	47f23f8284	Add help buttons for type, name	2013-02-18 10:55:27 -05:00
Ansis Brammanis	abe7ce1064	Fix setting preset's tags	2013-02-18 10:37:37 -05:00
Ansis Brammanis	79af340892	Fix added preset's match tags to tags	2013-02-18 02:00:06 -05:00
Ansis Brammanis	9fcda7ffc2	Strip old preset's main tags when switching	2013-02-16 20:24:38 -05:00
Ansis Brammanis	83c2fb5c67	Merge branch 'master' of github.com:systemed/iD	2013-02-16 18:54:59 -05:00
Ansis Brammanis	4c0b03c241	forward on preset ui work ... Add maki icons	2013-02-16 18:30:47 -05:00
John Firebaugh	4fd8024553	Lint, whitespace	2013-02-16 09:24:59 -08:00
John Firebaugh	4acbe38dd8	Merge pull request #794 from porjo/master ... Fix #790 #791	2013-02-16 09:22:36 -08:00
John Firebaugh	eadf460b55	Fix global leaks	2013-02-16 09:02:23 -08:00
Ian B	74cfb750bb	Fix save error causing modal to break (#790)	2013-02-16 15:06:57 +01:00
Ian B	90308b3a75	Fix missing OK button on confirm modal (#791)	2013-02-16 15:02:35 +01:00
Ansis Brammanis	984fa76907	Temporarily switch back to dev as default ... Preset work is causing stability issues.	2013-02-15 23:31:55 -05:00
Ansis Brammanis	87ef7ecf91	Make use of message area	2013-02-15 16:18:54 -05:00
Ansis Brammanis	bf3a635da5	Extract tag editor ui	2013-02-15 15:58:05 -05:00
Ansis Brammanis	147fce1f49	Merge branch 'tree-intersects' ... Conflicts: js/id/behavior/lasso.js	2013-02-15 13:40:01 -05:00
Ansis Brammanis	56ed48f0a3	Fix switch to tag view	2013-02-15 13:22:48 -05:00
Ansis Brammanis	51976ff0a1	Very rough preset selection grid	2013-02-15 13:15:03 -05:00
Ansis Brammanis	a3f895dd72	Switching between preset and tag view	2013-02-15 11:42:12 -05:00
Ansis Brammanis	9547fdd510	reorganize inspector	2013-02-15 10:53:35 -05:00
Ansis Brammanis	97679c7679	taglist and presetui coexist	2013-02-14 18:13:28 -05:00
Ansis Brammanis	8c89efe563	Extract ui.Taglist	2013-02-14 16:59:07 -05:00
Ansis Brammanis	0bb805f557	Merge remote-tracking branch 'systemed/master' into presets ... Conflicts: css/app.css index.html js/id/connection.js js/id/modes/select.js js/id/ui/inspector.js js/id/util.js test/spec/modes/add_point.js	2013-02-14 11:38:18 -05:00
Ansis Brammanis	7102fea04d	add history.intersects to context	2013-02-13 18:12:53 -05:00
Ansis Brammanis	1050faab8f	Only delete saved on hitting reset, fixes #744	2013-02-13 17:42:46 -05:00