Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing git history #822

Merged
merged 362 commits into from
Jan 18, 2024
+0 −0
Merged

Fixing git history #822

Changes from all commits
Commits
Show all changes
362 commits
Select commit Hold shift + click to select a range
0a4cca8
fix local data folder
tschie Aug 12, 2019
c1c2b6d
put native libraries in .arcgis folder
tschie Aug 13, 2019
5cf8674
Honor mmpk expiration (#397)
JonLavi Aug 13, 2019
959a101
Set annotation sublayer visibility (#396)
JonLavi Aug 13, 2019
a002ce2
Tschie/preplanned map (#405)
tschie Aug 15, 2019
cd1a4cc
Merge branch 'master' into dev
tschie Aug 26, 2019
9ed26f4
ignore iml files
tschie Aug 27, 2019
a0f2be8
Create and save kml file (#406)
JonLavi Aug 28, 2019
f9e744d
Apply scheduled updates to preplanned map area (#392)
JonLavi Sep 25, 2019
009b2f3
Patch/apply scheduled updates (#412)
JonLavi Oct 3, 2019
95f1ee9
Data parent directory (#413)
tschie Oct 22, 2019
f34287c
specify parent directory in File constructor
tschie Oct 22, 2019
2ef5f63
avoid explicit list of excluded directories
tschie Oct 22, 2019
6d0ef08
Merge branch 'master' into dev
tschie Oct 23, 2019
01a9bf8
show progress indicator on initial load
tschie Oct 23, 2019
bdb6833
Jon/remove unpack workflow2 (#422)
JonLavi Nov 20, 2019
8bb879c
Custom dictionary style [into dev] (#421)
JonLavi Nov 20, 2019
7ecda20
Edit kml ground overlay [into dev] (#420)
JonLavi Nov 20, 2019
afdb75a
Merge branch 'master' into dev
tschie Nov 20, 2019
d521670
add panel-region class to vbox
tschie Nov 20, 2019
e06c5fa
Display subtype feature layer (#427)
Rachael-E Dec 17, 2019
dc232c2
New Sample - Find connected features in utility network (#419)
JonLavi Jan 7, 2020
1ce5952
Update dev (#434)
Rachael-E Jan 7, 2020
60b2aae
display subtype feature layer - remove duplicate folder [dev] (#436)
JonLavi Jan 7, 2020
9d3158f
Merge branch 'master' into dev
tschie Jan 7, 2020
050dadb
Merge branch 'master' into dev
Rachael-E Feb 19, 2020
7560e54
Sync Dev with Master (#464)
JonLavi Mar 25, 2020
412037a
Merge branch 'master' into dev
tschie Apr 7, 2020
fd3a211
Fclfp hardik (#463)
Apr 13, 2020
2a85c90
Merge branch 'master' into dev
tschie Apr 20, 2020
ce35ebf
Merge branch 'master' into dev
tschie Apr 23, 2020
933dacc
Sync master into dev (#494)
JonLavi Apr 24, 2020
98cceae
Merge branch 'master' into dev
tschie Jun 8, 2020
e879c11
Merge branch 'master' into dev
tschie Jun 12, 2020
74ffdfc
Merge branch 'master' into dev
Rachael-E Jul 6, 2020
d9a13ff
Merge branch 'master' into dev
Jul 7, 2020
cddacc4
Update gradle and javafx versions (#527)
JonLavi Jul 16, 2020
4e27813
sync dev with master (#530)
JonLavi Jul 16, 2020
37114d2
Merge branch 'master' into dev
Rachael-E Jul 23, 2020
c8e6633
fix keywords in metadata.json
JonLavi Jul 23, 2020
57d0aba
fix metadata file path, title, redirect (#535)
JonLavi Jul 23, 2020
f18496b
Merge remote-tracking branch 'origin/master' into dev
JonLavi Jul 27, 2020
14ee78b
Feature enhancement to Surface Placement (#531)
jenmerritt Jul 28, 2020
b06ca29
New Sample: Realistic Lighting and Shadows (#528)
sclaridge Jul 28, 2020
a51e9f5
Update README.metadata.json (#541)
sclaridge Jul 29, 2020
06ff35d
move some slider styling into fxml file to fix sample viewer display …
jenmerritt Jul 29, 2020
c3f9b7e
Updates to Readmes (#544)
jenmerritt Aug 21, 2020
df045df
update portal item id (#546)
TADraeseke Aug 25, 2020
ba9bd94
Merge branch 'master' into dev
Aug 25, 2020
fda9bd7
Merge branch 'master' into dev
Aug 28, 2020
4b36776
Merge branch 'master' into 'dev' (#551)
jenmerritt Sep 8, 2020
7b6de95
Merge master into dev (#552)
sclaridge Sep 9, 2020
16b5b38
Merge branch 'master' into dev
sclaridge Sep 23, 2020
c7f1fd0
Sync dev with main (#560)
JonLavi Sep 28, 2020
c03d3fa
Fixing merge conflicts to sync main and dev (#566)
jenmerritt Oct 8, 2020
ec04025
Sync dev with main (#569)
jenmerritt Oct 13, 2020
d8e9528
New sample: Show location history (#556)
sclaridge Oct 13, 2020
3c50c80
Merge branch 'master' into dev
Oct 19, 2020
be60da6
Sync main and dev (#575)
jenmerritt Oct 19, 2020
1547a07
Sync main and dev (#580)
jenmerritt Oct 28, 2020
0082b77
Replace gif and screenshot (#584)
sclaridge Nov 9, 2020
25b9c87
Merge main into dev (#585)
sclaridge Nov 9, 2020
231d175
New sample: Display device location with autopan modes (#571)
sclaridge Nov 12, 2020
7f54ed6
Merge main into dev (#587)
sclaridge Nov 13, 2020
b761eba
Add jfrog artifactory to Maven repository to samples in dev branch (#…
sclaridge Nov 13, 2020
82512be
Add Exclusive Mode to Group Layers Sample (#581)
jenmerritt Nov 16, 2020
b85ac22
Merge branch 'master' into dev
Nov 18, 2020
a163fa5
Remove alert (#591) (#592)
sclaridge Nov 23, 2020
2f139b7
Fix Hbox width in Show location history sample (#594)
sclaridge Nov 30, 2020
1e8ea58
Merge main into dev (#596)
jenmerritt Nov 30, 2020
899bcf1
Fix hbox size and project name (#597)
sclaridge Nov 30, 2020
0498000
Add API key Gradle task to build.gradle files in samples (#593)
sclaridge Dec 8, 2020
fbe529c
Merge main into dev (#611)
jenmerritt Dec 8, 2020
3fce5a8
New Basemaps: Search and Symbology Categories (#609)
jenmerritt Jan 20, 2021
e2d5e37
New Basemaps: Portal and Raster Categories (#608)
jenmerritt Jan 20, 2021
c6e93a2
New Basemaps: Local Server and Map View Categories (#606)
jenmerritt Jan 20, 2021
a18da09
New Basemaps: Geometry Category (#602)
jenmerritt Jan 20, 2021
0db6d96
New Basemaps: Editing Category (#600)
jenmerritt Jan 20, 2021
7da2819
New Basemaps: Analysis and Display Information Categories (#599)
jenmerritt Jan 20, 2021
b669974
New Basemaps: Feature Layers Category (#601)
jenmerritt Jan 20, 2021
112223d
New Basemaps: Hydrography, Image layers and KML Categories (#603)
jenmerritt Jan 20, 2021
e0a94c0
New Basemaps: Map Category - part 1 of 2 (#604)
jenmerritt Jan 20, 2021
252b942
New Basemaps: Map Category - part 2 of 2 (#605)
jenmerritt Jan 20, 2021
aac0960
New Basemaps: Utility Network Category (#610)
jenmerritt Jan 20, 2021
aea5574
New Basemaps: Network Analysis and OGC Categories (#607)
jenmerritt Jan 20, 2021
51e0104
Merge branch master into dev after 100.10.0 release (#618)
jenmerritt Jan 28, 2021
891dfb9
Merge branch 'master' into dev
Feb 8, 2021
523a46d
Merge branch 'master' into dev
Feb 17, 2021
be54d65
Merge branch 'master' into dev
Mar 1, 2021
a7037d5
Merge branch 'master' into dev
Mar 11, 2021
894ff0e
Show labels on layer in 3D sample (#625)
Rachael-E Mar 15, 2021
eb39cb9
Merge branch 'master' into dev
Mar 25, 2021
6d09cb7
Merge branch 'master' into dev
Mar 29, 2021
047fce2
Use new constructor for label definition (#628)
Rachael-E Mar 30, 2021
6430c1e
Merge branch 'master' into dev
Mar 31, 2021
59e9bf8
Merge branch 'master' into dev
Mar 31, 2021
e5e4cc8
Merge branch 'master' into dev
Apr 22, 2021
ed37480
Merge branch 'master' into dev
Apr 29, 2021
a7e5b7e
Merge branch 'master' into dev
Apr 30, 2021
ffa434a
Merge branch 'master' into dev
May 4, 2021
088bde0
Merge branch 'master' into dev
May 10, 2021
af968bf
Merge branch 'master' into dev
Jun 2, 2021
8735707
Merge branch 'main' into v.next
Jun 11, 2021
916a981
Merge branch 'main' into v.next
Jun 23, 2021
0035496
Merge branch 'main' into v.next
Jul 1, 2021
b1d0e45
Merge branch 'main' into v.next
Jul 2, 2021
e27e416
update deprecated method (#649)
Rachael-E Jul 13, 2021
00ed0af
Merge branch 'main' into v.next
Jul 20, 2021
cce8436
Merge branch 'main' into v.next
Jul 29, 2021
8a5f413
Merge branch 'main' into v.next
Aug 4, 2021
7264b17
Merge branch 'main' into v.next
Aug 9, 2021
eb0c889
[Sample Update] Show curve in add graphics renderer (#654)
Rachael-E Aug 10, 2021
6a519de
Merge branch 'main' into v.next
Rachael-E Aug 16, 2021
c7fa8c7
Merge branch 'main' into v.next
Rachael-E Aug 23, 2021
6fd5e9e
add runtimeOnly dependency for slf4j for nop (#656)
Rachael-E Aug 23, 2021
2d3c0d0
[New sample] Set up location driven geotriggers (#657)
Rachael-E Aug 24, 2021
e4dfd1c
Merge branch 'main' into v.next
Rachael-E Aug 27, 2021
4b30ec5
Merge branch 'main' into v.next
Rachael-E Sep 9, 2021
5a5447c
Merge branch 'main' into v.next
Rachael-E Sep 14, 2021
5c7302b
Merge branch 'main' into v.next
Rachael-E Oct 7, 2021
b0cdf23
Merge branch 'main' into v.next
Rachael-E Oct 14, 2021
7e2550f
Merge branch 'main' into v.next
Rachael-E Oct 15, 2021
acf13bd
Merge branch 'main' into v.next
Rachael-E Oct 15, 2021
ba93786
Merge branch 'main' into v.next
Rachael-E Dec 3, 2021
9f04fe1
Merge branch 'main' into v.next
Rachael-E Dec 9, 2021
7dd2a15
Merge branch 'main' into v.next
Rachael-E Dec 14, 2021
4729f6b
[New Sample] Display dimensions (#669)
Rachael-E Dec 15, 2021
791639b
Merge branch 'main' into v.next
Rachael-E Dec 15, 2021
07fdaf7
Update README.md
Rachael-E Dec 16, 2021
6197050
Merge branch 'main' into v.next
Rachael-E Dec 16, 2021
5466a37
Update README.md
Rachael-E Dec 16, 2021
39c30d4
Merge branch 'main' into v.next
Rachael-E Dec 16, 2021
04869b0
Merge branch 'main' into v.next
Rachael-E Jan 7, 2022
480978e
Merge branch 'main' into v.next
Rachael-E Jan 14, 2022
0807a75
Merge branch 'main' into v.next
Rachael-E Jan 17, 2022
c1daea4
Merge branch 'main' into v.next
Rachael-E Jan 25, 2022
5d228b1
Merge branch 'main' into v.next
Rachael-E Feb 21, 2022
f3a268e
Merge branch 'main' into v.next
Rachael-E Feb 21, 2022
e30506d
Merge branch 'main' into v.next
Rachael-E Feb 24, 2022
201accb
Merge branch 'main' into v.next
Mar 9, 2022
79f1096
Merge branch 'main' into v.next
Mar 23, 2022
92d869a
Merge branch 'main' into v.next
Mar 28, 2022
d865dbd
Merge branch 'main' into v.next
Apr 7, 2022
e325965
Merge branch 'main' into v.next
Apr 13, 2022
1bcd023
Merge branch 'main' into v.next
Apr 19, 2022
cb58c91
remove outdated reference to authentication requirement
Apr 25, 2022
c97506a
fix find route button bug
Apr 25, 2022
ef6878f
remove unused import
Apr 25, 2022
380f39d
update raster service url
Apr 26, 2022
6a83ac3
Merge branch 'main' into v.next
Apr 27, 2022
4c5c813
Merge branch 'main' into v.next
Rachael-E Jun 15, 2022
5350bb0
Merge branch 'main' into v.next
Rachael-E Jun 28, 2022
a46a8a7
Merge branch 'main' into v.next
Rachael-E Jun 29, 2022
b93cf93
Merge branch 'main' into v.next
Rachael-E Jul 15, 2022
d02c8c8
Merge branch 'main' into v.next
Rachael-E Jul 21, 2022
4448f1f
Merge branch 'main' into v.next
Rachael-E Jul 22, 2022
812912b
Merge branch 'main' into v.next
Rachael-E Jul 27, 2022
c8174f4
Merge branch 'main' into v.next
Rachael-E Jul 28, 2022
44e87eb
Merge branch 'main' into v.next
Rachael-E Jul 29, 2022
a119cf3
Merge branch 'main' into v.next
Rachael-E Jul 29, 2022
4977b89
Merge branch 'main' into v.next
Rachael-E Aug 2, 2022
5d4fc7a
Merge branch 'main' into v.next
Rachael-E Aug 3, 2022
6ab6538
Merge branch 'main' into v.next
Rachael-E Aug 3, 2022
f91a1cd
Merge branch 'main' into v.next
Rachael-E Aug 5, 2022
017d367
update to cql2 (#705)
Rachael-E Aug 10, 2022
90c3752
Merge branch 'main' into v.next
Rachael-E Aug 17, 2022
8b3734e
Merge branch 'main' into v.next
Rachael-E Aug 25, 2022
5d5495e
Merge branch 'main' into v.next
jenmerritt Sep 13, 2022
2bdd9a4
Update v200 develop branch with modularized samples from Beta (#734)
jenmerritt Oct 14, 2022
f241e70
Fix colormap to use Color (#735)
D-R-Smith Oct 18, 2022
34556a0
Merge branch 'main' into v.next
jenmerritt Oct 20, 2022
8fee253
Merge branch 'v.next' into v200.develop
jenmerritt Oct 20, 2022
a464c6d
[Samples Update] Modularize analysis category (#736)
Luiy0 Oct 21, 2022
2305f98
[Update] Modularize display-information category (#738)
Luiy0 Oct 24, 2022
24dec17
Modularize Editing Category (#740)
jenmerritt Oct 25, 2022
b048ac7
Modularize geometry category (#743)
jenmerritt Oct 25, 2022
2a0d65a
Feature Layer Category Modularization (#742)
jenmerritt Oct 25, 2022
70a61aa
[Update] Modularize scene category (#741)
Luiy0 Oct 25, 2022
454bf40
modularize group layers and image layers (#744)
jenmerritt Oct 25, 2022
fe218c5
[Update] Add properties to display-information category (#739)
Luiy0 Oct 25, 2022
938e2b0
[Update] Modularize search-tiledLayers-portal categories (#745)
Luiy0 Oct 28, 2022
1f60f4e
Modularize kml samples (#748)
jenmerritt Oct 28, 2022
5d5dd81
Modularize map category (#749)
jenmerritt Oct 31, 2022
fa38f5d
[Update] Modularize raster category (#750)
Luiy0 Oct 31, 2022
f706fc8
Modularize map view (#752)
jenmerritt Oct 31, 2022
58107ae
Modularize local-server category (#751)
Luiy0 Oct 31, 2022
2a01a33
Modularize ogc (#754)
jenmerritt Nov 1, 2022
cd54c03
Modularize network analysis (#753)
jenmerritt Nov 1, 2022
eec8351
[Update] Modularize symbology category (#747)
Luiy0 Nov 1, 2022
5da6314
Update arcgisVersion
jenmerritt Nov 2, 2022
5adde00
Fix deprecated color
jenmerritt Nov 2, 2022
4893b31
Testing mapScale property (#756)
Luiy0 Nov 7, 2022
00048e9
Testing sunTime and sunLighting properties (#755)
Luiy0 Nov 7, 2022
b17bff8
Testing drawStatus property 1 (#757)
Luiy0 Nov 9, 2022
27b43e3
Testing drawStatus property 2 (#758)
Luiy0 Nov 9, 2022
a96d547
[Update] Use properties in scene category (#746)
Luiy0 Nov 18, 2022
44a6467
Testing navigating property (#759)
Luiy0 Nov 22, 2022
7c660fd
Testing mapRotation property (#760)
Luiy0 Nov 22, 2022
a68a793
Update samples to use Color class (#761)
Luiy0 Nov 23, 2022
4848452
Product rebranding (#764)
Rachael-E Nov 24, 2022
dd30e9c
Testing loadStatus property (#762)
Luiy0 Dec 1, 2022
0b17fee
Merge branch 'main' into v.next
jenmerritt Dec 1, 2022
e6d4f0b
Testing loadStatus property 2 (#763)
Luiy0 Dec 5, 2022
b1b947a
Refactor format coordinates (#766)
jenmerritt Dec 5, 2022
a5f2c1b
Refactor identify kml (#767)
jenmerritt Dec 5, 2022
ed40083
Add error handling (#768)
jenmerritt Dec 6, 2022
90453c7
Merge branch 'main' into v.next
jenmerritt Dec 12, 2022
d738e62
Merge branch 'main' into v.next
jenmerritt Dec 14, 2022
be0fbc3
Merge branch 'v.next' into v200.develop
jenmerritt Dec 14, 2022
c1dd7a5
Rebrand comments in module files
jenmerritt Dec 14, 2022
898009e
Merge branch 'main' into v.next
jenmerritt Dec 16, 2022
a36e490
Merge branch 'v.next' into v200.develop
jenmerritt Dec 16, 2022
010cd22
Fix to edit feature linked annotation sample structure
jenmerritt Dec 16, 2022
d8a6f36
Fix to edit feature linked annotation metadata
jenmerritt Dec 19, 2022
e5b39f7
add v200.develop to git workflows
Mar 20, 2023
fba7c78
remove v200.develop from git workflows
Mar 20, 2023
d7a3710
add v200.develop to git workflows (#776)
Luiy0 Mar 20, 2023
da63e03
Update metadata style check scripts (#777)
Luiy0 Mar 24, 2023
49e6c7a
add commas (#779)
Luiy0 Mar 24, 2023
2e24e90
OpenMap(URL) remove faulty webmap from sample (#778)
Luiy0 Mar 27, 2023
46e9b91
[Sample] Add Dynamic Entity Layer (#774)
Luiy0 Mar 29, 2023
c23798d
Merge branch 'main' into v.next
jenmerritt Mar 31, 2023
e93e62e
Updating commons.io and module changes (#783)
mbcoder Apr 4, 2023
6ceb712
Merge branch 'main' into v.next
jenmerritt Apr 6, 2023
c97c728
Update arcgis version (#784)
jenmerritt Apr 19, 2023
60eb029
Merge branch 'main' into v.next
jenmerritt Apr 19, 2023
41f84cd
[New Sample] Create and Edit Geometries (#786)
01smito01 May 4, 2023
e5c0217
Merge branch 'main' into v.next
jenmerritt May 30, 2023
856b157
Update CreateAndSaveMapController.java (#787)
louis103 May 19, 2023
19184c8
Replace WMS service (#789)
jenmerritt May 30, 2023
d7e16d1
Update ViewshedLocationController.java
jenmerritt Jun 16, 2023
a8bd977
Update JavaFX colors
jenmerritt Jun 20, 2023
d242167
Merge branch 'v.next' into v200.develop
jenmerritt Jun 28, 2023
5d1bdff
Merge pull request #792 from Esri/v200.develop
jenmerritt Jun 30, 2023
37edfbc
Add changes from deployment branch (#791)
jenmerritt Jun 30, 2023
8412128
CompletableFuture in samples (#788)
01smito01 Jun 30, 2023
b5f962b
ManageBookmarksSample: bind the ListView to the map's list of Bookmar…
alan-edi Jul 11, 2023
7f2e134
MapImageLayerSublayerVisibilitySample: use ListView instead of discre…
alan-edi Jul 19, 2023
4d10c8b
Created Sample -DisplayRouteLayer (#795)
ricmaurya Jul 19, 2023
64b040e
Sample Update: Add Dynamic Entity Layer (#798)
01smito01 Jul 26, 2023
9d5c2d9
Update create and edit geometries sample with scale/rotate/shapes (#797)
Aug 8, 2023
2f34857
Add sample for custom dynamic entity data source (#799)
D-R-Smith Aug 10, 2023
542dc05
Amend resource location (#801)
jenmerritt Aug 11, 2023
dd82e8d
Merge branch 'main' into v.next
jenmerritt Aug 16, 2023
9743da4
Replacing deprecated sketch editor with new geometry editor (#804)
mfeigl Oct 5, 2023
2184ff3
JavaFX plugin update to remove Gradle 9 warnings (#807)
mbcoder Oct 6, 2023
83e04a6
Mark/8454 ant zip (#810)
mbcoder Oct 11, 2023
8a9bcd1
update v.next to be same as main (#819)
mbcoder Jan 11, 2024
b7e8e70
Fixing formatting error flagged up by git hook (#821)
mfeigl Jan 17, 2024
5de9824
Merge branch 'v.next' into main
mfeigl Jan 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

These merge commits were added into this branch cleanly.

There are no new changes to show.