CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-06-05 06:28:15 +02:00
Code Issues Packages Projects Releases Wiki Activity
4,363 Commits 2 Branches 0 Tags
63b63339b1dee252db0dceac3b54760ee8d17421
Commit Graph

1114 Commits

Author SHA1 Message Date
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
Tom MacWright 8538339b44 Fix zooming to validated features. Fixes #748 2013-02-13 17:21:21 -05:00
Ansis Brammanis 529b570c89 Merge remote-tracking branch 'systemed/master' into tree-intersects 2013-02-13 13:31:11 -05:00
Ansis Brammanis 95e6b840ee Fix key reference 2013-02-13 13:14:57 -05:00
John Firebaugh a25f2895d0 Rename UserPanel -> Account 2013-02-12 21:04:59 -08:00
John Firebaugh 4bbed7e943 Cleanup, fix UserPanel 2013-02-12 21:03:34 -08:00
John Firebaugh 6f6958ad98 Remove redundant ul, id -> class 2013-02-12 20:50:17 -08:00
John Firebaugh f98cee40a7 Extract iD.ui.Attribution 2013-02-12 20:46:54 -08:00
John Firebaugh 8928e757a4 Simplify 2013-02-12 20:19:36 -08:00
John Firebaugh 806de963db Cleanup, translate Splash 2013-02-12 20:18:17 -08:00
John Firebaugh 02ed91096a Follow ui pattern 2013-02-12 20:08:36 -08:00
John Firebaugh 0578d645bc restore translation 2013-02-12 20:05:51 -08:00
John Firebaugh 6d3d00e78d inspector translation 2013-02-12 20:02:35 -08:00
John Firebaugh 8882023e5b tag_reference translations 2013-02-12 19:59:32 -08:00
John Firebaugh d92d87ebf5 Organize translations 2013-02-12 19:55:09 -08:00
John Firebaugh c3a06c681a Translate/cleanup iD.ui.Commit 2013-02-12 17:39:38 -08:00