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

Merge remote-tracking branch 'origin/python3-compatibility' into python3-compatibility

# Conflicts:
# tethys_apps/management/commands/tethys_app_uninstall.py

4c5ce2a41439497be4d232c6dca68b754668285b authored over 6 years ago by rditlsc9 <[email protected]>

Python3-Migrations

ed34cb3cf859c7b22afc25c8e9771da8c548555b authored over 6 years ago by rditlsc9 <[email protected]>

Python 3 compatibility fixes

5e32896bf0ba9770b66cffb16de428465391dbd5 authored over 6 years ago by rditlsc9 <[email protected]>

More python 3 compatibility fixes

6dea22add324a4086a745029c7e60f3e2e47473a authored over 6 years ago by rditlsc9 <[email protected]>

Python3-Compatibility

280087ebb77b138e53646f017d8913e56ac75fe4 authored over 6 years ago by rditlsc9 <[email protected]>

update install script and docs to provide more flexibility for CI (#339)

82ee6ca47d35d9019844b8df14af8d266a2612d1 authored over 6 years ago by sdc50 <[email protected]>

Update .travis.yml

698cd52ad7595d05eeb1cf8cc0d77066e0f3464c authored over 6 years ago by sdc50 <[email protected]>

Update .travis.yml

d770cbdfee79f7435563089948a57d55ba31033a authored over 6 years ago by sdc50 <[email protected]>

Update .travis.yml

454a41b2143a5afd7d497c0b96572ea46a2489f0 authored over 6 years ago by sdc50 <[email protected]>

Update .travis.yml

5046b8b98dabed1b7f86d5d512d3b087c5150293 authored over 6 years ago by sdc50 <[email protected]>

Merge remote-tracking branch 'origin/python3-compatibility' into python3-compatibility

# Conflicts:
# tethys_apps/management/commands/tethys_app_uninstall.py
# tethys_config/context_p...

7923102ab01cca3f71ad12948f8881829cbb6fbe authored over 6 years ago by rditlsc9 <[email protected]>

More python 3 compatibility fixes

0c55063c1f90addf23b45f1bb4693456f25b6953 authored over 6 years ago by rditlsc9 <[email protected]>

Update .travis.yml

fb5913c3dc48c80270cfa51968aa1cf7617baaa7 authored over 6 years ago by sdc50 <[email protected]>

Create .travis.yml

6f591e37ebb78738c1f5b234e24b5a573c7d94dd authored over 6 years ago by sdc50 <[email protected]>

Python3-Migrations

b6d32dcbeca6ea5a58a4ec826cb3e7c19ae5021c authored over 6 years ago by rditlsc9 <[email protected]>

Python 3 compatibility fixes

f9a29351e0456e9da2810d3a3a8fe53c4bf5f092 authored over 6 years ago by rditlsc9 <[email protected]>

Python3-Compatibility

9d2f3dcb1c7252a0d7f9dcd54e9176f19bb7b3af authored over 6 years ago by rditlsc9 <[email protected]>

Python3-Compatibility

ac2172abb1ed893e2ddc12aafe1de6b7d1e21989 authored over 6 years ago by rditlsc9 <[email protected]>

Fix issues with the tethys manage sync command.

eed56f8a21e5336a1d31d652e36d5c5b6d211b64 authored over 6 years ago by Gage Larsen <[email protected]>

Merge pull request #335 from swainn/master

Aquaveo Contributions

26d6f9c2411dc9cbc9908193e69ccc0968476514 authored over 6 years ago by Nathan Swain <[email protected]>

Merge branch 'method_permission_required' into swainn-master

5c0b2a45973d2826125c5219b23f77730560736b authored over 6 years ago by nswain <[email protected]>

Added namespace property to tethys apps and context processor.

4706e2a083c1ac17fc63f66c558fe08910b85431 authored over 6 years ago by nswain <[email protected]>

Added namespace property for tethys apps.

56410c2b4081af4e6b5682486fa7b8a93f91beb1 authored almost 7 years ago by nswain <[email protected]>

Added base TethysController class based view.

7e6441ff0ea8c096a1334a6ef7be7923d6530abf authored almost 7 years ago by nswain <[email protected]>

Removed print statements used for debugging.

b79fcd4ab772a13fe4b23da5b617fa901f0b0e99 authored almost 7 years ago by nswain <[email protected]>

Fixed typo in app base, fixed issue with get_persistent_store_setting methods, fixed an issue with function extractor, made has_permission decorator able to handle methods, fixed several utf encoding issues.

8c03a606b75b8c761f29bd5dc8dba930cad9b1fb authored almost 7 years ago by nswain <[email protected]>

Merge branch 'for_upstream' into swainn-master

a31df45a4c2c2fa93df3db20fa4d689eb36b41e0 authored almost 7 years ago by nswain <[email protected]>

Merge branch 'upstream-master' into swainn-master

7b6d165364f47a9fb8661fdaf955fa6dc5dc8055 authored almost 7 years ago by nswain <[email protected]>

Merge remote-tracking branch 'swainn-tethys/master' into swainn-master

0deb8fbf7c9a6ff97be71f0ff095fcac0a6485d0 authored almost 7 years ago by nswain <[email protected]>

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

b2e60a7892240f279c08257ccdae983fdbb7ac19 authored almost 7 years ago by nswain <[email protected]>

Added gitlab-ci.

481b7e39f27a30d61a341956235ff300d90d1539 authored almost 7 years ago by nswain <[email protected]>

Removed the dang prints!@#!@

d75c297f590029bf80c94b430630856e3e652723 authored almost 7 years ago by nswain <[email protected]>

Fixed bug with uninstalling apps and extensions.

9604f8d6dd0b02d693c5cbb66244bacae4d7380e authored almost 7 years ago by nswain <[email protected]>

Manually refactoring after merge complete.

8b0f2cc3f6c90e6db8e74ae94ee1c10fd4b8d183 authored almost 7 years ago by nswain <[email protected]>

Merge branch 'master' into for_upstream

# Conflicts:
# tethys_apps/base/app_base.py
# tethys_apps/harvester.py
# tethys_apps/management/...

e73ee17298ac020931044129b0a19eab9659d81c authored almost 7 years ago by nswain <[email protected]>

Revert print statement commit...

ca2e5c47ff20d93f4db7b8014326de77cf644fa1 authored almost 7 years ago by nswain <[email protected]>

Remove default controllers from extension template.

fe8195cfe19ec532819be12a38a9dd007f3f86e6 authored almost 7 years ago by nswain <[email protected]>

Added django model migration for tethys extensions.

cad445a7435f2f6b19ba3aea3fec7fcabf01e2ec authored almost 7 years ago by nswain <[email protected]>

Expanded tethys test command to test extensions. Added default test package back to the scaffold for extensions.

9d3f1f63600fbfddce878d9f15083c3d2f02820e authored almost 7 years ago by nswain <[email protected]>

Removed aquaveo_static from the directory structure and the docker file.

14d8b074773e10389f2808b8262751ebf12cc6a6 authored almost 7 years ago by nswain <[email protected]>

Generalized url loading to load urls from apps and extensions separately so that the appropriate namespace could be applied to the controllers (tethysext vs tethysapp). Loading extension urls with "extensions" as the root of the url.

3e3d869ecde6ba3bd8e5c16ae4cc23d5b2fef1a3 authored almost 7 years ago by nswain <[email protected]>

Finished documentation for Tethys Extensions.

63d85477195ee1b6bc480866b9527cf0dad214f6 authored almost 7 years ago by nswain <[email protected]>

Finished documentation for Tethys Extensions.

2d9b5e815431fe18d8c3ee55e4851ec747f596d4 authored almost 7 years ago by nswain <[email protected]>

Added documentation for Tethys Extensions.

038dbc1f6c9680404f40fd3c25ab88e20e29cf46 authored almost 7 years ago by nswain <[email protected]>

Added support for gizmos in extensions.

29c47d1586023e39e1035c25006d0a4598191253 authored almost 7 years ago by nswain <[email protected]>

Renamed syncapp command to sync and generalized to sync extensions. Updated list command to list extensions and apps. Updated docs.

12de314d0214fa47c1a5a14f30a9c654506c84f3 authored almost 7 years ago by nswain <[email protected]>

Updated the uninstall and collectstatic commands to work with the new extensions.

55900c1dd4bcbc5603bbfecda0cd64306e5b4369 authored almost 7 years ago by nswain <[email protected]>

Template and static finders work with extensions installed with "develop" and "install" commands.

98cd81771d7525af0be8707e7f4eecd4d9c0b066 authored almost 7 years ago by nswain <[email protected]>

Load templates for extensions.

5c527e4f9b57879b9d21f25eb1490e471985772b authored almost 7 years ago by nswain <[email protected]>

Load url maps from extensions

0360480b9728a1d8e207513e1714a7b536011085 authored almost 7 years ago by nswain <[email protected]>

Added extensions to the admin portal, and generalized sync db to add extensions.

efdb6f3370fe1a29b893743cad31e0cb530badeb authored almost 7 years ago by nswain <[email protected]>

Added scaffold for Tethys Extensions and generalized scaffold command and scaffold template, added methods to harvester to handle harvesting extensions, defined Django data model for extensions, replaced django.core.urlresolvers with django.urls (per deprecation warnings)

6ecee707f4ab06610b761f6ba8c519338961dbcb authored almost 7 years ago by nswain <[email protected]>

Merge pull request #332 from zhiyuli/331-Create-API-Token-for-new-USER-object

331-Create-APT-Token-for-new-USER-object

2a911e0b8d4a21283ae0a2d1a211f5f72329235f authored almost 7 years ago by Nathan Swain <[email protected]>

commit

253ce34c44d91c04ce6109c57e4fb83e22425a75 authored almost 7 years ago by zhiyuli <[email protected]>

Merge remote-tracking branch 'aqua-tethys/master'

858f38a9df838a07fccb8d18c7bf909a85a95df5 authored almost 7 years ago by nswain <[email protected]>

Changed return exit code to 0 for create scheduler and remove scheduler cli when scheduler already exists or doesn't exist, respectively.

628d93abd34fb1dbd7f33fdde4b5ec48d692d659 authored almost 7 years ago by nswain <[email protected]>

Merge branch 'tethys-gizmo-bug-fix' into 'master'

Tethys gizmo bug fix

See merge request tethys/aqua-tethys!21

f2f1da4545de1456eac5caa125c95379e62925b8 authored almost 7 years ago by Nathan Swain <[email protected]>

Removed dangling print statement.

6f884e2762db2fe89d4cc8970a8f18b0d8f657aa authored almost 7 years ago by nswain <[email protected]>

Removing services that don't exist returns exit code 0 instead of 1 now...since it is gone, which is what we wanted...

8b5bd82dea2049c16eff61a0d7ec326e96519c7e authored almost 7 years ago by nswain <[email protected]>

Merge branch 'master' into tethys-gizmo-bug-fix

465bb022fb575b5dc17ab56d9a5ba27f3f2af561 authored almost 7 years ago by nswain <[email protected]>

Enable threading in Tethys Core run.sls.

9710f86cea60eb9efd63aa87271bafbc4b03b7b5 authored almost 7 years ago by nswain <[email protected]>

Fix several bugs, deprecation warnings, etc.

2d4e8d8767809fec46d5365cef38920bbdfb6f6a authored almost 7 years ago by nswain <[email protected]>

added first time check to avoid running unecessary steps when restarting and overwriting changes to the settings.py file. Shawn thinks this message is too long for a commit message.

4fe617a23b10a89408ba96f5f0d68438b7251159 authored about 7 years ago by nswain <[email protected]>

Merge branch 'aqua-tethys-aqua-dev' into aqua-tethys-aqua-stable

ec3134314f938bdb4269730c3f7b852dcf964f21 authored about 7 years ago by nswain <[email protected]>

Merge branch 'docker-optimize' into 'aqua-dev'

Docker optimize

See merge request tethys/aqua-tethys!20

aec912c93821aaf81521d0440afd475595fdec7f authored about 7 years ago by Gage Larsen <[email protected]>

Merge branch 'docker-optimize' of https://git.aquaveo.com/tethys/aqua-tethys into docker-optimize

58dbbb420efd44aab87b5b28946b5bdab67e0fa2 authored about 7 years ago by Gage Larsen <[email protected]>

add shell

ac3386e51b894fced7e80a3f841b4a94cb8f146b authored about 7 years ago by Gage Larsen <[email protected]>

Add pv to default packages

bf5f352ea78b4e5da758b39ab3080f21f0e97b63 authored about 7 years ago by Chandler Scott <[email protected]>

Add missing .

f682874755022e318fa7c609123f9aeebe8c5048 authored about 7 years ago by Chandler Scott <[email protected]>

Consolidate ENVs

37c1c0faa3d806b7d07822d67ebbea6c7d92015a authored about 7 years ago by Chandler Scott <[email protected]>

Add gnupg2 to install/cleanup list

This allows verified downloads of saltstack, since we have to add
a non default repo

a480afada9bb23176693e60050435ebbb2e496f0 authored about 7 years ago by Chandler Scott <[email protected]>

split salt states in two

This will allow apps that derive from this docker to more easily inject
states in between initia...

b5f476c1d4e1e88a3ef03be2f4dc9b1541859c40 authored about 7 years ago by Chandler Scott <[email protected]>

Add sync stores step

Although tethys core itself does not have any stores, every app that is
built on it does.

3fa2551385929155154f7a5a69f63d3fc8313784 authored about 7 years ago by Chandler Scott <[email protected]>

Optimize Docker Build Process (First Pass)

5389dd02ac3f099ea073694c3c3eb4a8842a39bd authored about 7 years ago by Chandler Scott <[email protected]>

Ignore swp files from vim

850c689c846194d162c3cf7957482a5a272b569f authored about 7 years ago by Chandler Scott <[email protected]>

Fix python script in salt for creating superuser

8984fb27c6d63ccb19535f26659a054c36cf7747 authored about 7 years ago by Chandler Scott <[email protected]>

Use salt for init (First Pass)

50e3414601dd6942154844f2b0701eb198d8af28 authored about 7 years ago by Chandler Scott <[email protected]>

Split out ENV groups that depend on eachother

15c15074094c2e3e8ba257c2d6bcaf13beb7342a authored about 7 years ago by Chandler Scott <[email protected]>

Add salt (Second Pass)

4f97d430a89539f74f9b1d85d057ba832b5bdbfc authored about 7 years ago by Chandler Scott <[email protected]>

Fix Typos

bde8cc2285b2a2f08f4f7644634919bbf191beda authored about 7 years ago by Chandler Scott <[email protected]>

Merge some RUNs

d420e9f56ec43f337eccaab3111cd6a7240423be authored about 7 years ago by Chandler Scott <[email protected]>

Use bash when activating miniconda

53c2a51e40d4c64b40e6aeea24778b512a889e1d authored about 7 years ago by Chandler Scott <[email protected]>

Fix salt parsing errors

0a8b42b53a2c11b1d47ddf9f00595a9245737ace authored about 7 years ago by Chandler Scott <[email protected]>

Move salt conf generation into docker runtime

3aa6db480a22ccd76102f3d7edf3c47d2f68b87b authored about 7 years ago by Chandler Scott <[email protected]>

Remove (now) unused config file

e3fb8e0b3eebefdedaaa68c2b714732b0182fa58 authored about 7 years ago by Chandler Scott <[email protected]>

Move startup to external script and add HEALTHCHECK

d59eec530b98e0e2eeb4183f19104c5dd100e0c8 authored about 7 years ago by Chandler Scott <[email protected]>

Fix permissions

658eb583ff63524ae69f915794d19d501ca76a41 authored about 7 years ago by Chandler Scott <[email protected]>

Run collectall during build

f429df15496deb36f6ae5716f6353cd9eb543b75 authored about 7 years ago by Chandler Scott <[email protected]>

Use manage.py rather than tethys manage to avoid db conn

8ba222dd486074eab19effd2525ed7ef42356aa8 authored about 7 years ago by Chandler Scott <[email protected]>

Start updating Docker documentation

Add Table of Environmental Variables

186b1d30789004105a66ff4eb615a5628df0e380 authored about 7 years ago by Chandler Scott <[email protected]>

Rename salt state

f05beee4dc9194097b9efafb2aad08751819d26d authored about 7 years ago by Chandler Scott <[email protected]>

Rename salt state

4653c0ce6ca16e4dc8eedbd58d31498dc275bce9 authored about 7 years ago by Chandler Scott <[email protected]>

Add postgres config for salt

f7d76704c136c252aa40ee25fa845901f45ba02c authored about 7 years ago by Chandler Scott <[email protected]>

Fix git wierdness

b52078d70dc55bedb8e58668fec8f78062f153dc authored about 7 years ago by Chandler Scott <[email protected]>

Break down some env vars

e6e97255f73b109392cf6314613938a65693671a authored about 7 years ago by Chandler Scott <[email protected]>

Added documentation for SSL with Tethys Portal and Geosever (#324)

* Added documentation for SSL implementation for Tethys Portal and Geoserver

* updated https do...

5f70f320e93882a23edd2a4c40cab52f14a69331 authored about 7 years ago by Michael Souffront <[email protected]>

App loading refactor (#319)

* Quick fix to handle unset settings. Partially addresses issue #249.

(cherry picked from commi...

920288b54ad40cc8bfc0e152d8b023b94e65e6a0 authored about 7 years ago by sdc50 <[email protected]>

Hotfix/handle unset settings (#326)

* Quick fix to handle unset settings. Partially addresses issue #249.

* Update app_base.py

fix...

20ba73347fb1c21f1d1d439e1b1d8b1e644f897c authored about 7 years ago by sdc50 <[email protected]>

Add gnupg2 to install/cleanup list

This allows verified downloads of saltstack, since we have to add
a non default repo

28cd61972f057b879f810c4f55333f381f64235a authored about 7 years ago by Chandler Scott <[email protected]>

add shell

599b419e155c94450a4b4207e973822a5bea580f authored about 7 years ago by Gage Larsen <[email protected]>