Commit Graph

63 Commits

Author SHA1 Message Date
Hedden, Kyle Matthew
529dd348dd Merge branch 'bugfix/black_screen' into 'develop'
RootViewController swap instead of present.

See merge request BPHV_MIPS/jsoncreator_ios!14
2023-09-05 15:32:02 +00:00
Scott Pfeil
e65b238164 RootViewController swap instead of present. 2023-09-05 11:29:07 -04:00
Hedden, Kyle Matthew
9ef39c8cfb Merge branch 'bugfix/navigation_handler_modernization' into 'develop'
NavigationHandler

See merge request BPHV_MIPS/jsoncreator_ios!13
2023-09-05 14:23:50 +00:00
Scott Pfeil
4deefc5692 NavigationHandler 2023-09-05 10:17:20 -04:00
Bruce, Matt R
e3c1a03a27 Merge branch 'feature/vds_color_2_0_0' into 'develop'
Feature/vds color 2 0 0

See merge request BPHV_MIPS/jsoncreator_ios!12
2023-08-15 15:33:42 +00:00
Scott Pfeil
8d15e513be artifactory 2023-08-15 11:31:53 -04:00
Scott Pfeil
53d79daa94 JSON updates 2023-08-15 11:30:26 -04:00
Scott Pfeil
96555b94c3 Split and notifications 2023-08-15 11:25:42 -04:00
Bruce, Matt R
0bf09e330e Merge branch 'feature/vds_color_2_0_0' into 'develop'
Update to vds color 2.0

See merge request BPHV_MIPS/jsoncreator_ios!11
2023-07-11 17:15:12 +00:00
Scott Pfeil
c497d41a6c Update to vds color 2.0 2023-07-11 13:14:19 -04:00
Pfeil, Scott Robert
7a82270c78 Merge branch 'feature/iphone_functional' into 'develop'
Feature/iphone functional

See merge request BPHV_MIPS/jsoncreator_ios!10
2023-06-27 20:42:53 +00:00
Scott Pfeil
c6108f7427 Merge 2023-06-27 16:40:59 -04:00
Scott Pfeil
435c93aefc merge develop 2023-06-27 16:34:24 -04:00
Scott Pfeil
3ad4d7dc6a update git ignore 2023-06-27 16:25:58 -04:00
Scott Pfeil
55c2466eb1 merge 2023-06-27 16:23:09 -04:00
Hedden, Kyle Matthew
dffce43236 Merge branch 'update/tilelet-sample' into 'develop'
changed dependency

See merge request BPHV_MIPS/jsoncreator_ios!9
2023-04-06 20:40:24 +00:00
Matt Bruce
60bb674e94 changed dependency
Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
2023-04-06 15:39:07 -05:00
Hedden, Kyle Matthew
32ac60f8a4 Merge branch 'update/tilelet-sample' into 'develop'
updated for tilet

See merge request BPHV_MIPS/jsoncreator_ios!8
2023-04-06 20:37:00 +00:00
Matt Bruce
fcfd21400f Merge branch 'feature/ONEAPP-2811-Tilet' into develop
# Conflicts:
#	JSONCreator_iOS/JSONCreator/TestToggle.swift

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
2023-04-06 15:29:25 -05:00
Matt Bruce
cb3b932c04 removed testtoggle
Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
2023-04-06 15:26:19 -05:00
Matt Bruce
394a21bf53 updated sample
Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
2023-03-30 10:53:14 -05:00
Matt Bruce
7d3fef48c4 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/jsoncreator_ios.git into feature/ONEAPP-2811-Tilet 2023-02-01 13:45:44 -06:00
Hedden, Kyle Matthew
6790708a72 Merge branch 'feature/artificatory' into 'develop'
Added artificatory download for VDS

See merge request BPHV_MIPS/jsoncreator_ios!7
2023-02-01 18:53:29 +00:00
Matt Bruce
f97c2dd79f Signed-off-by: Matt Bruce <matt.bruce@verizon.com> 2023-02-01 12:39:56 -06:00
Matt Bruce
dd6e1008b5 updated for tilet
Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
2023-01-12 15:57:39 -06:00
Matt Bruce
d59f88f9c6 Signed-off-by: Matt Bruce <matt.bruce@verizon.com> 2022-10-27 10:05:21 -05:00
Matt Bruce
209fd68426 Merge branch 'feature/vds-no-models' into develop
# Conflicts:
#	JSONCreator.xcworkspace/contents.xcworkspacedata
#	JSONCreator_iOS/JSONCreator/AppDelegate.swift
#	JSONCreator_iOS/JSONCreator/DetailViewController.swift

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
2022-10-27 09:59:28 -05:00
Matt Bruce
d696ded6e7 added samples
Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
2022-10-27 09:20:51 -05:00
Matt Bruce
d8cda0f3dc Signed-off-by: Matt Bruce <matt.bruce@verizon.com> 2022-10-27 09:03:27 -05:00
Matt Bruce
cc5c68094c Signed-off-by: Matt Bruce <matt.bruce@verizon.com> 2022-10-21 08:19:56 -05:00
Matt Bruce
5a54eab41e update vds
Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
2022-10-21 08:18:24 -05:00
Matt Bruce
d080cbab69 Signed-off-by: Matt Bruce <matt.bruce@verizon.com> 2022-08-02 10:08:04 -05:00
Matt Bruce
e88da178df added more JSON files
Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
2021-12-10 14:14:22 -06:00
Matt Bruce
5349c565ad updated project files to sort and execute cleaner
Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
2021-12-06 16:24:15 -06:00
Scott Pfeil
623e8312f2 name change 2021-10-22 11:28:18 -04:00
Pfeil, Scott Robert
ff21987c1e json 2021-08-16 14:19:12 -04:00
Pfeil, Scott Robert
9c5f3019c3 tab list fix 2020-07-20 14:46:56 -04:00
Pfeil, Scott Robert
10aafa8637 accessibility label 2020-07-09 11:29:13 -04:00
Pfeil, Scott Robert
c1d4c5f5dc long press improve 2020-07-09 11:12:15 -04:00
Pfeil, Scott Robert
9881feb39b gestures and done possible fix 2020-06-25 10:18:42 -04:00
Pfeil, Scott Robert
ba795b6d35 remove panel from navigation setting. 2020-05-27 10:51:23 -04:00
Pfeil, Scott Robert
f531234d85 navigation and template 2020-04-21 15:51:50 -04:00
Pfeil, Scott Robert
4d9a7b26e3 progress updates 2020-04-03 11:42:31 -04:00
Pfeil, Scott Robert
3683d433af json 2020-03-27 12:25:13 -04:00
Pfeil, Scott Robert
6b1b4bbd59 Caret fix in table view cell
code condensing
extra init functions
2020-02-21 09:27:30 -05:00
Pfeil, Scott Robert
2ee0252cf6 son updates 2020-02-19 14:35:55 -05:00
Pfeil, Scott Robert
67bfed1f28 Merge branch 'feature/ipad_friendly' into 'develop'
firendly ipad

See merge request BPHV_MIPS/jsoncreator_ios!4
2020-02-19 12:33:59 -05:00
Kevin G Christiano
74be312bf0 firendly ipad 2020-02-18 15:52:22 -05:00
Pfeil, Scott Robert
61ca0d7f69 Merge branch 'bugfix/textview' into 'develop'
move project location, fix textview capitalization

See merge request BPHV_MIPS/jsoncreator_ios!3
2020-01-30 10:29:59 -05:00
Pfeil, Scott Robert
80908b584f update multi progress to match color 2020-01-13 21:25:25 -05:00