Commit Graph

4370 Commits

Author SHA1 Message Date
Khan, Arshad
32c04e05ba Making moleculesInfo public for providing flexibility in sub classes.
As of now required for Settings template in MF code.
2019-11-08 23:26:07 +05:30
Murugan, Vimal
14f6861493 moved top and bottom pin to scrolling view controller 2019-11-08 22:11:56 +05:30
Suresh, Kamlesh
a212dff80f fixes 2019-11-07 10:45:40 -05:00
Pfeil, Scott Robert
347ebbed8c typo fixes 2019-11-07 10:05:17 -05:00
Kevin G Christiano
ce0ffeda29 more changes. 2019-11-06 16:06:16 -05:00
Pan, Xinlei (Ryan)
10fe33748f Merge branch 'release/7_0' into 'develop'
Release/7 0

See merge request BPHV_MIPS/mvm_core_ui!167
2019-11-06 11:08:05 -05:00
Kevin G Christiano
6d7c1df7cc more. 2019-11-06 09:12:18 -05:00
Pfeil, Scott Robert
4a1a196854 typos 2019-11-05 12:32:32 -05:00
Kevin G Christiano
88eec2bf9d carrots and windows. 2019-11-05 09:25:27 -05:00
Pfeil, Scott Robert
5b8fce36e6 merge develop 2019-11-05 09:14:19 -05:00
Pfeil, Scott Robert
a7473e2079 Minor fixes for MFViewController 2019-11-05 09:02:49 -05:00
Pfeil, Scott Robert
4b374c4e7e modernizing 2019-11-05 08:50:54 -05:00
Pfeil, Scott Robert
0a45d61eb7 merge 2019-11-05 08:50:17 -05:00
Suresh, Kamlesh
37e1cb9e36 changes 2019-11-04 17:24:04 -05:00
Pfeil, Scott Robert
52f31eff42 header changes 2019-11-04 15:34:32 -05:00
Kevin G Christiano
ae5a1c0c02 la. 2019-11-04 14:44:22 -05:00
Kevin G Christiano
bb3277e1ba latest and greatest. 2019-11-04 11:39:32 -05:00
Kevin G Christiano
475d08296b Reworked bezier logic for CaretView. It was not optimal. 2019-11-01 16:15:19 -04:00
Kevin G Christiano
5e96653d4b undo. 2019-11-01 10:17:20 -04:00
Kevin G Christiano
6e8a8a78cc getting ready to try another refactor. 2019-11-01 10:08:13 -04:00
Suresh, Kamlesh Jain
71d8148fff Merge branch 'feature/graphview' into 'release/7_0'
create circle progress view

See merge request BPHV_MIPS/mvm_core_ui!166
2019-10-31 16:18:13 -04:00
panxi
7870a116c6 create circle progress view 2019-10-31 16:15:47 -04:00
Kevin G Christiano
5c1d7b4a38 Keeping up appearance. 2019-10-30 16:02:18 -04:00
Kevin G Christiano
9d043edb29 comm. 2019-10-30 12:33:40 -04:00
Kevin G Christiano
8266b3b650 fixed display issues. 2019-10-30 11:36:59 -04:00
Kevin G Christiano
c9b41c9bc1 Latest revision. 2019-10-30 11:23:03 -04:00
Kevin G Christiano
a455511809 reconfig. 2019-10-30 09:58:20 -04:00
Kevin G Christiano
3163e9bb40 Merge branch 'feature/swiftified_textField' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/swiftified_textField 2019-10-30 09:36:15 -04:00
Kevin G Christiano
494df94d3a correction. 2019-10-30 09:35:54 -04:00
Kevin G Christiano
ba602c1c86 Merge branch 'develop' into feature/swiftified_textField
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2019-10-30 09:35:39 -04:00
Pfeil, Scott Robert
80c277f4e8 Merge branch 'revert-fdaab402' into 'develop'
Revert "Merge branch 'feature/mva_3_0' into 'develop'"

See merge request BPHV_MIPS/mvm_core_ui!163
2019-10-29 16:45:03 -04:00
Pfeil, Scott Robert
2fab14d946 kevin comment 2019-10-29 15:26:43 -04:00
Pfeil, Scott Robert
e98a0ce76b update pr comments 2019-10-29 15:23:44 -04:00
Pfeil, Scott Robert
d901ded4c1 open view up! 2019-10-29 13:56:19 -04:00
Pfeil, Scott Robert
59be22c0e0 enum clean 2019-10-29 13:47:49 -04:00
Kevin G Christiano
d2d4e3d42c hold for now. 2019-10-29 13:40:25 -04:00
Kevin G Christiano
3d98c91e73 better, muchbetter. 2019-10-29 13:26:41 -04:00
Pfeil, Scott Robert
7e810ec334 undo undo 2019-10-29 13:17:40 -04:00
Pfeil, Scott Robert
26dac186dc undo undo 2019-10-29 13:13:35 -04:00
Pfeil, Scott Robert
e5c0191b18 fix to check 2019-10-29 12:30:45 -04:00
Kevin G Christiano
134ba463b9 Merge branch 'develop' into feature/swiftified_textField 2019-10-29 12:21:37 -04:00
Kevin G Christiano
4a5fd4f539 ok. 2019-10-29 12:21:19 -04:00
Pfeil, Scott Robert
75ea4d60f0 commit missed protocol 2019-10-29 12:18:20 -04:00
Pfeil, Scott Robert
77a11a69d5 Fix for project file 2019-10-29 12:12:58 -04:00
Pfeil, Scott Robert
d4cacec310 list item separation 2019-10-29 12:05:37 -04:00
Pfeil, Scott Robert
48a940f160 fix to typos 2019-10-29 10:12:59 -04:00
Pfeil, Scott Robert
d196aa3cef Design defects fix 2019-10-29 09:03:19 -04:00
Pfeil, Scott Robert
dffdc29eba Merge branch 'bugfix/checkbox_formvalidation' into 'develop'
form validation fixes

See merge request BPHV_MIPS/mvm_core_ui!165
2019-10-28 16:41:44 -04:00
Suresh, Kamlesh
3a32d78004 form validation fixes 2019-10-28 16:25:25 -04:00
Kevin G Christiano
9a578fc6b1 the latest. 2019-10-28 15:51:03 -04:00