Commits · master · CEOTR Public / sensor_tracker

25 Nov, 2020 3 commits
- Merge branch 'staging' · aff47075
  Kate Patterson authored Nov 24, 2020
  
  aff47075
- ST-149 have fields adjacent to save space · 4372393a
  Kate Patterson authored Nov 24, 2020
  
  4372393a
- ST-149 Quick fix to move the field up with the other platform power field · 303cfba2
  Kate Patterson authored Nov 24, 2020
  
  303cfba2
24 Nov, 2020 5 commits
- Merge branch 'staging' into 'master' · 83c3783b
  xiang authored Nov 24, 2020
```
Staging

See merge request !178
```
  83c3783b
- Merge branch 'ST-124' into 'staging' · eee53608
  xiang authored Nov 24, 2020
```
ST-124 select active equipment from dropdowns

See merge request !173
```
  eee53608
- Merge branch 'st-155' into 'staging' · aeaace26
  xiang authored Nov 24, 2020
```
St 155

See merge request !177
```
  aeaace26
- Merge branch 'st-155' into 'master' · c48cd384
  xiang authored Nov 24, 2020
```
typo bug fix

See merge request !176
```
  c48cd384
- typo bug fix · 1907ae97
  xaingling authored Nov 24, 2020
  
  1907ae97
23 Nov, 2020 2 commits
- Merge branch 'ST-151N' into 'staging' · 9d3017e1
  xiang authored Nov 23, 2020
```
ST-151 add format to lat and lon, add power id in deployment

See merge request !175
```
  9d3017e1
- Update models.py · e76be3e1
  Nicole_Ni authored Nov 23, 2020
  
  e76be3e1
22 Nov, 2020 1 commit
- ST-151 add format to lat and lon, add power id in deployment · 75a6ae52
  Nicole_Ni authored Nov 22, 2020
  
  75a6ae52
18 Nov, 2020 1 commit
- Merge branch 'ST-127' into 'staging' · 47cdc71d
  xiang authored Nov 18, 2020
```
St 127 calibration module

See merge request !171
```
  47cdc71d
12 Nov, 2020 3 commits
- Merge branch 'staging' into 'master' · d70eef7f
  Kate Patterson authored Nov 12, 2020
```
Release Staging

See merge request !172
```
  d70eef7f
- Merge branch 'st-145' into 'staging' · c96c98c4
  Kate Patterson authored Nov 12, 2020
```
St 145

See merge request !170
```
  c96c98c4
- ST-124 select active equipment from dropdowns · 8a7660ac
  Nicole_Ni authored Nov 11, 2020
  
  8a7660ac
07 Nov, 2020 4 commits
- ST-127 merge staging custom_form in 127 · a3e14993
  Nicole_Ni authored Nov 07, 2020
  
  a3e14993
- Merge branch 'staging' into 'ST-127' · a0c8093b
  Nicole_Ni authored Nov 07, 2020
```
# Conflicts:
#   static/custom_form.js
```
  a0c8093b
- ST-127 add description in views · 75ce378c
  Nicole_Ni authored Nov 07, 2020
  
  75ce378c
- ST-127 calibratiob model · d330400f
  Nicole_Ni authored Nov 07, 2020
  
  d330400f
05 Nov, 2020 1 commit
- code style changes st-145 · 3492570a
  xaingling authored Nov 05, 2020
  
  3492570a
29 Oct, 2020 1 commit
- Merge branch 'ST-88' into staging · 388bbfdb
  Kate Patterson authored Oct 29, 2020
  
  388bbfdb
28 Oct, 2020 1 commit
- ST-127 · 802573b6
  Nicole_Ni authored Oct 28, 2020
  
  802573b6
27 Oct, 2020 6 commits
- Merge branch 'staging' · e41bf255
  Kate Patterson authored Oct 27, 2020
  
  e41bf255
- Apply max-height to all typeaheads · 3cbd8b1f
  Kate Patterson authored Oct 27, 2020
  
  3cbd8b1f
- Merge branch 'ST-138' into 'staging' · 8fd28454
  xiang authored Oct 27, 2020
```
St 138 Addressed remaining fields

See merge request !168
```
  8fd28454
- Hiding clone button from views that shouldn't have it but now showing due to... · 26c9c129
  Kate Patterson authored Oct 27, 2020
```
Hiding clone button from views that shouldn't have it but now showing due to custom templates. Removed unused imports.
```
  26c9c129
- Merge branch 'staging' into ST-138 · f47210b7
  Kate Patterson authored Oct 27, 2020
  
  f47210b7
- Using custom change/add forms in more views to apply custom_form.js/.css · 038c7b25
  Kate Patterson authored Oct 27, 2020
  
  038c7b25
23 Oct, 2020 2 commits
- Merge branch 'ST-139' into 'staging' · eeaf23ba
  xiang authored Oct 23, 2020
```
St 139 button bar float to bottom

See merge request !167
```
  eeaf23ba
- Merge branch 'staging' into 'ST-139' · a9d8f13e
  Nicole_Ni authored Oct 23, 2020
```
# Conflicts:
#   static/custom_form.css
```
  a9d8f13e
22 Oct, 2020 2 commits
- typehead dropdown for calibration · 080d1965
  Nicole_Ni authored Oct 22, 2020
  
  080d1965
- ST-125 calibration related task · 67785a01
  Nicole_Ni authored Oct 22, 2020
  
  67785a01
21 Oct, 2020 6 commits
- Merge branch 'ST-138' into 'staging' · 19a2ad95
  Kate Patterson authored Oct 21, 2020
```
ST-138 Convert dropdowns to typeahead fields

See merge request !160
```
  19a2ad95
- ST-138 change css to qa more readable way · 58359733
  Nicole_Ni authored Oct 21, 2020
  
  58359733
- Merge branch 'staging' into 'ST-138' · 95a72533
  Nicole_Ni authored Oct 21, 2020
```
# Conflicts:
#   static/custom_form.css
```
  95a72533
- ST-138 fix the merge conflict · 68c5aa78
  Nicole_Ni authored Oct 21, 2020
  
  68c5aa78
- ST-139 button bar float to bottom · 7741667c
  Nicole_Ni authored Oct 20, 2020
  
  7741667c
- ST-139 button bar float to bottom · c55458ae
  Nicole_Ni authored Oct 20, 2020
  
  c55458ae
20 Oct, 2020 2 commits
- Merge branch 'ST-139' into 'staging' · 0413ced2
  Nicole_Ni authored Oct 20, 2020
```
ST-139 remove the top submit bar

See merge request !166
```
  0413ced2
- ST-139 remove the top submit bar · f1ebab39
  Nicole_Ni authored Oct 20, 2020
  
  f1ebab39