CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-03-22 11:03:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,723 Commits 2 Branches 0 Tags
22b9e0a759e8ca82e7ceaaa4e5b3317c991d6fdb
Commit Graph

12723 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Quincy Morgan
22b9e0a759 Update preset icons for temaki 3.17.0 (re: #7068) 2020-02-13 16:13:49 -08:00
Quincy Morgan
73180605a9 Merge pull request #7357 from openstreetmap/greenkeeper/@ideditor/temaki-3.17.0 
Update @ideditor/temaki to the latest version 🚀
 2020-02-13 16:04:25 -08:00
greenkeeper[bot]
211dea313b chore(package): update @ideditor/temaki to version 3.17.0 2020-02-14 00:03:46 +00:00
Quincy Morgan
3cff395972 Add YYYY-MM-DD placeholder to date fields (close #7270) 2020-02-13 10:30:06 -08:00
Quincy Morgan
05925b15f2 Use standard hover-highlighting mechanism in feature search results list 2020-02-13 10:20:32 -08:00
Bryan Housel
030a85199f Add support for AES encrypt/decrypting sensitive values 
(closes #7355)
 2020-02-13 13:12:24 -05:00
Quincy Morgan
614ee3f68e Use standard hover-highlighting mechanism for feature links in Q/A inspectors 2020-02-13 10:07:18 -08:00
Bryan Housel
204cb2300a Squashed commit of the following: 
commit 82e230007fca02d486c3b2fa135d76bca8593d21
Merge: 2ed4acaf2 1cc6237c7
Author: Bryan Housel <bryan@mapbox.com>
Date:   Thu Feb 13 10:30:56 2020 -0500

    Merge branch '7347_new' of https://github.com/animesh-007/iD into animesh-007-7347_new

commit 1cc6237c78d5a582417eae700767d6605fbc7e27
Author: animesh-007 <animeshagarwal7@gmail.com>
Date:   Thu Feb 13 20:47:57 2020 +0530

    deleted spike.json

commit 5bba63c36ad040ea8eaf4f139bbc99cb8b941e54
Author: animesh-007 <animeshagarwal7@gmail.com>
Date:   Thu Feb 13 20:45:01 2020 +0530

    named properly

commit 96426f3efdf65c9eee2125fd036c077cd4d0a35d
Author: animesh-007 <animeshagarwal7@gmail.com>
Date:   Thu Feb 13 01:25:23 2020 +0530

    modified spike.json

commit 40c092c1ea1bc56e078cbf94f2d9e69b5bc4e40f
Author: animesh-007 <animeshagarwal7@gmail.com>
Date:   Thu Feb 13 01:22:53 2020 +0530

    deleted spike_strip.json

commit 679a409aacd0320b6cbbb470065c6efd7c9e0429
Author: animesh-007 <animeshagarwal7@gmail.com>
Date:   Thu Feb 13 00:55:38 2020 +0530

    renamed to spike strip

commit e484aea0ec4bdf456a697ed9bf170076e12486b4
Author: animesh-007 <animeshagarwal7@gmail.com>
Date:   Thu Feb 13 00:52:50 2020 +0530

    removed spike.json

commit 60ea432a5e3a4aeba8063232fbf1497305be90a2
Author: animesh-007 <animeshagarwal7@gmail.com>
Date:   Wed Feb 12 19:08:08 2020 +0530

    spike preset
 2020-02-13 10:33:05 -05:00
Quincy Morgan
2ed4acaf2e Apply "statused" styling to planned features 2020-02-12 16:34:40 -08:00
Quincy Morgan
32d773caa7 Standardize some Q/A CSS 2020-02-12 16:00:29 -08:00
Quincy Morgan
12b6db379c Don't show extra top margin in Osmose details 2020-02-12 15:49:16 -08:00
Quincy Morgan
657844b343 Update some Osmose issue icons 2020-02-12 15:13:17 -08:00
Quincy Morgan
5674f75a11 Make the icons larger and centered on ImproveOSM and Osmose issue markers 2020-02-12 14:52:49 -08:00
SilentSpike
3ee32776a7 Fix QA error icons 
Pass service itself in to QAItem constructor for purpose of fetching
data. Store string as `title` property on the service.
 2020-02-12 21:27:38 +00:00
SilentSpike
9364b1d637 Fix missing semi-colon 2020-02-12 21:27:37 +00:00
Quincy Morgan
c82c57f8cb Update feature names in the selection list while typing in the name field (close #7334) 2020-02-11 15:21:28 -08:00
Quincy Morgan
4f82463db4 Wrap long preset button labels 2020-02-11 15:11:58 -08:00
Bryan Housel
3608659d21 Restore field inheritance 2020-02-10 16:22:13 -05:00
Quincy Morgan
7364cb38fe Add "Cycle & Foot Crossing" preset (close #7321) 2020-02-10 13:04:46 -05:00
Bryan Housel
0357c2b80c Rework presets.js file - WIP to fix resolving field inheritance 2020-02-07 14:17:19 -05:00
Quincy Morgan
2003f7804b Update to temaki 3.16.0 (re: #7068) 2020-02-07 13:46:06 -05:00
Bryan Housel
2149692bee Make sure the addablePresetIDs can be reset back to null too 2020-02-07 12:55:16 -05:00
Bryan Housel
1155498766 Restore the addablePresetID feature 2020-02-07 12:06:59 -05:00
Bryan Housel
a9a1f945f8 Move the qa_data external 
- this means that QAItem now asks the service for the icon rather than knowing it directly
 2020-02-07 10:06:47 -05:00
Bryan Housel
4c5e7db2dd Move the iD.data export from data/index.js to coreData 
coreData now owns all the data, and data/index.js should eventually go away
(re: #4994)
 2020-02-07 09:27:23 -05:00
Bryan Housel
fe00a40e9a Move the keepRight data extrnal 2020-02-07 09:16:34 -05:00
SilentSpike
f8a4a0b3ad Use d3_json Promise directly for Osmose requests 2020-02-07 11:29:48 +00:00
SilentSpike
8bb2dc7fa6 Return Promise for Osmose string requests 2020-02-07 11:21:33 +00:00
SilentSpike
7d76e0ac5c Fix Osmose request resolving after UI moves on 
- Previously caused minor unexpected renderer behaviour by forcing elements
visible when the user had moved on (potentially interfering with
whatever they're currently doing)
 2020-02-07 10:43:44 +00:00
SilentSpike
f86837d637 Fix use of double quotes 2020-02-06 23:12:18 +00:00
SilentSpike
51efd5b714 Update and standardise QA implementations 
- ES6ify (now using class syntax to define QAItem objects)
- Fix bug with KeepRight marker rendering not updating properly
- Use `qa-` prefix for the UI element classes to differentiate from iD
validation error related UI element classes
- Move away from "error" where possible in source
- Move away from snake_case naming where possible

Note that some function/method names have been untouched to make life
easier for v3 development. Have added note comments where appropriate.
 2020-02-06 23:07:50 +00:00
Bryan Housel
9faf8c0fe5 Test that fallback presets are there before data is loaded 
Also, we don't actually need a vertex preset anymore, it was removed a while ago
 2020-02-06 17:04:11 -05:00
Bryan Housel
2edf81605c Remove fallback presets from the test data 
presetIndex has them already
 2020-02-06 16:26:31 -05:00
Bryan Housel
3f1f85a1e9 Restore some odd but necessary workarounds to the presetCollection test 2020-02-06 16:10:55 -05:00
Bryan Housel
12e3b7df6d Setup fake data so that coreUploader doesn't fire off requests 2020-02-06 14:06:40 -05:00
Bryan Housel
ed19ce5bb1 When testing, pick modern or legacy build depending on which browser 
This also lets us remove the special phantom.html tests
 2020-02-06 13:05:18 -05:00
Bryan Housel
dc168c401e npm run build:stats 2020-02-06 11:33:02 -05:00
Bryan Housel
de0ac9d451 Upgrade to name-suggestion-index v4.0.0 
(closes #7336)

- json data files are distributed both regular and minified
- json data is no longer exported by index.mjs
 2020-02-06 11:28:02 -05:00
Bryan Housel
0ffc7ca19a Merge branch '7313' of https://github.com/animesh-007/iD into animesh-007-7313 2020-02-06 11:17:03 -05:00
animesh-007
7d4c513446 removed facility.json 2020-02-06 21:30:04 +05:30
animesh-007
76033a77a2 changed file name 2020-02-06 13:42:13 +05:30
Bryan Housel
13ead25654 Merge branch 'external_presets' into 2.x 
(re: #4994)
 2020-02-05 21:32:51 -05:00
Bryan Housel
d68b6090cf Remove extra level of nesting in presets.json, fields.json 2020-02-05 21:22:32 -05:00
Bryan Housel
3c6ba9703a presetIndex.build -> presetIndex.merge, and make it merge data 2020-02-05 21:13:15 -05:00
Quincy Morgan
1720f7cb93 Organize some code in coreUploader (re: #7333) 
Fix lint error
 2020-02-05 17:53:28 -05:00
Quincy Morgan
ea0d666b96 Merge pull request #7333 from openstreetmap/uploader 
Add upload controller
 2020-02-05 16:43:54 -05:00
Quincy Morgan
237a382c51 Merge branch '2.x' into uploader 
# Conflicts:
#	modules/modes/save.js
 2020-02-05 16:23:09 -05:00
Quincy Morgan
3b19cc32fd Don't grey out the map during conflict resolution (close #6547) 2020-02-05 16:16:50 -05:00
Quincy Morgan
0e14241fcf Move some upload code from modeSave to new coreUploader object (re: #7247) 2020-02-05 15:28:23 -05:00
Bryan Housel
426565d6de Include dist/data/* in release instructions 2020-02-05 13:52:12 -05:00