Skip to content

Feature/new enhancements#513

Open
PriyankaKambleTouchcore wants to merge 649 commits intoResearchStack:masterfrom
digitalinfuzion-corporate:feature/new_enhancements
Open

Feature/new enhancements#513
PriyankaKambleTouchcore wants to merge 649 commits intoResearchStack:masterfrom
digitalinfuzion-corporate:feature/new_enhancements

Conversation

@PriyankaKambleTouchcore
Copy link

@PriyankaKambleTouchcore PriyankaKambleTouchcore commented Jul 3, 2019

New branch created for enhancements.

dephillipsmichael and others added 30 commits November 1, 2017 16:33
@dephillipsmichael
Public constructor
3148650
@dephillipsmichael
Merge pull request ResearchStack#399 from dephillipsmichael/public_co…
da8ea83 
…nstructor

Public constructor
@DwayneJengSage
changes to support async remote loading of surveys
9fa5f76
@dephillipsmichael
public methods for getting private fields
34122f0
@dephillipsmichael
Merge pull request ResearchStack#400 from dephillipsmichael/public_me…
0d8dd86 
…thods

public_methods
@DwayneJengSage
separate custom task logic from task loading logic
b7627f9
@DwayneJengSage
Merge branch 'develop' of https://github.com/ResearchStack/ResearchStack
2409ee5 
 into develop

Conflicts:
	skin/src/main/java/org/researchstack/skin/ui/fragment/ActivitiesFragment.java
@dephillipsmichael
Added findStringResult method
433936f
@DwayneJengSage
make ActivitiesFragment.startCustomTask() abstract
6f1e320
@DwayneJengSage
move TaskModel and SmartSurveyTask down to backbone
4e483ec
@DwayneJengSage
move TaskFactory.newSmartSurvey() to SurveyFactory.createSmartSurvey()
624037c
@liujoshua
Merge pull request ResearchStack#401 from DwayneJengSage/develop
8fe4e2c 
changes to support async remote loading of surveys
@DwayneJengSage
login with external ID
fbdfa57
@DwayneJengSage
CR responses
fa275a2
@liujoshua
Merge pull request ResearchStack#403 from DwayneJengSage/develop
5d863e7 
login with external ID
@liujoshua
Merge pull request ResearchStack#402 from dephillipsmichael/feature/s…
7b8debf 
…tepResultHelper

feature/stepResultHelper
@dephillipsmichael
Added date time support for background and health survey
dfb5d46
@dephillipsmichael
Fixed bug with 1 tab
fc2eab5
@dephillipsmichael
Encapsulated methods for easier overrides
58fd44a
@dephillipsmichael
Exposed variables for sub-classes
5a1ec59
@dephillipsmichael
Added task model fields that should exist on a task
c6c8ed4
@dephillipsmichael
Merge pull request ResearchStack#405 from dephillipsmichael/crf_actvi…
a92c0f9 
…ties_additions

Crf Activity Additions
@dephillipsmichael
bug fix in unit tests
1250c3f
@dephillipsmichael
Merge pull request ResearchStack#406 from dephillipsmichael/unittest_bug
0f73d15 
Unit Test bug
@dephillipsmichael
Added input type to text field survey item
4015119
@dephillipsmichael
Added validation regex and unit tests
d228ed3
@dephillipsmichael
Merge pull request ResearchStack#407 from dephillipsmichael/feature/t…
c20f376 
…extfield_inputtype

Feature/textfield inputtype
@dephillipsmichael
Adjustments to customize external id step and layout
435de1b
@dephillipsmichael
Added clarifying comments
e3e2221
@dephillipsmichael
Encapsulated focus keyboard method
ec22446
liujoshua and others added 30 commits August 16, 2018 11:45
@liujoshua
Merge pull request ResearchStack#479 from liujoshua/feature/replace-j…
62a77e0 
…oda-with-android-joda

Replace joda-time with Android version
@liujoshua
Update for studio 3.2
64a6e12
@liujoshua
Travis sdk and tools update
40e0af9
@liujoshua
build tools 28.0.2
a6a5210
@liujoshua
Merge pull request ResearchStack#481 from ResearchStack/feature/studi…
03b5ef4 
…o-3_2

Feature/studio 3 2
@dephillipsmichael
Update for survey step type
040f402
@dephillipsmichael
Visibility modifiers
a535292
@dephillipsmichael
Smart Task organization refactor
6a411d8
Added abstract function to get license file
24bdf7c
Update MockResourceManager to include a method for getLicense()
302b350
@dephillipsmichael
Added serialized fields for additional smart survey task functionality
9216bd8
@dephillipsmichael
Changes to support new version of surveys
8c31b59
@dephillipsmichael
Merge branch 'motivation' of https://github.com/dephillipsmichael/Res…
bba14b6 
…earchStack-1 into motivation
@dephillipsmichael
Reverted changes
2150162
@liujoshua
Merge pull request ResearchStack#484 from eyeshoe/profile_feature
1e506ab 
Added abstract function to get license file
@dephillipsmichael
Merge pull request ResearchStack#485 from dephillipsmichael/motivation
010cd56 
Support for additional TaskModel Survey element fields
@liujoshua
Updates suggested/required for Studio 3.3 update
b7c7ceb
@liujoshua
Merge pull request ResearchStack#493 from liujoshua/feature/update-st…
867d6d9 
…udio-3.3

Updates suggested/required for Studio 3.3 update
@nategbrown9
Add a null check in logAccessTime so that PinCodeActivity doesn't cra…
2925398 
…sh if StorageAccess isn't initialized.
@liujoshua
Merge pull request ResearchStack#501 from nategbrown9/crf_module_support
65f1347 
Support for crf module.
@liujoshua
Fix null PackageManager in LocationRecorderTest
69a94d8
@liujoshua
Merge pull request ResearchStack#511 from ResearchStack/task/fix-test…
727b26e 
…-failure

Fix null PackageManager in LocationRecorderTest
@PriyankaKambleTouchcore
Integration enahancements
3a4cdda
@PriyankaKambleTouchcore
TextAnswer format updated
97496f5
@PriyankaKambleTouchcore
ChoiceAnswer format updated
b738952
@PriyankaKambleTouchcore
Choice answer format changes
8b074c1
@PriyankaKambleTouchcore
MultipleDropDownAnswerFormat and MultipleDropDownQuestionBody configu…
7d6eb55 
…red dynamic size
@PriyankaKambleTouchcore
Added custom code
d3c0e75
@PriyankaKambleTouchcore
remove unused imports
880bfa8
@PriyankaKambleTouchcore
Customized researchstack
a702148
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@PriyankaKambleTouchcore @dephillipsmichael @DwayneJengSage @liujoshua @EricSiegNW @nategbrown9