Commit Graph

442 Commits

Author SHA1 Message Date
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
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
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
Pfeil, Scott Robert
603652537d remove large text 2019-10-24 09:34:51 -04:00
Pfeil, Scott Robert
0ff661f3c4 revert for legacy 2019-10-24 09:31:01 -04:00
Kevin G Christiano
f0c7f6bce6 unwrap. 2019-10-24 09:19:16 -04:00
Kevin G Christiano
999da709db Merge branch 'develop' into feature/improve_linkability_label
# Conflicts:
#	MVMCoreUI/Atoms/Views/Label.swift
2019-10-24 09:18:25 -04:00
Pfeil, Scott Robert
ef2df903e8 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into develop 2019-10-24 09:06:38 -04:00
Pfeil, Scott Robert
909fe9ae75 Merge branch 'feature/molecule_radio_button' into 'develop'
Feature/molecule radio button

See merge request BPHV_MIPS/mvm_core_ui!70
2019-10-23 17:30:00 -04:00
Kevin G Christiano
a4aedaad90 revert. 2019-10-23 15:43:57 -04:00
Kevin G Christiano
8aaa8cb77f centered. 2019-10-23 15:17:01 -04:00
Pfeil, Scott Robert
0cc81c3255 default background color 2019-10-23 11:38:15 -04:00
Pfeil, Scott Robert
0b364fa004 Radio button changes 2019-10-23 11:32:34 -04:00
Pfeil, Scott Robert
7563269680 changes to test 2019-10-23 10:36:32 -04:00
Pfeil, Scott Robert
5e486ff716 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into develop 2019-10-23 09:09:17 -04:00
Chintakrinda, Arun Kumar (Arun)
b8bdf4829e Fix for label and molecule stack 2019-10-23 18:21:38 +05:30
Pfeil, Scott Robert
252beb311a dynamic type 2019-10-22 11:40:50 -04:00
Kevin G Christiano
083b630054 Merge branch 'develop' into feature/improve_linkability_label 2019-10-22 11:36:58 -04:00
Kevin G Christiano
4742eace6b Merge branch 'develop' into feature/swiftified_textField 2019-10-21 12:12:19 -04:00
Khan, Arshad
03ee7b99c2 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/mva_3_0 2019-10-21 20:58:22 +05:30
Pfeil, Scott Robert
9ef670cfc4 Merge branch 'feature/label_hero_character' into 'develop'
Label Hero

See merge request BPHV_MIPS/mvm_core_ui!136
2019-10-18 12:05:55 -04:00
panxi
ed7329cdcf add progress bar 2019-10-17 15:52:38 -04:00
panxi
034610af5e fixing merging issue 2019-10-17 15:50:25 -04:00
panxi
22eb114635 merge from develop 2019-10-17 15:32:03 -04:00
Kevin G Christiano
6d52663b4f fixed small error in refactor. 2019-10-17 14:06:01 -04:00
Kevin G Christiano
73ac4b932b refacgtorerd. 2019-10-17 12:39:05 -04:00
Kevin G Christiano
11b2ddc4dd Merge branch 'develop' into feature/label_hero_character 2019-10-17 12:17:17 -04:00
Kevin G Christiano
b5dcf68c5d refactoring taxtcontainer. 2019-10-17 12:17:14 -04:00
Kevin G Christiano
2fdc4795f4 correcting type. 2019-10-17 12:00:44 -04:00
Kevin G Christiano
29ffa40cc3 Merge branch 'develop' into feature/checkbox_update 2019-10-17 11:57:34 -04:00