Commit Graph

369 Commits

Author SHA1 Message Date
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
Pfeil, Scott Robert
bb51fba0e5 remove legacy os code 2019-10-17 10:31:34 -04:00
Kevin G Christiano
66e45378f4 shapelayer . 2019-10-07 16:33:39 -04:00
Kevin G Christiano
7d6289463d Improved molecular logic of checkbox. 2019-10-07 16:30:14 -04:00
Kevin G Christiano
5043964c29 revised alignment for case when no label. 2019-10-03 16:43:58 -04:00
Kevin G Christiano
44e420218d Constraints mended. more commenting. 2019-10-03 13:22:15 -04:00
Kevin G Christiano
5d1c87819d making changes to align with comments. 2019-10-03 11:14:16 -04:00
Kevin G Christiano
61fcd981c1 setting up the rest. 2019-10-02 15:27:32 -04:00
Kevin G Christiano
77a3eb8827 Added a new extension file for CATransaction. Implementation of Checkbox and CheckboxWithLabel. 2019-10-02 15:22:12 -04:00
Kevin G Christiano
5f8780614f borders. 2019-09-27 14:28:16 -04:00
Kevin G Christiano
b032e40400 Checkbox in good place. 2019-09-27 14:23:46 -04:00
Kevin G Christiano
f5f994648a Decent working state with animation and touch. 2019-09-27 13:43:02 -04:00
Kevin G Christiano
afcf8d535b updates. 2019-09-26 13:56:02 -04:00
Kevin G Christiano
c75337bfdf Getting closer to testing phase. 2019-09-26 11:42:16 -04:00
Kevin G Christiano
38c74acc6e moar. 2019-09-25 14:43:29 -04:00
Kevin G Christiano
35f7024f8d Adding two new checkbox swift classes. 2019-09-25 14:19:49 -04:00
Kevin G Christiano
7722dc5619 Merge branch 'develop' into feature/check_box_mole_revision
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2019-09-23 14:30:04 -04:00
Pfeil, Scott Robert
6cdde756e5 bug fixes 2019-09-19 09:06:14 -04:00
Murugan, Vimal
44ebfb9294 fix for cxtdt_28106 2019-09-17 16:25:00 +05:30
Kevin G Christiano
bbdb0301eb Further checkbox setups. 2019-09-16 09:50:35 -04:00
Kevin G Christiano
8238a42177 Added the new classes. 2019-09-13 12:28:34 -04:00
Pan, Xinlei (Ryan)
52679e95f3 Merge branch 'bugfix/constraining_molecules' into 'develop'
alignment fix issues.

See merge request BPHV_MIPS/mvm_core_ui!133
2019-09-12 09:51:14 -04:00
panxi
f69fe85d83 update based on Scott's comment 2019-09-11 10:19:03 -04:00
panxi
358842e433 update based on Scott's comment 2019-09-11 10:04:19 -04:00
panxi
d52e204721 update multiprogressbar 2019-09-10 15:57:00 -04:00
Pfeil, Scott Robert
4050b784ed alignment fix issues. 2019-09-10 14:11:09 -04:00
Suresh, Kamlesh
fe066f5530 merge 2019-09-10 10:42:08 -04:00
panxi
595a3b1e38 fix typo 2019-09-09 16:49:12 -04:00
panxi
dcd87fb924 add MultiProgress 2019-09-09 16:42:38 -04:00
Kevin G Christiano
33754802bb Latest changes. Now including clause changes. 2019-09-05 11:20:55 -04:00
Kevin G Christiano
a6e732afa9 Merge branch 'develop' into feature/label_accessibility
# Conflicts:
#	MVMCoreUI/Atoms/Views/Label.swift
2019-09-04 14:08:10 -04:00
Kevin G Christiano
880b3fbd3c Merge branch 'feature/label_accessibility' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/label_accessibility 2019-09-04 13:04:51 -04:00
Kevin G Christiano
11b92ac428 Merge branch 'develop' into feature/label_accessibility 2019-09-04 13:04:41 -04:00
Kevin G Christiano
8a74886928 fixed commed. 2019-09-04 09:58:46 -04:00
Kevin G Christiano
81490ae3cf Moved line. 2019-09-04 09:04:02 -04:00
Kevin G Christiano
b7d76eb015 Merge branch 'develop' into feature/label_export_box 2019-09-04 09:00:45 -04:00
Pfeil, Scott Robert
32b2ab825b hide separator flag 2019-09-03 15:52:23 -04:00
Kevin G Christiano
87cc0842de removed programmatic space insert. 2019-09-03 10:36:16 -04:00
Kevin G Christiano
890c1221d3 Merge branch 'develop' into feature/label_export_box 2019-09-03 10:07:38 -04:00
Kevin G Christiano
62418f5132 Moved hasAttachmentImage to a function. 2019-09-03 10:07:15 -04:00
Suresh, Kamlesh
062edc5d41 refactoring for validation based on group 2019-08-30 15:33:05 -04:00
Kevin G Christiano
38912a4f85 some changes made. More to come. 2019-08-29 16:21:30 -04:00
Kevin G Christiano
c2a432fd25 Updated localizable strings to include spanish. Renamed the variable to be more in line with its generic purpose. 2019-08-29 14:58:02 -04:00
Kevin G Christiano
1c5b2e448e Merge branch 'develop' into feature/label_accessibility 2019-08-29 09:39:37 -04:00
Kevin G Christiano
5351c31b1c latest from develop. 2019-08-29 09:39:22 -04:00
Pfeil, Scott Robert
b5276f5519 New molecules and arranging files 2019-08-29 08:28:07 -04:00
Kevin G Christiano
e0643d834e adding dimension ratio. 2019-08-28 10:40:43 -04:00
Kevin G Christiano
c7501f9cd6 Added asychronous behavior to adding image. 2019-08-27 16:28:19 -04:00
Suresh, Kamlesh
0f1ea89623 merge 2019-08-27 12:13:48 -04:00