mbrucedogs/mvm_core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
146 Commits 17 Branches 2 Tags 2 MiB
1321eb1422
Commit Graph

146 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Suresh, Kamlesh
1321eb1422 Merge branch 'release/6_8' into feature/trial_user 2018-10-31 12:36:16 -04:00
Yang, Tianhang (Chris)
7b44fcaf5a Merge pull request #39 in BPHVB/mvm_core from bugfix/popup_track to release/6_8 
* commit 'b8374bee5ff7dcde3f29a09f63bd6d156d4ffdf1':
  fix delegate nil
  instance method in core logging delegate protocol
  remove unused page type
  changes to the way popup delegacy works
  proper marking of delegate
  add tracking to alert protocol
  pass controller instead
  remove space
  revert
  revert and change slightly
  remove pageType in document
  remove alertPageType property
  fixes
  alert handler takes alert object
  fix warning
  adobe track alert
 2018-10-30 18:30:43 -04:00
Chris Yang
b8374bee5f fix delegate nil 2018-10-30 18:26:25 -04:00
Chris Yang
fa4e23f330 instance method in core logging delegate protocol 2018-10-30 17:44:56 -04:00
Pfeil, Scott Robert
d825927486 remove unused page type 2018-10-30 17:34:46 -04:00
Pfeil, Scott Robert
bffb93660d changes to the way popup delegacy works 2018-10-30 17:32:59 -04:00
Pfeil, Scott Robert
cbcab0ea1c proper marking of delegate 2018-10-30 17:21:24 -04:00
Pfeil, Scott Robert
3504a12e61 add tracking to alert protocol 2018-10-30 17:02:35 -04:00
Pfeil, Scott Robert
71523fe676 pass controller instead 2018-10-30 16:48:05 -04:00
Pfeil, Scott Robert
4deb0d66fa Merge branch 'bugfix/popup_track' of https://onestash.verizon.com/scm/bphvb/mvm_core into bugfix/popup_track 2018-10-30 16:36:00 -04:00
Pfeil, Scott Robert
cbe2ad2f57 remove space 2018-10-30 16:35:50 -04:00
Chris Yang
a0e08ad7e0 revert 2018-10-30 16:21:14 -04:00
Pfeil, Scott Robert
ea08526ce7 revert and change slightly 2018-10-30 16:11:28 -04:00
Pfeil, Scott Robert
c860e20258 lenient bool.... web view clean up 2018-10-30 14:29:11 -04:00
Chris Yang
0105a5d450 remove pageType in document 2018-10-30 14:25:53 -04:00
Chris Yang
05561e9cbf remove alertPageType property 2018-10-30 14:25:06 -04:00
Chris Yang
c7e3364399 fixes 2018-10-30 13:59:30 -04:00
Chris Yang
beb59b5a92 Merge remote-tracking branch 'refs/remotes/origin/bugfix/popup_track' 
Conflicts:
	MVMCore/MVMCore/AlertHandling/MVMCoreAlertHandler.h
	MVMCore/MVMCore/AlertHandling/MVMCoreAlertHandler.m
 2018-10-30 12:22:26 -04:00
Chris Yang
636417b317 alert handler takes alert object 2018-10-30 12:21:28 -04:00
Pfeil, Scott Robert
d12df0b753 fix warning 2018-10-27 17:29:05 -04:00
Chris Yang
e0a704ec51 adobe track alert 2018-10-25 16:50:06 -04:00
Suresh, Kamlesh
adda2f461b button map read only property 2018-10-14 23:57:41 -04:00
Pfeil, Scott Robert
41a454440e changes to the custom time and button map removal 2018-10-11 16:23:16 -04:00
Suresh, Kamlesh
35da51bc74 button map 2018-10-06 15:05:37 -04:00
Suresh, Kamlesh
4c506b5b59 buttonMap 2018-10-03 17:47:42 -04:00
Suresh, Kamlesh
b802ef630d customTimeoutTime 2018-10-03 15:31:27 -04:00
Suresh, Kamlesh
0423937e8c customTimeoutTime 2018-10-03 15:25:25 -04:00
Pfeil, Scott Robert
0f4b084880 Merge pull request #36 in BPHVB/mvm_core from bugfix/map_nullability to develop 
* commit 'a35f9a4df1f16d52066253c9ddfa0f68d789bfe6':
  Fix flatMap spec.
  Fix nullabiilty. You must return an object for every element.
  Fix nullabiilty. You must return an object for every element.
 2018-09-13 16:12:48 -04:00
Hedden, Kyle Matthew
a35f9a4df1 Fix flatMap spec. 2018-09-13 15:17:07 -04:00
Hedden, Kyle Matthew
edbb7eb07c Merge branch 'bugfix/map_nullability' of ssh://onestash.verizon.com:7999/bphvb/mvm_core into bugfix/map_nullability 2018-09-13 14:33:40 -04:00
Hedden, Kyle Matthew
5ccfb225be Fix nullabiilty. You must return an object for every element. 2018-09-13 14:32:53 -04:00
Hedden, Kyle Matthew
2a8bd67f7e Fix nullabiilty. You must return an object for every element. 2018-09-13 14:24:38 -04:00
Sommer, Patrick
099aa25655 Merge pull request #35 in BPHVB/mvm_core from feature/array_category to develop 
* commit 'e56f429834d9d6561ffcee5739dbf4c1bf02f2c1':
  nullable fixes
  fucntional methods for array
 2018-09-12 09:57:22 -04:00
Chris Yang
e56f429834 nullable fixes 2018-09-12 09:12:15 -04:00
Chris Yang
8b58dcf1ce fucntional methods for array 2018-09-12 09:07:10 -04:00
Sommer, Patrick
8442b06b73 Merge pull request #32 in BPHVB/mvm_core from bugfix/tabbarcrash to develop 
* commit '234143a4169f8d847a72c40ad83b405b935adf2f':
  fix crash
 2018-09-05 16:24:21 -04:00
Michael Chen
234143a416 fix crash 
fix crash by removing observer when operation finished
 2018-09-05 13:22:43 -04:00
Pfeil, Scott Robert
05068ec879 Merge pull request #19 in BPHVB/mvm_core from feature/tabbar_animation to develop 
* commit '6b2ee27c5d002cec02c5f22e92e73a9f8c7f92f9':
  fixed panning when not interacting. always use animation for direction Add missing protocol call
  space
  Tab bar control smarter, only fire off certain things when we commit to swipe
  code review change
  code review changes
  move protocol to core
  revert changes
  add delegate function for interactiveTransitionGetCanceled
  remove destination view controller when transition canceled
  tab bar swipe interactive transition
 2018-08-21 17:15:53 -04:00
Pfeil, Scott Robert
6b2ee27c5d fixed panning when not interacting. 
always use animation for direction
Add missing protocol call
 2018-08-21 14:35:18 -04:00
Michael Chen
594292c726 Merge branch 'develop' into feature/tabbar_animation 2018-08-20 13:30:33 -04:00
Pfeil, Scott Robert
0cb1bc1533 Merge pull request #31 in BPHVB/mvm_core from bugfix/panel to develop 
* commit '93c9ea1f2a3315b82db8ded07168b858acf301d7':
  change method to optional
 2018-08-16 14:28:46 -04:00
Pan, Xinlei (Ryan)
93c9ea1f2a change method to optional 2018-08-16 10:55:58 -04:00
Michael Chen
592b1603ab Merge branch 'develop' into feature/tabbar_animation 2018-08-15 14:07:54 -04:00
Sommer, Patrick
55a6c4fe48 Merge pull request #30 in BPHVB/mvm_core from bugfix/uilabelbounding to develop 
* commit '7d395ee36fe3c21d35f373c83c9e82e3a0ada1d6':
  remove comment
  boudning fix
 2018-08-14 16:26:41 -04:00
Pan, Xinlei (Ryan)
7d395ee36f remove comment 2018-08-14 16:24:15 -04:00
Chris Yang
44b7034b49 boudning fix 2018-08-14 15:43:31 -04:00
Pfeil, Scott Robert
bbc643040b Merge pull request #29 in BPHVB/mvm_core from feature/server_driven_session_extension to develop 
* commit '098aded7edbe0159f51e4bce236c41f445288dd2':
  More aggressive session extension.
  Adjust timing of session timer extension. PR resolution.
  Allow the server to specify whether to extend the session timer.
 2018-08-09 13:54:53 -04:00
Hedden, Kyle Matthew
098aded7ed More aggressive session extension. 2018-08-09 11:21:57 -04:00
Sommer, Patrick
aa1453d9c7 Merge pull request #28 in BPHVB/mvm_core from feature/initial_parameters_exclusion to develop 
* commit '6c177efd8f9ebcc553ac7908646fdf41efb05c87':
  Switch to using NSSet to satisfy PR.
  Add capability to exclude initial parameters.
 2018-08-09 10:04:20 -04:00
Hedden, Kyle Matthew
6c177efd8f Switch to using NSSet to satisfy PR. 2018-08-08 18:21:35 -04:00