Commit Graph

790 Commits

Author SHA1 Message Date
Xinlei(Ryan) Pan
cd231746cf update link model 2020-01-22 10:16:18 -05:00
Xinlei(Ryan) Pan
25db4b1e14 update link based on naming change 2020-01-21 15:40:45 -05:00
Xinlei(Ryan) Pan
eb1cc491b3 Merge branch 'feature/coding' into feature/link 2020-01-21 15:38:28 -05:00
Pfeil, Scott Robert
f5ed509a39 renaming 2020-01-21 15:33:27 -05:00
Xinlei(Ryan) Pan
01780e708f update link 2020-01-21 15:33:10 -05:00
Xinlei(Ryan) Pan
b24745fd89 merge from feature/coding 2020-01-21 15:22:15 -05:00
Pfeil, Scott Robert
42b57dcd5d Cleaning 2020-01-21 12:10:48 -05:00
Xinlei(Ryan) Pan
0c7726bcc3 fix caretbutton 2020-01-17 17:32:32 -05:00
Pfeil, Scott Robert
20dbbc0829 Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/unordered_numbered_list_from_coding 2020-01-17 14:55:07 -05:00
Suresh, Kamlesh
c2f3a7a2db primary button and top bottom pin 2020-01-17 14:31:32 -05:00
Pfeil, Scott Robert
d80ae0bd04 more label fix 2020-01-17 14:07:31 -05:00
Suresh, Kamlesh
401370f976 toggle action 2020-01-17 12:03:31 -05:00
Suresh, Kamlesh
13dbb28357 caret title 2020-01-17 11:04:35 -05:00
Suresh, Kamlesh
48a8f4aba8 Merge branch 'feature/coding' into feature/doughnutchart_from_coding 2020-01-16 17:36:09 -05:00
Suresh, Kamlesh
4dde423d2f button fixes 2020-01-16 17:32:00 -05:00
Pfeil, Scott Robert
7d5bee5654 Label fix 2020-01-16 15:51:15 -05:00
Suresh, Kamlesh
9bf9d71195 optional 2020-01-16 13:30:30 -05:00
Xinlei(Ryan) Pan
e3b0b43272 update link method 2020-01-16 10:30:20 -05:00
Xinlei(Ryan) Pan
56b37255c2 merge from feature/coding 2020-01-16 09:59:14 -05:00
Suresh, Kamlesh
de27398c49 leftRightLabelView 2020-01-15 18:59:48 -05:00
Suresh, Kamlesh
d69dbc41d0 fixes 2020-01-15 18:27:56 -05:00
Suresh, Kamlesh
47ccd681ae merge 2020-01-15 16:49:42 -05:00
Pan, Xinlei (Ryan)
e95afdc249 update color 2020-01-15 16:36:13 -05:00
Pfeil, Scott Robert
952c3bdb53 Toggle model temporary 2020-01-14 21:08:48 -05:00
Pfeil, Scott Robert
fc2326e9a8 button size 2020-01-14 16:32:42 -05:00
Pfeil, Scott Robert
3d2fd02ac5 undo view constraining removal code
fix molecule table cell
fix corner labels
2020-01-14 13:58:18 -05:00
Pfeil, Scott Robert
2f6859f543 button model fix 2020-01-14 11:17:10 -05:00
Pfeil, Scott Robert
9c0bea033c actionType fix 2020-01-14 10:13:19 -05:00
Kevin G Christiano
874addef63 Changed name. New disabled KV. mild updates. 2020-01-14 09:06:39 -05:00
Pfeil, Scott Robert
96d533780f update multi progress to match color 2020-01-13 21:25:24 -05:00
Kevin G Christiano
32f85dfbf1 renamed func. changed location of action. 2020-01-13 16:30:29 -05:00
Kevin G Christiano
3d2137fc11 Now subclassing Button. 2020-01-13 16:19:49 -05:00
Kevin G Christiano
aea8bc5f7b Merge branch 'develop' into feature/swiftify_switch
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2020-01-13 16:02:18 -05:00
Kevin G Christiano
d7844d607e space. 2020-01-13 16:00:00 -05:00
Ryan
255fce072b merge from develop 2020-01-13 15:47:27 -05:00
Kevin G Christiano
8490ef3572 enabled/disabled colors. 2020-01-13 15:46:50 -05:00
Pfeil, Scott Robert
4437338620 Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/coding 2020-01-13 15:29:07 -05:00
Pfeil, Scott Robert
5c2f93e06f move register to init for now
dash line update temporary for legacy
2020-01-13 15:28:53 -05:00
Pfeil, Scott Robert
f64424a2c5 Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/coding 2020-01-13 15:27:27 -05:00
Pfeil, Scott Robert
57753f6697 Change keys 2020-01-13 15:26:51 -05:00
Kevin G Christiano
edddac84a8 Merge branch 'develop' into feature/link
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2020-01-13 14:59:46 -05:00
Pfeil, Scott Robert
9a18346fca Merge branch 'feature/button' into 'develop'
Translates MFCustomButton to Button

See merge request BPHV_MIPS/mvm_core_ui!205
2020-01-13 14:51:05 -05:00
Kevin G Christiano
ad4eddb450 some class is using a xib. 2020-01-13 14:43:16 -05:00
Kevin G Christiano
223ab11783 Merge branch 'develop' into feature/button
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2020-01-13 14:35:23 -05:00
Kevin G Christiano
8ff92b5cc0 one line, truncation. 2020-01-13 14:31:04 -05:00
Ryan
cea1ecd52c merge from develop 2020-01-13 14:02:20 -05:00
Kevin G Christiano
0b87ff254b Merge branch 'develop' into feature/link 2020-01-13 13:32:21 -05:00
Kevin G Christiano
5ce8446be2 Updating Link class. adding identifier to molecule mapping. 2020-01-13 13:31:25 -05:00
Kevin G Christiano
9882528b9e Merge branch 'develop' into feature/link
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2020-01-13 12:50:08 -05:00
Kevin G Christiano
b79ddf7346 additions for accessibility. 2020-01-13 12:45:49 -05:00