Bryan Housel
de2e716d44
Reword "merge lines" to "merge features" ( closes #2861 )
2015-12-07 23:43:35 -08:00
Bryan Housel
165aae86d4
Change "IE9 and above" to "IE11 and above"
2015-12-02 16:20:13 -05:00
Bryan Housel
aa91ff49f8
Icons for operations, turn restrictions, bug/translate ( closes #2766 )
2015-10-30 14:06:29 -04:00
John Firebaugh
ecb9398d5c
Disable joining ways with conflicting tags
2015-10-18 13:42:14 -07:00
Bryan Housel
594b4c19cf
Disable fullscreen button, add keyboard shortcuts
2015-09-05 23:11:11 -04:00
Bryan Housel
a478fcd918
Fix broken link and other help improvements ( closes #2760 )
2015-09-01 13:15:53 -04:00
Bryan Housel
6aa4b3a873
Merge branch 'keyboard_shortcuts' of https://github.com/rhokbrisbane/iD into rhokbrisbane-keyboard_shortcuts
2015-06-15 22:32:20 -04:00
Bryan Housel
641cf98e70
Add tooltip to minimap toggle control
2015-06-15 22:28:40 -04:00
Rowan Hogan
bd5eb5e972
Adds minimap toggle to background menu. Also resolves CSS issue with GPX layer in minimap.
2015-06-14 11:11:56 +10:00
Rowan Hogan
29d4944970
Adds link to keyboard shortcuts reference in help.
2015-06-13 14:32:30 +10:00
tristen
6316e52b55
Merge pull request #2573 from openstreetmap/distance-measurement
...
Infobox / distance measurement
2015-05-27 11:11:03 -04:00
tristen
249125ce16
Tweaks to the infobox interface
...
- Variable height depending on the context list
- Added width that alligns with the grid
- Re-use classnames shared by the interface
- Changes to the unit toggle
-- Shortened name to current unit of measurement (Accounted for this change in i8n)
-- Display as a button to match other toggle/button like elements in the interface
2015-05-27 10:17:17 -04:00
Bryan Housel
1287e4cad9
Change distance-measurement hotkey to cmd-I
2015-05-26 12:27:50 -04:00
Bryan Housel
995a9f4d50
Label commit message as "Changeset comment" ( closes #2600 )
2015-04-22 12:07:11 -04:00
Bryan Housel
982276261e
i18n for distance measurement widget
2015-04-01 21:00:37 -04:00
John Firebaugh
b6a3e8a58c
login ⇢ log in
2015-03-24 12:44:45 -07:00
Harkirat Singh
643370de34
fixes issue #2504
2015-03-25 00:27:48 +05:30
Bryan Housel
1f0087d133
Merge pull request #2525 from openstreetmap/conflict-resolution
...
Merge Conflict Resolution
2015-03-05 19:49:15 -05:00
Bryan Housel
d4643b1b89
Change link text: "Or download your changes"
2015-03-05 19:47:48 -05:00
Bryan Housel
c503b9f96c
fill remoteGraph with loadMultiple, finally do proper undeletion
2015-03-03 23:43:37 -05:00
Bryan Housel
e3139e250e
improvements to iD.actions.MergeRemoteChanges
...
* if remote entity is deleted, log to conflicts() array
* if remote tag was deleted, delete from tags (not set undefined)
* update tests..
2015-03-02 13:07:24 -05:00
Bryan Housel
80f5f65f63
More bugfixes and style updates:
...
* working Previous/Next buttons
* remove behaviors from save mode
(users should not be moving nodes around or selecting at this point)
* clear hover before hovering next object
* enable save button and finished message after reviewing last conflict
* store users choice in __data__.chosen..
* default choices to `keep remote version`
* better message for delete conflicts
* fix undelete action to check localGraph (which will have the entity)
instead of context.graph() (which may not)
2015-02-27 15:45:43 -05:00
Bryan Housel
0ed12da6fa
WIP: style, replace expand/contract list with prev/next buttons
2015-02-26 22:39:22 -05:00
Bryan Housel
cdd0ca1acf
WIP: Use history.perform/replace/pop instead of context.perform
...
This means
* no more weird saves to localStoage of partially merged graphs
* pop cleanly cancels back to history state before merges happen
(removed the annotated undo states)
2015-02-17 00:47:12 -05:00
Bryan Housel
d755145ae6
WIP: usernames in messages, show # of total
2015-02-14 11:20:19 -05:00
Richard Fairhurst
0953475f04
Don't delete ways from route/boundary relations
2015-02-12 10:21:23 -08:00
samanpwbb
cef46853ea
rework list interactions
2015-02-09 15:20:29 -05:00
samanpwbb
e49ebe2784
rework save UI
2015-02-09 14:28:55 -05:00
samanpwbb
d141827c3e
Merge branch 'master' into conflict-resolution-ui
2015-02-06 19:08:50 -05:00
samanpwbb
78e4271071
finish basic layout/style pass
2015-02-06 19:07:57 -05:00
Bryan Housel
1200919fb3
quote "yes" and "no" in YAML
...
(re: #2286 )
2015-01-24 22:38:37 -05:00
Bryan Housel
3fc99e1df5
Allow undeletions
2015-01-13 16:28:06 -05:00
Bryan Housel
fb0d17e713
WIP: Add choices ui for resolving conflicts
2015-01-11 23:13:31 -05:00
Bryan Housel
95c92e9a59
WIP: conflict save dialog
...
* multiple buttons
* help text
2015-01-10 20:35:43 -05:00
Bryan Housel
3bbf31902a
Add accessor to get conflict details from iD.actions.MergeRemoteChanges
2014-12-29 22:47:44 -05:00
John Firebaugh
c66091c00c
Merge pull request #2357 from bhousel/feature-filtering
...
Feature filtering
2014-11-11 12:16:42 -08:00
samanpwbb
140b56a68a
style adjustments + clean out unused code
2014-10-31 17:09:49 -04:00
Bryan Housel
224db06ca4
design enhancements..
...
* replace full width bottom bar with subtle list item
* move hidden feature details to list item tooltip
* simplify some of the text labels on the Map Data panel
* progressively hide some footer elements with media queries
2014-10-31 10:55:00 -04:00
Aaron Lidman
ced0158327
Fix .more-fields string
2014-10-30 16:07:38 -04:00
Bryan Housel
7d9b267858
Show auto-hidden features as disabled checkboxes with tooltip
...
also rearrange map data panel to put features last
2014-10-28 21:37:03 -04:00
Bryan Housel
8c423651b2
Update help text because GPS tracks are purple now
2014-10-28 21:37:03 -04:00
Bryan Housel
dcc9812986
prevent most operations on things connected to hidden features..
2014-10-28 21:37:02 -04:00
Bryan Housel
8a98339bc2
Add area fill selector (wireframe/partial/full) to map data panel
...
also:
* style dark tooltips with shortcut keys
* use uppercase for shortcut keys
2014-10-28 21:37:01 -04:00
Bryan Housel
35e7474829
Rename Features to Map Data..
...
* move GPX and Mapillary layers to Map Data
* put feature filters and layer data into show/hide containers
* cleanup css
2014-10-28 21:37:01 -04:00
Bryan Housel
8fd177935d
Feature filtering (in progress)
...
(rebased to master post-Mapillary merge)
2014-10-28 21:37:00 -04:00
John Firebaugh
eb9876c2de
Use interpolation rather than concatenation
2014-10-22 11:16:37 -07:00
Bryan Housel
712f533212
Translate text in changes section on save panel. ( fixes #2417 )
2014-10-22 10:27:59 -04:00
Jakub Wieczorek
dfa442903d
Improve the error message on saving when offline ( fixes #2373 )
2014-10-20 17:14:28 -07:00
John Firebaugh
0b1ec49402
Rewrite as a separate layer
2014-09-19 14:51:44 -07:00
samanpwbb
e721e93a31
cleanup mapillary UI
2014-09-16 13:49:13 -04:00
