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 |
|
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 |
|
Priya
|
281a10f7e1
|
Switch molecule
|
2019-05-17 14:36:18 -04:00 |
|
Panth Patel
|
d535e9190b
|
ProgressBar Changes
|
2019-05-16 15:47:58 -04:00 |
|
Panth Patel
|
6cab25d384
|
ProgressBar
|
2019-05-16 15:39:29 -04:00 |
|
Priya
|
85e9c56dcf
|
switch modification
|
2019-05-16 15:05:05 -04:00 |
|
Priya
|
9ecc7f21a6
|
switch modification
|
2019-05-16 11:54:57 -04:00 |
|
Priya
|
97b7fbebad
|
switch modification
|
2019-05-16 10:20:13 -04:00 |
|
Panth Patel
|
ff823d6862
|
merge
|
2019-05-15 12:27:48 -04:00 |
|
Panth Patel
|
78f035ce08
|
Molecule ProgressBar
|
2019-05-15 12:19:54 -04:00 |
|
Priya
|
8ef420e3a4
|
switch modification
|
2019-05-15 12:01:30 -04:00 |
|
Priya
|
b77ec675e0
|
Switch molecule
|
2019-05-14 14:34:54 -04:00 |
|
Panth Patel
|
2bd55296b8
|
ProgressBar molecule with a Label
|
2019-05-09 17:31:18 -04:00 |
|
Priya
|
af81b62f93
|
switch
|
2019-05-09 10:58:05 -04:00 |
|
Panth Patel
|
350385a499
|
progress_bar changes
|
2019-05-09 10:45:22 -04:00 |
|