Commit Graph

2030 Commits

Author SHA1 Message Date
Ian B
db2dc79e60 Refactor Orthogonalize 2013-03-23 21:20:05 +01:00
Ian B
c56aa25930 Orthogonalize three-node ways (addresses #1077) 2013-03-23 16:22:08 +01:00
John Firebaugh
1c3b817b89 Autosize both sprites (fixes #1116) 2013-03-22 16:22:32 -07:00
saman bb
8944dd6b4b resolve conflict. 2013-03-22 19:14:49 -04:00
saman bb
d4526e20f2 layout fixes. 2013-03-22 19:07:55 -04:00
John Firebaugh
7299ccdcb5 Inline reference for preset fields (#256) 2013-03-22 15:08:35 -07:00
saman bb
13f34e2e49 fix #1110 2013-03-22 18:06:58 -04:00
Tom MacWright
49af9b5787 Merge branch 'master' of github.com:systemed/iD 2013-03-22 17:56:34 -04:00
Tom MacWright
3b09c186b6 Be specific about retina as not to break the glue-generated sprite.
* Warn before switching sources. Fixes #779.
* Inline docs keep their place. Fixes #1109
2013-03-22 17:56:22 -04:00
John Firebaugh
62879c5173 Use a label element rather than positioning hack 2013-03-22 14:50:31 -07:00
John Firebaugh
0ba855ed46 Prefer selection argument to this 2013-03-22 14:50:31 -07:00
Tom MacWright
4870e279ec Merge branch 'master' of github.com:systemed/iD into inline-doc 2013-03-22 16:59:44 -04:00
Tom MacWright
118fe25bf0 Add editing, imagery, and help starter pages. 2013-03-22 16:55:11 -04:00
John Firebaugh
9c9cce5c50 Inline tag reference in tag list (#256) 2013-03-22 12:47:54 -07:00
Tom MacWright
4ab03064b0 Add help UI style, help.title translation 2013-03-22 14:47:29 -04:00
John Firebaugh
aef17c1968 Fix duplicate undo entries (fixes #1105) 2013-03-22 11:23:23 -07:00
Tom MacWright
64bec11fb9 Initial help ui 2013-03-22 13:40:30 -04:00
saman bb
9f17a7ce34 basic fox for restore modal. 2013-03-22 12:38:29 -04:00
Ansis Brammanis
7ef2e65c4d add reset button to modified fields
this button only appears if a field's value
differs from the original osm value. Resetting
changes the value and adds a history entry.
It does not undo history.
2013-03-21 21:33:24 -04:00
Saman Bemel-Benrud
4e1560be23 styling zoom to extent button for custom gpx work. 2013-03-21 19:57:49 -04:00
Saman Bemel-Benrud
094f283f05 resolved conflict. 2013-03-21 19:25:29 -04:00
Saman Bemel-Benrud
478eb8871a big commit modal cleanup. 2013-03-21 19:19:48 -04:00
Saman Bemel-Benrud
426c897248 commit flow work 2013-03-21 19:19:17 -04:00
Saman Bemel-Benrud
fe1f08cf8a hide close button for loading modal. 2013-03-21 18:36:19 -04:00
John Firebaugh
0baaf1a3fd Make name field less of a special case 2013-03-21 15:24:42 -07:00
Saman Bemel-Benrud
5fdb7069c1 better error modal. 2013-03-21 18:16:45 -04:00
John Firebaugh
9796d4027d Cleanup 2013-03-21 15:07:26 -07:00
John Firebaugh
96056c5c0a Pass entity directly 2013-03-21 15:07:26 -07:00
John Firebaugh
87a4d60030 Cleanup 2013-03-21 15:07:26 -07:00
John Firebaugh
317090be12 preset is always present 2013-03-21 15:07:03 -07:00
Ansis Brammanis
15b9eb7b3f second half of 871961d077 2013-03-21 17:56:59 -04:00
Saman Bemel-Benrud
992df47cac big commit modal cleanup. 2013-03-21 17:03:39 -04:00
Ansis Brammanis
88ae05f5b4 add 'modified' class to fields with changed values 2013-03-21 16:19:37 -04:00
Ansis Brammanis
22f43b810b fix number input 2013-03-21 16:16:07 -04:00
Saman Bemel-Benrud
59881990e2 styled view on osm link. 2013-03-21 15:13:23 -04:00
Ansis Brammanis
8f35501cda no inspect button for preset categories
fixes #1100
2013-03-21 12:27:05 -04:00
Saman Bemel-Benrud
345283e596 refine preset grid layout. 2013-03-21 12:15:10 -04:00
Ansis Brammanis
cdfd5dfc27 use road category, and other line icons 2013-03-21 11:57:00 -04:00
Ansis Brammanis
dcc60cb497 inline categories for preset grid 2013-03-21 00:22:50 -04:00
saman bb
79014025ef hover state for back button, closes #1094 2013-03-20 23:58:31 -04:00
Saman Bemel-Benrud
ee10ffeb60 Merge branch 'master' of github.com:systemed/iD 2013-03-20 19:12:18 -04:00
Saman Bemel-Benrud
4794fe4895 making things actually fit in the header. 2013-03-20 19:12:06 -04:00
John Firebaugh
55108a21c8 Fix preset search 2013-03-20 15:56:03 -07:00
Ansis Brammanis
cf2e111fcb add preset icon to back button, and fix margins 2013-03-20 17:46:22 -04:00
Ansis Brammanis
9a309c5009 don't hardcode sprite size
it can change any time the sprite is rebaked
2013-03-20 17:09:25 -04:00
Tom MacWright
5c5c250838 Detect file and drag and drop support 2013-03-20 16:12:14 -04:00
Tom MacWright
f6fe9bfdbf Merge branch 'master' into layers 2013-03-20 16:04:09 -04:00
Tom MacWright
51d915c8a6 Refactoring and fixing layers
* Fixed opacity control
* Reorganize layer switcher
* Add GPX item to menu
* Allow user to cinch to GPX extent

Needs:

* Moderate refactoring
* Possibly a specific 'layerchange event'
* Dropping GPX on the map should be a behavior, probably, instead of in
  the layer
* Layers, if we want them, should be named rather than just have list
  indices
* A better icon for zoom to extent and for that icon to be properly
  placed
2013-03-20 15:59:15 -04:00
Ansis Brammanis
d8967d5015 Remove name seperator in editor 2013-03-20 15:40:07 -04:00
Ansis Brammanis
64ad80c5c6 move preset icon and type name into header 2013-03-20 15:29:30 -04:00