github.com/tethysplatform/tethys commits | Ecosyste.ms: OpenCollective

Another pass...

e065fc4267560dc2a7aa87f12343ff90a18d635e authored over 7 years ago by Gage Larsen <[email protected]>

Try another pass at username stuff

fb6f8a599ea391b17664f39e3a7cd1dc6f7e145f authored over 7 years ago by Gage Larsen <[email protected]>

revert back to old

5175f18bd3c9f4a81350ae072fa5a847942ed94c authored over 7 years ago by Gage Larsen <[email protected]>

update if statement for users (again)

5487a186e56ed5536e200331cabfe35b524e9363 authored over 7 years ago by Gage Larsen <[email protected]>

update if statement for users (again)

81838b657651aae0ca6b640dce778e6badaf5c7e authored over 7 years ago by Gage Larsen <[email protected]>

update if statement for users

14ae2a3502e61dac52ea0e670eda43119c5d0d29 authored over 7 years ago by Gage Larsen <[email protected]>

update if statement for users

1e6bc1c5b9678e45099abc4ed85b8dab874350b4 authored over 7 years ago by Gage Larsen <[email protected]>

Fix check for user in database

8202133c5c1fe09bd8e1a20b1b58401b7e8d35ad authored over 7 years ago by Gage Larsen <[email protected]>

Add docker stuff

8fd7f0a494c5bd402c0445c988f7cdb6a6a3e653 authored over 7 years ago by Gage Larsen <[email protected]>

Merge branch 'master' into 'release'

Update to Tethys 2.0 and start using "release" branch as the defacto branch for latest/stable (o...

6a98be9bb87eb9ce97044c31e2a72d2b1d5aad35 authored over 7 years ago by Shawn Crawley <[email protected]>

Merge branch 'dev' into 'master'

Update to Tethys 2.0 and start using "master" branch as the defacto branch for development

See ...

fb7e1a9923af10faddbf4decf44af334368b7093 authored over 7 years ago by Shawn Crawley <[email protected]>

resolve conflicts

c5b2cf8d214a4aa6c1d7cde78fbbee116099b57e authored over 7 years ago by Shawn Crawley <[email protected]>

fixed conflicts

9fa53dce93bd2451a6ee26b1a22c4ab4aad35fbd authored over 7 years ago by Shawn Crawley <[email protected]>

get feature layer from group layer on wfs requests

cf30c304ad8b2870d357f1dd08376f43a19c3a7c authored over 7 years ago by Shawn Crawley <[email protected]>

minor cleanup

7361e9713dcd5d9f09d16d48b2838cdc6f14e087 authored over 7 years ago by Shawn Crawley <[email protected]>

remove unused changes

a4d90a9cb236eabed1da07da67c0823dcc5020b4 authored over 7 years ago by Shawn Crawley <[email protected]>

remove temp troubleshoot prints

96d4ef1bb6e4908327c6a023061a2a816a3cf80d authored over 7 years ago by Shawn Crawley <[email protected]>

fixed issues with testing framework

7312275384b71414d1b65e875e46ea116aaa5e50 authored over 7 years ago by Shawn Crawley <[email protected]>

Merge branch 'pre-migration-stable' into dev

c8ca5a27435c4b51db2760588f9cf0bf87c734b4 authored over 7 years ago by Shawn Crawley <[email protected]>

ignore rmtree errors on condor folders delete

72a10a4b22d3b4d36bee6312975a5044ebed2980 authored over 7 years ago by Shawn Crawley <[email protected]>

Merge branch '290-hydroshare-oauth-hotfix' of https://github.com/zhiyuli/tethys into zhiyuli-290-hydroshare-oauth-hotfix

71400431d2d61ef929dea9f857b8a31d85131d03 authored over 7 years ago by swainn <[email protected]>

Merge remote-tracking branch 'upstream/release' into upstream-release

# Conflicts:
# environment_py2.yml

fcb6b6d630bfd58645d7e391104383152f179711 authored over 7 years ago by swainn <[email protected]>

remove print statments

0a5112ead4b934f1d67b0d6063a17bfefae31810 authored over 7 years ago by drew <[email protected]>

fix issue 290-hydroshare-oauth

15b63f3b597c5c84d1cddb642c5931ed89204b2b authored over 7 years ago by drew <[email protected]>

Fix Installation (#303)

* Fixes `gen settings` command on Windows install script
* Fixes `DOSKEY tstart` command in Wind...

3f6ec88a95594461b52e480c5a40388e3b70a5dc authored over 7 years ago by sdc50 <[email protected]>

Fix Installation (#302)

* Fixes `gen settings` command on Windows install script
* Fixes DOSKEY tstart command in Window...

d6ba1e5ec05de653a93095ba08de270e04589ce5 authored over 7 years ago by sdc50 <[email protected]>

Fix pip versions issues.

(cherry picked from commit 22de509)

7a8da8185956c54b1bb731ea522108bd7124b1f0 authored over 7 years ago by swainn <[email protected]>

Froze requirements for release.

(cherry picked from commit 7155fef)

8c5d9eb38802ed6149f27d1f386f3106d8ff25a4 authored over 7 years ago by swainn <[email protected]>

Merge branch 'dev' of https://github.com/tethysplatform/tethys into dev

ac1f10a70eeda0cdfaeebc0d5559811f3d51e39f authored over 7 years ago by Shawn Crawley <[email protected]>

Fix pip versions issues.

986c9aeefc4cb723f6fa4053ea75e3d8b5806b75 authored over 7 years ago by swainn <[email protected]>

Froze requirements for release.

e5a303c4b99eee3c3b150034246bc79267b75a38 authored over 7 years ago by swainn <[email protected]>

Version in setup.py set to 2.0.0.

e32247f678ab11f9b694343912cf3e95fcb576d5 authored over 7 years ago by swainn <[email protected]>

Minor docs fix.

e5857ef27eb44cd4d03c1901b89ffb7c3c36814b authored over 7 years ago by swainn <[email protected]>

Merge branch 'tethys-docs-overhaul' into dev

e7df1f842428ea6769a603402ddb64c466ec11e0 authored over 7 years ago by swainn <[email protected]>

Validated advanced solution.

c3e6e8581e733448da552986cbf0f4465ba8d9dd authored over 7 years ago by swainn <[email protected]>

Validated intermediate solution.

2c7a11129ab147614e7c2636f3e01e32afa2a468 authored over 7 years ago by swainn <[email protected]>

Validated beginner solution and create new environment tutorial. Also, updated the what's new page.

5f7ea9c64585f8de2256bd864c4d3d6dba061a9c authored over 7 years ago by swainn <[email protected]>

Removed reference to Tethys Cluster in Features documentation. Also added warnings to the update documentation, which has not been completed yet.

7625290c3c169053ad4d91f482351e0dd15f3baf authored over 7 years ago by swainn <[email protected]>

Merge branch 'sdc50-production_installation' into dev

3a50600a7e4eeff477d36f7c0a776fed31ff7c85 authored over 7 years ago by swainn <[email protected]>

Removed old tethys_conda_env.yml and removed old scaffold_command function that got merged during a rebase.

f9fb5e536b34004d57c8e1b34dc6ab5b2e1078ef authored over 7 years ago by swainn <[email protected]>

Merge remote-tracking branch 'upstream/dev' into production_installation

# Conflicts:
# tethys_apps/cli/__init__.py

0cc269e6a978db880a64f9cb0d90e51d5ff29728 authored over 7 years ago by rditlsc9 <[email protected]>

Merge remote-tracking branch 'origin/production_installation' into production_installation

# Conflicts:
# scripts/install_tethys.sh
# tethys_apps/cli/gen_commands.py

c3b7a6e55a79c2891173fa684feeadd1b24d5494 authored over 7 years ago by rditlsc9 <[email protected]>

Merge remote-tracking branch 'origin/migrations' into production_installation

# Conflicts:
# scripts/install_tethys.sh
# tethys_apps/cli/gen_commands.py

2c0a1bdf4cf5cbaabd665d750c0eb39f1b0b8249 authored over 7 years ago by rditlsc9 <[email protected]>

production install script updates

aab279d1acb99be9ff1e41f4faa21587ba3769ec authored over 7 years ago by rditlsc9 <[email protected]>

Merge branch 'pre-migration-stable' into 'dev'

Pre migration stable

See merge request !5

dcd08fd9446350a38b882a1f2b20c9ae6fab2c26 authored over 7 years ago by Shawn Crawley <[email protected]>

added imports to testing sdk

424e9f019c4fb4baf3d3a232c92777d931aadd1e authored over 7 years ago by Shawn Crawley <[email protected]>

Trying static and workspaces in tethys_home

17ff87f70bba11830a072bb601dd097aed3f6f9c authored over 7 years ago by rditlsc9 <[email protected]>

Docs update

a5cd325b5842afe527b039a835a8bdcd4ccb32c1 authored over 7 years ago by rditlsc9 <[email protected]>

Production install (#2)

* move production server files as gen templates

* production installation docs update

* update...

f56f6bf804fbb4aeec8310e7efc0752976464449 authored over 7 years ago by sdc50 <[email protected]>

Removed old getting started tutorial and references.

bd6838145d23dc3acf28557754fbf2c78e011ae7 authored over 7 years ago by swainn <[email protected]>

Stubbed out advanced tutorial. Need to fill in still.

0f87942224836fd28ca57ef8e3d24f916b13b383 authored over 7 years ago by swainn <[email protected]>

Added dynamic plotting in popups tutorial to advanced tutorial. Also, fixed popup bug with setTimeout.

fd61fa448ea49680a6a7aeec082fb4a84251af47 authored over 7 years ago by swainn <[email protected]>

Adding file upload example to Advanced tutorial.

e75436df999355c0bfd153cfe7f91ae71c5c4f2c authored over 7 years ago by swainn <[email protected]>

Polishing the advanced tutorial.

df9892f6c4949fa0d731f1649df7ffcb408037b3 authored over 7 years ago by swainn <[email protected]>

Fixed issue with settings loading multiple times.

afe55a5bdf7793d839a589ba63025f0ab54397b1 authored over 7 years ago by swainn <[email protected]>

Outlined the advanced tutorial.

d4bffd0a75eda7bb2e624f561fcf9dc89be3b620 authored over 7 years ago by swainn <[email protected]>

Added style to Dam map layer in intermediate tutorial. Further polishing.

cd75724c6efa82b106454800b60f891dbaf0dbb0 authored over 7 years ago by swainn <[email protected]>

Finished polishing the intermediate tutorial. Also, added custom CSS to map in the beginner tutorial.

c86b62699e00e622b524c1387c3ddf28fc18624d authored over 7 years ago by swainn <[email protected]>

Revising tutorials.

66e4f175494d2b3417c6abdb6548960846f88dd5 authored over 7 years ago by swainn <[email protected]>

Filled out narrative and explanations for the Beginner Tutorial.

fe4969a64dbd648fd662beebe8a5ad99c3b36e34 authored over 7 years ago by swainn <[email protected]>

Added TODOs that need to be addressed to fix syncing with settings.

1680cf5ca1f83b0b83eb35132c97cc5a51709f73 authored over 7 years ago by swainn <[email protected]>

Squash migrations

66e8904a142fbe4c5562f0c638e640685b8169c4 authored over 7 years ago by rditlsc9 <[email protected]>

Docs update

1f4552b1ba74e1cb8b260160d4054a10aaeb807e authored over 7 years ago by rditlsc9 <[email protected]>

Trying static and workspaces in tethys_home

7a3a131b79a246bf006a1154170e42362db0805e authored over 7 years ago by rditlsc9 <[email protected]>

Production install (#2)

* move production server files as gen templates

* production installation docs update

* update...

05e675c58d36357154e7412a5fa239401c21a1a1 authored over 7 years ago by sdc50 <[email protected]>

Trying static and workspaces in tethys_home

2e1d6c3f5896914e52a7f785a3c313b84c50f1f7 authored over 7 years ago by rditlsc9 <[email protected]>

Merge branch 'SarvaPulla-dev' into dev

07cbc1911c52b52a29f2c8edf516a9c499966025 authored over 7 years ago by swainn <[email protected]>

Merge branch 'dev' of https://github.com/SarvaPulla/tethys into SarvaPulla-dev

aa9a8f938be33d9247df22e5aaa42c260d2c8097 authored over 7 years ago by swainn <[email protected]>

Merge remote-tracking branch 'upstream/dev' into dev

e3207f75db7f8eaaacd72b42cb470e79262ed4ee authored over 7 years ago by swainn <[email protected]>

Merge branch 'mmbayles-mapview/layer_style' into dev

c7f48649e2229c257c9d82b0bbefcb4187f5d7df authored over 7 years ago by swainn <[email protected]>

Added what's new entry for MVLayer styles.

b44ae0f6fe61906a67c9b522fae9b66f36a54537 authored over 7 years ago by swainn <[email protected]>

Merge branch 'mapview/layer_style' of https://github.com/mmbayles/tethys into mmbayles-mapview/layer_style

c641d269ae85afce9c5c7592bd58bed8056eefeb authored over 7 years ago by swainn <[email protected]>

Merge pull request #288 from shawncrawley/dev

Bugfix: Postgis extension enabling now functions

50d4a83b5600c7c9f14d94237030f287a9bab05e authored over 7 years ago by Nathan Swain <[email protected]>

merge with remote and conflict fixes

5a2cf65f0ac09d46a22278bfa1d7a433bb53c893 authored over 7 years ago by Shawn Crawley <[email protected]>

bugfix: postgis extension can now be enabled

3d3040a6d3e9c0bb008ccb72b50f6743a56b29c3 authored over 7 years ago by Shawn Crawley <[email protected]>

bugfix: postgis extension was not being enabled

f8407940079d29085ac0348e6bd8dfc9cf4c8a84 authored over 7 years ago by Shawn Crawley <[email protected]>

Merge remote-tracking branch 'origin/production_installation' into production_installation

# Conflicts:
# docs/production/installation.rst
# scripts/install_tethys.sh

164198e6941c1c8315af54e48c410a04a2383be9 authored over 7 years ago by rditlsc9 <[email protected]>

Docs update

28b0dece01b907c2d1b12e94a19c55eb783f4d19 authored over 7 years ago by rditlsc9 <[email protected]>

added example modifying point style

62ffb5ec0364cc1703a0ce0504ed9f913f568a9b authored over 7 years ago by Matthew Bayles <[email protected]>

testing environment functions isolated

c00331c002db24ae1e0102d0d2c531dc6d99e744 authored over 7 years ago by Shawn Crawley <[email protected]>

made stable

db37dd61fd1cb4f74786604a83997676e05dfc7d authored over 7 years ago by Shawn Crawley <[email protected]>

added style modification ability from mapview gizmo

f0f4706c2707b38abc45812f04f42cd1663e7cd7 authored over 7 years ago by Alan D. Snow <[email protected]>

Enable symbolic link on windows. Only works for admin.

42a2523a60ace7445a938422dbfc933dec2730a9 authored over 7 years ago by SarvaPulla <[email protected]>

Tethys 256 scaffolding (#284)

* Implementing custom scaffolding command. Metadata user input and validation complete.

* Compl...

aa9c020d9a1ec604851adb8c075349e585c39f27 authored over 7 years ago by Nathan Swain <[email protected]>

Production install (#2)

* move production server files as gen templates

* production installation docs update

* update...

28b72c386aa81de2bb1f85af70a41a12cae7f9f0 authored over 7 years ago by sdc50 <[email protected]>

Production install (#2)

* move production server files as gen templates

* production installation docs update

* update...

4b8fabff95f31c02fe924b11c6b34f8d3dd8a059 authored over 7 years ago by sdc50 <[email protected]>

Migrated Django to 1.11.X (#275)

* made a testing environmental variable

* removed unnecessary import

* initial implementation ...

eb7008622c07ebb05d009bf6ab7e3b285746c041 authored over 7 years ago by Nathan Swain <[email protected]>

Merge remote-tracking branch 'upstream/dev' into dev

7276900e43d8c29235ce7cc2afd49f134797b999 authored over 7 years ago by swainn <[email protected]>

Merge branch 'shawncrawley-aqua-tethys-mods' into dev

6d55e5a6ce27f98ec0c72930d040c8b299e0c91e authored over 7 years ago by swainn <[email protected]>

Finished pull request. Closes #283.

8a992d27b145a6a18948c4380a4e51f0eca1bf54 authored over 7 years ago by swainn <[email protected]>

Fixed issues with base map switcher: needed to add new styles to tethys_map_view.less and regenerate tethys_map_view.min.css.

eb6d8c925608ed3df55651ac63a33e48bf9fa6af authored over 7 years ago by swainn <[email protected]>

Fixed issue with circular import with testing environment, also fixed issue with tethys gen command not working properly with upgrade to Django 1.11.

e79e42d8559fbe0c49b0447f1380a3f8ebae84a7 authored over 7 years ago by swainn <[email protected]>

Merge pull request #272 from swainn/tethys-261

tethys-261 tethys docker intit -c postgis geoserver

459bd5fe4c5d14e89d2a4fa081b117f6dc1e17b3 authored over 7 years ago by Nathan Swain <[email protected]>

Merge branch 'aqua-tethys-mods' of https://github.com/shawncrawley/tethys into shawncrawley-aqua-tethys-mods

ff2745af6279298bd172120c6ea146754f30fae6 authored over 7 years ago by swainn <[email protected]>

fixed testing environment issues with Tethys 2.0 code

e85b705a099d58f150777fee033293124920b9c7 authored over 7 years ago by Shawn Crawley <[email protected]>

fixed unresolved merge conflict

1498262ed71f96603a4d1343c139903db03f76f6 authored over 7 years ago by Shawn Crawley <[email protected]>

merge to latest dev; conflicts resolved; aqua-tethys featueres added;

32c05b2c1bc1f5955ad41fcc6747ad708428a69c authored over 7 years ago by Shawn Crawley <[email protected]>

added enable to script so it starts up again when computer restarts (#280)

* added enable to script so it starts up again when computer restarts

63808ba9679206c777664b2de7451b55299ed58f authored over 7 years ago by Alan D. Snow <[email protected]>

Merge pull request #276 from snowman2/mapview

Removed get_session

8ba9db7eeb9e7d8a6633586b4b16a959da273698 authored over 7 years ago by Nathan Swain <[email protected]>

remove sessionmaker class var

fbeb29c3e25613cc01d113327da3c619f25f09b4 authored over 7 years ago by Alan D. Snow <[email protected]>