Commit Graph

720 Commits

Author SHA1 Message Date
Kevin G Christiano
b1106c58ff merge resolution 2020-03-27 11:12:33 -04:00
Suresh, Kamlesh Jain
2333a38035 Merge branch 'release/7_5_0' into 'develop'
Release/7 5 0

See merge request BPHV_MIPS/mvm_core_ui!329
2020-03-25 11:34:49 -04:00
Suresh, Kamlesh
cb6f205994 radio selection fix 2020-03-20 19:33:53 -04:00
Pfeil, Scott Robert
18dcf3072f required identifiers 2020-03-19 16:28:35 -04:00
Kevin G Christiano
9baf3948ad touchup 2020-03-18 14:05:01 -04:00
Pfeil, Scott Robert
f26f414a23 bug fixes 2020-03-16 19:47:29 -04:00
Pfeil, Scott Robert
35085217d5 fixes for certain devices 2020-03-16 14:32:04 -04:00
Kevin G Christiano
50920c83e0 latest state 2020-03-16 09:50:54 -04:00
Kevin G Christiano
ef5f864a02 stable 2020-03-11 15:42:27 -04:00
Kevin G Christiano
1ae91f55ae Merge branch 'develop' into feature/form_page 2020-03-11 15:28:06 -04:00
Kevin G Christiano
f7f15c906f latest 2020-03-11 15:22:20 -04:00
Kevin G Christiano
90d98fdc2e merging 2020-03-11 13:32:04 -04:00
Kevin G Christiano
5deb690b33 no 2020-03-11 13:30:20 -04:00
Kevin G Christiano
fa38447def Merge branch 'develop' 2020-03-10 08:31:20 -04:00
Suresh, Kamlesh
f8589aabfc merge 2020-03-09 22:44:19 -04:00
Pfeil, Scott Robert
24961cb50e decode fixes 2020-03-09 16:11:21 -04:00
Kevin G Christiano
a011eb73a4 latest 2020-03-09 10:35:45 -04:00
Suresh, Kamlesh
8df94a2f56 moving back to any 2020-03-08 19:14:51 -04:00
Suresh, Kamlesh
22b0b7259f merge conflicts 2020-03-06 18:04:30 -05:00
Suresh, Kamlesh
521ad8711d value changed rules 2020-03-06 17:26:42 -05:00
Kevin G Christiano
e48a0e3af9 Merge branch 'develop' into feature/isaac_screen 2020-03-06 17:07:21 -05:00
Suresh, Kamlesh Jain
d9905c8cd5 Merge branch 'feature/checkbox_keys' into 'develop'
Feature/checkbox keys

See merge request BPHV_MIPS/mvm_core_ui!296
2020-03-06 14:28:34 -05:00
Pfeil, Scott Robert
4ae6a393d3 key update 2020-03-06 14:20:58 -05:00
Suresh, Kamlesh
1bbfb0390a fixes 2020-03-06 10:51:09 -05:00
Kevin G Christiano
0a6b316198 the latest 2020-03-05 13:57:45 -05:00
Suresh, Kamlesh
97cf39eaee textfield enhancement 2020-03-04 15:17:45 -05:00
Suresh, Kamlesh
9d8953d229 clean up 2020-03-04 10:52:40 -05:00
Suresh, Kamlesh
3ec024ff27 changes 2020-03-03 20:32:57 -05:00
Kevin G Christiano
61bc283770 aligning with super 2020-03-02 16:11:27 -05:00
Kevin G Christiano
b00485c81a transitioning logical view model separation 2020-03-02 15:52:02 -05:00
Pfeil, Scott Robert
4b9cd27cab change the base decode functions 2020-03-02 14:54:48 -05:00
Kevin G Christiano
3e3b7dac79 general working order 2020-03-02 13:01:07 -05:00
Kevin G Christiano
64ada3e61d fixed constraints 2020-03-02 09:24:07 -05:00
Kevin G Christiano
b8127da583 Merge branch 'develop' into feature/modern_pagecontrol 2020-02-28 13:41:10 -05:00
Kevin G Christiano
3470e77b76 latest state 2020-02-28 13:10:15 -05:00
Pfeil, Scott Robert
f779478cc5 update 2020-02-28 10:32:27 -05:00
Kevin G Christiano
1196dee4de resolving merge conflicts 2020-02-28 10:32:19 -05:00
Pfeil, Scott Robert
36e34e1726 fixes 2020-02-28 10:30:57 -05:00
Kevin G Christiano
edf1a478f7 adjusting 2020-02-28 10:16:40 -05:00
Pfeil, Scott Robert
2b85991bfd merge dev 2020-02-28 09:53:14 -05:00
Pan, Xinlei (Ryan)
1540fb4bed Merge branch 'feature/arrow' into 'develop'
Arrow Icon

See merge request BPHV_MIPS/mvm_core_ui!283
2020-02-28 09:50:16 -05:00
Pfeil, Scott Robert
757395ad1d merge 2020-02-27 13:58:30 -05:00
Pfeil, Scott Robert
0b6fe7059a Cleanup for names and stack 2020-02-27 13:45:15 -05:00
Kevin G Christiano
bd9391f401 resolving merge conflicts 2020-02-27 13:11:30 -05:00
Kevin G Christiano
e7b7012708 constraint convenience 2020-02-27 13:00:39 -05:00
Kevin G Christiano
435c6cfa55 conflict resolution 2020-02-27 12:04:58 -05:00
Kevin G Christiano
c2baebe483 removed testing code 2020-02-27 12:00:45 -05:00
Kevin G Christiano
1ee8c244cd merging 2020-02-27 11:57:10 -05:00
Kevin G Christiano
411d72a152 Merge branch 'develop' into feature/arrow 2020-02-27 11:56:49 -05:00
Kevin G Christiano
78673b824e removed test code 2020-02-27 11:46:17 -05:00