Commit Graph

71 Commits

Author SHA1 Message Date
Christiano, Kevin
80dc8ea1fd Merge branch 'develop' into feature/kevin
# Conflicts:
#	MVMCoreUI/Atoms/Views/Label.swift
2019-06-19 09:12:40 -04:00
Pfeil, Scott Robert
7e83e0fba9 Merge branch 'feature/align_in_view' into 'develop'
Feature/align in view

See merge request BPHV_MIPS/mvm_core_ui!86
2019-06-18 16:43:47 -04:00
Christiano, Kevin
53bdf0fcc5 Merge branch 'develop' into feature/kevin 2019-06-12 10:59:30 -04:00
Christiano, Kevin
f3f645894d Adding class to mappingObject. 2019-06-11 14:47:52 -04:00
Pfeil, Scott Robert
36d223e0de stack fixing. work in progress 2019-06-11 09:41:44 -04:00
Pfeil, Scott Robert
74fddc40ad alignment and stack changes 2019-06-10 11:47:29 -04:00
Suresh, Kamlesh
3671843ecf Merge branch 'feature/molecule_progressbar' into 'develop'
ProgressBar molecule

See merge request BPHV_MIPS/mvm_core_ui!66
2019-06-07 11:47:24 -04:00
Pfeil, Scott Robert
161f3e9f08 reset function.
standard spacing for cell molecule
MFTextField to view contstraining view
constraining protocol
2019-06-04 12:42:52 -04:00
Panth Patel
458cddb421 progress bar changes 2019-06-04 11:52:56 -04:00
Pfeil, Scott Robert
38dc726f41 Setting up for defaults 2019-05-31 09:42:31 -04:00
Pfeil, Scott Robert
341aef0184 more merge fixes 2019-05-29 10:13:48 -04:00
Pfeil, Scott Robert
119a9e8c0f merge develop 2019-05-29 09:07:15 -04:00
Pfeil, Scott Robert
1e9e1d2dda Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into develop 2019-05-29 09:05:13 -04:00
Pfeil, Scott Robert
699aa94d0a fixes 2019-05-24 11:56:07 -04:00
Pfeil, Scott Robert
b03fa77dfd added to molecule list 2019-05-24 09:45:42 -04:00
Pfeil, Scott Robert
cf4af8731e fix to parameter 2019-05-24 09:42:20 -04:00
Pfeil, Scott Robert
0f5cb47765 molecule list
moduleMolecule
2019-05-23 18:32:11 -04:00
c0surk2
dd4c541098 Merge branch 'feature/switch' into 'develop'
Feature/switch

See merge request BPHV_MIPS/mvm_core_ui!74
2019-05-23 17:07:13 -04:00
Priya
344163de49 Switch molecule 2019-05-23 16:22:32 -04:00
Panth Patel
a95456edff ProgressBar Changes 2019-05-20 17:31:41 -04:00
Pfeil, Scott Robert
0f458d21a3 module molecule 2019-05-15 11:16:08 -04:00
Panth Patel
1b116485e4 pbchanges 2019-05-08 17:27:20 -04:00
Panth Patel
faf0ce2607 progress 2019-05-08 17:20:15 -04:00
Priya
14b01d0ae0 switch changes 2019-05-07 12:55:46 -04:00
Suresh, Kamlesh
524eef4379 improvements 2019-05-03 16:47:45 -04:00
Suresh, Kamlesh
25156195a2 merge 2019-04-30 13:32:12 -04:00
Pfeil, Scott Robert
2d73f89fd4 separator
keys
clean up
2019-04-30 10:34:25 -04:00
Pfeil, Scott Robert
302a2f887f thickness. molecule alignment 2019-04-29 13:36:36 -04:00
Suresh, Kamlesh
668d42176a merge 2019-04-29 13:29:33 -04:00
Pfeil, Scott Robert
dc1372ca40 merge 2019-04-24 15:38:35 -04:00
Pfeil, Scott Robert
90d2290843 remove extra view I created 2019-04-24 14:30:16 -04:00
Pfeil, Scott Robert
b00b43eab0 Helper functions
Molecule List.
Back to view instead of margins for stack due to background color issues.
Standard Header View to margin for internal use.
2019-04-22 13:14:22 -04:00
Christiano, Kevin
17decc6602 Merge branch 'develop' into feature/kevin
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
#	MVMCoreUI/Atoms/Views/MFLabel.h
#	MVMCoreUI/Atoms/Views/MFLabel.m
2019-04-18 09:32:31 -04:00
Suresh, Kamlesh
725a0a914f Merge branch 'develop' into feature/form_checkbox 2019-04-17 11:05:36 -04:00
Christiano, Kevin
da1f5a5703 Converted MFLabel (objc) to Label (Swift). Pulled LabelWithoutAccessibilityTraits from Mobilefirst module and converted it. Altered imports where needed. 2019-04-15 16:50:35 -04:00
Pfeil, Scott Robert
7343f24e9b missed super 2019-04-15 15:09:25 -04:00
Pfeil, Scott Robert
5ebcba15fa molecule delegate object 2019-04-15 12:59:27 -04:00
Pfeil, Scott Robert
aa4da8f74f deprecating 2019-04-15 11:14:29 -04:00
Pfeil, Scott Robert
f1d80adf57 delegate object and simple deprecation 2019-04-12 15:32:43 -04:00
Suresh, Kamlesh
0169d50c80 merge and remove CheckBoxWithLabel 2019-04-09 15:42:27 -04:00
Suresh, Kamlesh
2b4d8b95c9 checkbox 2019-04-03 14:46:34 -04:00
Suresh, Kamlesh
5df8ad42f3 merge 2019-04-01 18:01:42 -04:00
Christiano, Kevin
814f2e1386 Removed a comma at the end 2019-03-29 08:54:36 -04:00
Christiano, Kevin
5083fb7c88 molecule map change. 2019-03-29 08:52:22 -04:00
Christiano, Kevin
f12f9b17f7 Removed dash line from molecule map. 2019-03-29 08:51:37 -04:00
Suresh, Kamlesh
720c97efb9 merge 2019-03-27 11:42:06 -04:00
Christiano, Kevin
f154befabf Merge branch 'develop' into feature/kevin
# Conflicts:
#	MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m
2019-03-26 16:43:47 -04:00
Suresh, Kamlesh
69309cf3b1 molecule testfields 2019-03-26 13:51:33 -04:00
Pfeil, Scott Robert
a2ab8c6571 swifty buttons 2019-03-25 09:37:54 -04:00
Christiano, Kevin
d8fedf4d8b placing CaretButton in molecule map. 2019-03-21 14:58:22 -04:00