Commits · staging · CEOTR Public / sensor_tracker

04 Jun, 2020 1 commit
- Merge branch 'ST-82' into 'staging' · 48948cea
  Kate Patterson authored Jun 04, 2020
```
St 82

See merge request !112
```
  48948cea
03 Jun, 2020 1 commit
- Merge branch 'hot_fix_3' into 'staging' · 739798af
  xiang authored Jun 03, 2020
```
fix the patch issue ST-96

See merge request !113
```
  739798af
26 May, 2020 3 commits
- Merge branch 'master' into staging · 79f133df
  Kate Patterson authored May 25, 2020
  
  79f133df
- Merge branch 'ST-18' into staging · 9ba557bf
  Kate Patterson authored May 25, 2020
  
  9ba557bf
- Merge branch 'ST-63' into staging · 88b7c6f5
  Kate Patterson authored May 25, 2020
  
  88b7c6f5
19 May, 2020 1 commit
- fix the patch issue ST-96 · 9d67f5c8
  xaingling authored May 19, 2020
  
  9d67f5c8
12 May, 2020 1 commit
- Removed ENV · 324a7161
  Kate Patterson authored May 12, 2020
  
  324a7161
11 May, 2020 2 commits
- Merge branch 'dev' into ST-18 · 996a895d
  xaingling authored May 11, 2020
  
  996a895d
- Merge branch 'dev' into ST-65 · 54ac0412
  xaingling authored May 11, 2020
  
  54ac0412
08 May, 2020 1 commit
- unhit the csv export · fdf83f84
  xaingling authored May 08, 2020
  
  fdf83f84
06 May, 2020 2 commits
- Merge branch 'hot_fix_1' into 'master' · e52ec199
  xiang authored May 06, 2020
```
fix the api instrument bug

See merge request !107
```
  e52ec199
- fix the api instrument bug · 39f0d623
  xaingling authored May 06, 2020
  
  39f0d623
05 May, 2020 2 commits
- minor changes · a5ad4510
  xaingling authored May 05, 2020
  
  a5ad4510
- add update MODELS.md function · 220a934b
  xaingling authored May 05, 2020
  
  220a934b
04 May, 2020 2 commits
- Merge branch 'patch-2' into 'dev' · d78fc536
  xiang authored May 04, 2020
```
Patch 2

See merge request !106
```
  d78fc536
- Merge branch 'patch-1' into 'dev' · 484997e8
  xiang authored May 04, 2020
```
Patch 1

See merge request !105
```
  484997e8
30 Apr, 2020 9 commits
- fix add comment box link not going to edit page · b253c446
  xaingling authored Apr 30, 2020
  
  b253c446
- fix error · 5a432bb7
  xaingling authored Apr 30, 2020
  
  5a432bb7
- Merge branch 'ST-83.1' into 'dev' · 2af0f51e
  xiang authored Apr 30, 2020
```
change model order

See merge request !103
```
  2af0f51e
- resolve conflict · 0aa3c2a0
  xaingling authored Apr 30, 2020
  
  0aa3c2a0
- Merge branch 'st-22' into 'dev' · dd61c6b9
  xiang authored Apr 30, 2020
```
add active field to the instrument and sensor

See merge request !101
```
  dd61c6b9
- Merge branch 'ST-75' into 'dev' · 4edda5aa
  xiang authored Apr 30, 2020
```
pre slected the instrument for the comment box

See merge request !102
```
  4edda5aa
- hide the csv export function · 1998251c
  xaingling authored Apr 30, 2020
  
  1998251c
- Merge branch 'ST-68' into 'dev' · 84d4d4f3
  xiang authored Apr 30, 2020
```
active the csv export function

See merge request !104
```
  84d4d4f3
- active the csv export function · 9cea8614
  xaingling authored Apr 30, 2020
  
  9cea8614
29 Apr, 2020 6 commits
- fix conflict · f654cf30
  xaingling authored Apr 29, 2020
  
  f654cf30
- change model order · 28e32580
  xaingling authored Apr 29, 2020
  
  28e32580
- pre slected the instrument for the comment box · 37640b5a
  xaingling authored Apr 29, 2020
  
  37640b5a
- Merge branch 'ST-75' into 'dev' · 23c66559
  xiang authored Apr 29, 2020
```
ST-73, 74, 75, instrument info dispaly on instrument create and change page, clone model feature

See merge request !99
```
  23c66559
- Merge branch 'ST-86' into 'dev' · 497ec22a
  xiang authored Apr 29, 2020
```
St 86 fix Instrument comment box csv download bug

See merge request !100
```
  497ec22a
- add active field to the instrument and sensor · e093b7c2
  xaingling authored Apr 28, 2020
  
  e093b7c2
24 Apr, 2020 3 commits
- ST-75 comment box add link · 557bcfe3
  Nicole_Ni authored Apr 24, 2020
  
  557bcfe3
- ST-86 fix Instrument comment box csv download bug · 3f3382d1
  Nicole_Ni authored Apr 24, 2020
  
  3f3382d1
- Update urls.py · 204f4c5e
  Nicole_Ni authored Apr 24, 2020
  
  204f4c5e
23 Apr, 2020 1 commit
- ST-73, 74, 75, instrument info dispaly on instrument create and change page, clone model feature · c9a7cb8e
  Nicole_Ni authored Apr 23, 2020
  
  c9a7cb8e
22 Apr, 2020 5 commits
- Merge branch 'ST-72' into 'staging' · 06f9137a
  Kate Patterson authored Apr 23, 2020
```
ST-71and72 add new fields to instrument and platform development

See merge request !95
```
  06f9137a
- Merge branch 'patch-2' into 'master' · 68f94cae
  Kate Patterson authored Apr 23, 2020
```
Update README.md

See merge request !97
```
  68f94cae
- Update README.md · 09c07e58
  Kate Patterson authored Apr 23, 2020
  
  09c07e58
- Merge branch 'kate-master-patch-51951' into 'master' · 4be7532d
  Kate Patterson authored Apr 22, 2020
```
Kate master patch 51951

See merge request !96
```
  4be7532d
- Update MODELS.md · bccb5813
  Kate Patterson authored Apr 22, 2020
  
  bccb5813