mbrucedogs/mvm_core_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,138 Commits 64 Branches 0 Tags 46 MiB
3b59e03695
Commit Graph

469 Commits

Author SHA1 Message Date
Kevin G Christiano
3b59e03695 Merge branch 'develop' into feature/swiftified_textField 
# Conflicts:
#	MVMCoreUI/Atoms/Buttons/CaretButton.swift
#	MVMCoreUI/Molecules/Items/MoleculeTableViewCell.swift
 2019-12-19 15:11:48 -05:00
Pan, Xinlei (Ryan)
21da4f960d Merge branch 'feature/container' into 'develop' 
Feature/container

See merge request BPHV_MIPS/mvm_core_ui!202
 2019-12-19 11:05:58 -05:00
Khan, Arshad
eec15fc65e added comment as per Scott feedback 2019-12-19 19:21:49 +05:30
Khan, Arshad
aff4b75368 Changing to CGFloat, instead of Double as per feedback provided by Ryan. 
Root Cause: Swift was treating it as Double, instead of Float.
 2019-12-18 22:28:22 +05:30
Khan, Arshad
95c528b658 progress bar percentage is been treated as Double for two decimal places(Like 54.17) in iOS JSON object, due to that progress percentage is not shown, where as working on Android. 
So, changing Float to Double.
 2019-12-18 21:20:58 +05:30
Pfeil, Scott Robert
f610264327 alignment updates 2019-12-16 11:19:30 -05:00
Pfeil, Scott Robert
d95e42330e moving files 2019-12-04 13:09:50 -05:00
Kevin G Christiano
5e28b0bdc5 Merge branch 'develop' into feature/swiftified_textField 2019-12-02 10:43:45 -05:00
Pfeil, Scott Robert
3e46438fd0 label font bugfix caused by the dissonance between label and styler setting.... 2019-12-02 10:11:04 -05:00
Kevin G Christiano
0f04ebe177 Merge branch 'develop' into feature/swiftified_textField 
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
#	MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m
 2019-12-02 09:04:17 -05:00
Pfeil, Scott Robert
ee773eed89 key change 2019-11-27 15:02:03 -05:00
Pfeil, Scott Robert
63556707bc temporary dropdown molecule 
label reuse font fixes
 2019-11-27 13:49:01 -05:00
Pfeil, Scott Robert
392ab144ac small fixes 2019-11-25 16:01:43 -05:00
Kevin G Christiano
f19d45b865 Merge branch 'develop' into feature/swiftified_textField 
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
#	MVMCoreUI/Atoms/Views/CaretView.swift
#	MVMCoreUI/Molecules/Items/TableViewCell.swift
 2019-11-21 11:55:21 -05:00
Kevin G Christiano
88442fe59c latest. 2019-11-21 11:47:12 -05:00
Pfeil, Scott Robert
095b1d7a86 Merge branch 'feature/modernize' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/modernize 2019-11-20 13:29:41 -05:00
Pfeil, Scott Robert
e32b9cfdda PR comments 2019-11-20 13:29:16 -05:00
Pfeil, Scott Robert
279dbd9b08 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/modernize 2019-11-20 10:59:35 -05:00
Pfeil, Scott Robert
c96f5050a8 Line to swift 2019-11-20 10:20:24 -05:00
panxi
a409b331c5 revert 2019-11-19 12:56:07 -05:00
panxi
3851ad036a change to equal 2019-11-19 12:53:48 -05:00
panxi
3cb075499e make checkbox expandable 2019-11-19 10:39:30 -05:00
Pfeil, Scott Robert
d29e8ea3bd small changes 2019-11-19 09:18:15 -05:00
Kevin G Christiano
80c700ba55 Further improvements made to dropdaown. 2019-11-14 11:41:02 -05:00
Pfeil, Scott Robert
716dcff566 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/modernize 2019-11-12 14:45:48 -05:00
Kevin G Christiano
30a56923c0 Merge branch 'develop' into feature/swiftified_textField 
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
 2019-11-12 11:08:55 -05:00
Kevin G Christiano
df1a2a0da0 latest changes for entry. 2019-11-12 11:06:43 -05:00
Suresh, Kamlesh
a212dff80f fixes 2019-11-07 10:45:40 -05:00
Kevin G Christiano
6d7c1df7cc more. 2019-11-06 09:12:18 -05:00
Kevin G Christiano
88eec2bf9d carrots and windows. 2019-11-05 09:25:27 -05:00
Pfeil, Scott Robert
0a45d61eb7 merge 2019-11-05 08:50:17 -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
panxi
7870a116c6 create circle progress view 2019-10-31 16:15:47 -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
Kevin G Christiano
134ba463b9 Merge branch 'develop' into feature/swiftified_textField 2019-10-29 12:21:37 -04:00
Pfeil, Scott Robert
48a940f160 fix to typos 2019-10-29 10:12:59 -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
Pfeil, Scott Robert
b5a97de183 swiftify 2019-10-28 14:03:47 -04:00
Pfeil, Scott Robert
a454d0e3bd Revert "Merge branch 'feature/mva_3_0' into 'develop'" 
This reverts merge request !162
 2019-10-28 09:31:20 -04:00
Khan, Arshad
2c622750fb Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/mva_3_0 2019-10-25 13:27:04 +05:30
Hedden, Kyle Matthew
ab5bb26c1a fix checkbox crash 2019-10-24 18:00:29 -04:00
Khan, Arshad
355f670bd0 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/mva_3_0 2019-10-25 01:19:33 +05:30
Khan, Arshad
c1adbe2f2e Crash fixes in Label 
update molecule name from progressBar to progressbar as per oneconfluence mapping name and Android mapping name.
 2019-10-25 01:17:54 +05:30
Kevin G Christiano
15c2050c4e Merge branch 'develop' into feature/swiftified_textField 2019-10-24 11:20:49 -04:00
Kevin G Christiano
d15d8b2636 Merge branch 'develop' into feature/swiftified_textField 
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
 2019-10-24 11:20:26 -04:00
Pfeil, Scott Robert
5f6c583094 Merge branch 'bugfix/legacy_view_constraining' into 'develop' 
Bugfix/legacy view constraining

See merge request BPHV_MIPS/mvm_core_ui!159
 2019-10-24 09:36:36 -04:00