Commit Graph

112 Commits

Author SHA1 Message Date
Pfeil, Scott Robert
7fa0943a42 Merge branch 'feature/estimated_heights' into 'develop'
Feature/estimated heights

See merge request BPHV_MIPS/mvm_core_ui!93
2019-07-01 09:14:34 -04:00
Pfeil, Scott Robert
6fde7bc8b4 two typo fix
list and stack template required molecules
2019-06-28 13:34:15 -04:00
Pfeil, Scott Robert
93f7aae529 estimated heights 2019-06-27 16:18:32 -04:00
Pfeil, Scott Robert
868593aabe move module from page to mfviewcontroller 2019-06-27 10:03:24 -04:00
Pfeil, Scott Robert
01803e90d6 background color consolidation 2019-06-26 12:58:43 -04:00
Pfeil, Scott Robert
0db0f91b3b ModuleMolecule is now a self contained view.
Fixed priority defect in view constraining view.
Change the way names are set for reuse
improve current margin logic
2019-06-26 12:01:47 -04:00
Pfeil, Scott Robert
9f038467a9 key fix 2019-06-21 13:14:25 -04:00
Pfeil, Scott Robert
e8b9de6d35 merge 2019-06-21 13:04:11 -04:00
Pfeil, Scott Robert
ed87bd2cfc Button json to have style and size.
Separator alone in stack fix.
remove view constraining view auto background color
fix padding for stack in stack
2019-06-21 12:52:30 -04:00
Pfeil, Scott Robert
cd577288c3 Merge branch 'feature/kevin' into 'develop'
Label Multi-Action

See merge request BPHV_MIPS/mvm_core_ui!62
2019-06-21 12:33:56 -04:00
Suresh, Kamlesh
897a7a9bbd Merge branch 'feature/molecule_progressbar' into 'develop'
ProgressBar changes

See merge request BPHV_MIPS/mvm_core_ui!87
2019-06-21 11:40:18 -04:00
Pfeil, Scott Robert
a7f9104bd8 re-molecule image view 2019-06-20 16:04:59 -04:00
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
Pfeil, Scott Robert
bbb1901be4 remove space 2019-06-18 13:35:48 -04:00
Pfeil, Scott Robert
400a51f0b5 remove spaces 2019-06-18 13:31:51 -04:00
Pfeil, Scott Robert
710fbfefba remove extra space 2019-06-18 13:31:07 -04:00
Panth Patel
65af40f7c7 json changes updated 2019-06-14 10:41:22 -04:00
Christiano, Kevin
53bdf0fcc5 Merge branch 'develop' into feature/kevin 2019-06-12 10:59:30 -04:00
Pfeil, Scott Robert
486cbfdc31 clean up of stack 2019-06-11 17:13:05 -04:00
Pfeil, Scott Robert
2221ab6672 update defaults. 2019-06-11 15:16:20 -04:00
Pfeil, Scott Robert
4bd5006e5e name reuse for molecules
arrow change for molecule cell
2019-06-11 13:44:53 -04:00
Pfeil, Scott Robert
00252ebd69 font style
separator default fix
reset added

foot in list fix
2019-06-11 11:56:06 -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
Christiano, Kevin
8ebcef3a60 Merge branch 'develop' into feature/kevin
# Conflicts:
#	MVMCoreUI/Atoms/Views/Label.swift
2019-06-04 16:23:06 -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
Christiano, Kevin
b00d439ead Merge branch 'develop' into feature/kevin
# Conflicts:
#	MVMCoreUI/Atoms/Views/Label.swift
#	MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m
2019-05-29 10:51:11 -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
a3325035b9 fix override... 2019-05-28 17:04:25 -04:00
Pfeil, Scott Robert
403f0bbea8 42 update to estimated height 2019-05-28 16:47:07 -04:00
Pfeil, Scott Robert
f4cfd0386c add forgotten separator override 2019-05-24 12:30:04 -04:00
Pfeil, Scott Robert
89ed78a0eb miss 2019-05-24 11:57:00 -04:00
Pfeil, Scott Robert
699aa94d0a fixes 2019-05-24 11:56:07 -04:00
Christiano, Kevin
3b66bcfdc3 Merge branch 'develop' into feature/kevin
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2019-05-24 09:20:56 -04:00
Pfeil, Scott Robert
0f5cb47765 molecule list
moduleMolecule
2019-05-23 18:32:11 -04:00
Priya
f53bd03212 Switch molecule 2019-05-23 17:02:30 -04:00
Priya
b73c916192 Switch molecule 2019-05-23 16:32:14 -04:00
Priya
344163de49 Switch molecule 2019-05-23 16:22:32 -04:00
Priya
89b1c9a21b Switch molecule 2019-05-23 11:40:21 -04:00
Priya
9fd2d2cbda Switch molecule 2019-05-21 14:04:46 -04:00
Panth Patel
a95456edff ProgressBar Changes 2019-05-20 17:31:41 -04:00
Panth Patel
145cafbc30 ProgreessBar Modifications 2019-05-20 17:14:21 -04:00
Priya
9f5600a0f3 switch modification 2019-05-20 15:51:07 -04:00
Priya
ddd8eb9d45 Switch molecule 2019-05-20 09:35:35 -04:00
Priya
aac9db9ca5 Switch molecule 2019-05-17 15:22:12 -04:00