Commits · master · CEOTR Public / sensor_tracker

19 Apr, 2021 3 commits
- Merge branch 'revert-d9d8bef2' into 'master' · d13c3c26
  xiang authored Apr 19, 2021
```
Revert "Merge branch 'ST-194' into 'master'"

See merge request !211
```
  d13c3c26
- Revert "Merge branch 'ST-194' into 'master'" · 9d167e94
  xiang authored Apr 19, 2021
```
This reverts merge request !210
```
  9d167e94
- Merge branch 'ST-194' into 'master' · d9d8bef2
  Kate Patterson authored Apr 19, 2021
```
Fixed Users without permissions get unhelpful error message

See merge request !210
```
  d9d8bef2
15 Apr, 2021 1 commit

if user has no permission for a app, it is no going to exist in app_list. I... · 95e4964c

xaingling authored Apr 15, 2021

if user has no permission for a app, it is no going to exist in app_list. I added a if statement so that the code will not be trying to reorder a app which is not exist in app_list

95e4964c

11 Mar, 2021 3 commits
- Merge branch 'staging' into 'master' · 720e0827
  Kate Patterson authored Mar 10, 2021
```
Staging

See merge request !203
```
  720e0827
- Merge branch 'ST-147' into 'staging' · 848c2adf
  Kate Patterson authored Mar 10, 2021
```
Backup to db_backups folder

See merge request !202
```
  848c2adf
- Backup to db_backups folder · 6ca61054
  Kate Patterson authored Mar 10, 2021
  
  6ca61054
10 Mar, 2021 20 commits
- Merge branch 'staging' into 'master' · 44e9637b
  Kate Patterson authored Mar 10, 2021
```
Staging

See merge request !201
```
  44e9637b
- Merge branch 'ST-147' into 'staging' · 113463dc
  Kate Patterson authored Mar 10, 2021
```
Allowing override of DB_ROLE in run.sh

See merge request !200
```
  113463dc
- Allowing override of DB_ROLE in run.sh · 62412ec5
  Kate Patterson authored Mar 10, 2021
  
  62412ec5
- Merge branch 'staging' into 'master' · 641cc322
  Kate Patterson authored Mar 10, 2021
```
Staging

See merge request !199
```
  641cc322
- Merge branch 'ST-147' into 'staging' · f40d027f
  xiang authored Mar 10, 2021
```
St 147

See merge request !198
```
  f40d027f
- Simplified clear and init db for different environments · 00c9341f
  Kate Patterson authored Mar 10, 2021
  
  00c9341f
- Placing in db_backups now. Removed problematic -d from psql to load dump · 083f5151
  Kate Patterson authored Mar 10, 2021
  
  083f5151
- Fixed duplicate extension · 12983417
  Kate Patterson authored Mar 10, 2021
  
  12983417
- Missed a spot · 499fcfd6
  Kate Patterson authored Mar 10, 2021
  
  499fcfd6
- missed stage · a016f6a7
  Kate Patterson authored Mar 10, 2021
  
  a016f6a7
- Splitting grab/load, keeping db date, using time lookup in load · 331be633
  Kate Patterson authored Mar 10, 2021
  
  331be633
- Fixed media path · 740b22e4
  Kate Patterson authored Mar 10, 2021
  
  740b22e4
- derp, schema, not database · 8cc96b7c
  Kate Patterson authored Mar 10, 2021
  
  8cc96b7c
- Using clear_db instead of dropdb · 16c59150
  Kate Patterson authored Mar 10, 2021
  
  16c59150
- Typo · f73733da
  Kate Patterson authored Mar 10, 2021
  
  f73733da
- Changed time filter to exclude deploy dumps · 8f3ac727
  Kate Patterson authored Mar 10, 2021
  
  8f3ac727
- Added logging around command execution to help searching logs · e53929a2
  Kate Patterson authored Mar 10, 2021
  
  e53929a2
- Fixed db role name · b2b0e2c9
  Kate Patterson authored Mar 10, 2021
  
  b2b0e2c9
- Updated run.sh to be more consistent with newer code used in ceotr_home, gliders_website, etc. · d59b388a
  Kate Patterson authored Mar 10, 2021
  
  d59b388a
- Merge branch 'staging' into 'master' · 4868b085
  Kate Patterson authored Mar 10, 2021
```
Staging

See merge request !197
```
  4868b085
09 Mar, 2021 4 commits
- Merge branch 'ST-150' into 'staging' · e1dfaf8a
  Kate Patterson authored Mar 09, 2021
```
St 150

See merge request !194
```
  e1dfaf8a
- fix migration file · c83be4ef
  xaingling authored Mar 09, 2021
  
  c83be4ef
- commit migration file · 485db7e5
  xaingling authored Mar 09, 2021
  
  485db7e5
- app side bar order change, naming change · cf59dbf9
  xaingling authored Mar 09, 2021
  
  cf59dbf9
08 Mar, 2021 8 commits
- rename custom filed defination to field name, reoeder · 2f24f605
  xaingling authored Mar 08, 2021
  
  2f24f605
- Merge branch 'staging' into 'ST-150' · 1e5c91b7
  xiang authored Mar 08, 2021
```
# Conflicts:
#   platforms/admin.py
```
  1e5c91b7
- Merge branch 'ST-171' into 'staging' · ea3ea47e
  Kate Patterson authored Mar 08, 2021
```
added blue header to the tables, restructure the private until and sensor list

See merge request !196
```
  ea3ea47e
- rename custom field to custom platform deployment fields, add default app... · 6c1d08d0
  xaingling authored Mar 08, 2021
```
rename custom field to custom platform deployment fields, add default app config to each apps, rename model_form to forms
```
  6c1d08d0
- Merge branch 'ST-147' into 'staging' · 48c2117d
  Kate Patterson authored Mar 08, 2021
```
update run.sh

See merge request !195
```
  48c2117d
- Update run.sh · 6711bd5d
  Kate Patterson authored Mar 08, 2021
  
  6711bd5d
- migration file change · f03937dd
  xaingling authored Mar 08, 2021
  
  f03937dd
- added constraint for custom field defination, make it unique for each deployment · 2350ca97
  xaingling authored Mar 08, 2021
  
  2350ca97
02 Mar, 2021 1 commit
- update run.sh · af07b87d
  xaingling authored Mar 01, 2021
  
  af07b87d