Skip to content

Feature/enhancements#512

Open
PriyankaKambleTouchcore wants to merge 642 commits intoResearchStack:masterfrom
PriyankaKambleTouchcore:feature/enhancements
Open

Feature/enhancements#512
PriyankaKambleTouchcore wants to merge 642 commits intoResearchStack:masterfrom
PriyankaKambleTouchcore:feature/enhancements

Conversation

@PriyankaKambleTouchcore
Copy link

@PriyankaKambleTouchcore PriyankaKambleTouchcore commented Jul 2, 2019

Enhancements added

dephillipsmichael and others added 30 commits October 31, 2017 16:34
@dephillipsmichael
Fixed data logger write after close bug
581345f
@dephillipsmichael
Merge pull request ResearchStack#397 from dephillipsmichael/public_me…
e7d850d 
…thods

Public_Functionality_Bug_Fix
@dephillipsmichael
Added location updates
e9b1d3f
@dephillipsmichael
fixed no recorder crash
12453bd
@dephillipsmichael
Fixed animated vector parsing
257f12a
@dephillipsmichael
Fixed active step parsing
8e4564a
@dephillipsmichael
Merge pull request ResearchStack#398 from dephillipsmichael/crf_updates
8cc9a7f 
Crf Updates
@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
liujoshua and others added 29 commits April 10, 2018 16:45
@liujoshua
Merge pull request ResearchStack#475 from liujoshua/bugfix/crash-on-k…
e5c5118 
…itkat-and-below-with-vector-drawable

Bugfix/crash on kitkat and below with vector drawable
@EricSiegNW
Add request phon sign in method
4bb7522
@EricSiegNW
Merge pull request ResearchStack#476 from EricSiegNW/request_phone_si…
34af35c 
…gn_in

Request phone sign
@liujoshua
Enable warnings for RxLint
7351166
@liujoshua
Merge pull request ResearchStack#477 from liujoshua/feature/warning-f…
bd718a5 
…or-rxlint

Enable warnings for RxLint
@liujoshua
Replace joda-time with Android version
bbecde0
@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
Created feature enhancements
98d1964
@liujoshua
Copy link
Collaborator

liujoshua commented Jul 8, 2019

Hi Priyanka, thanks for the pull request. We're actively working on the next major release of ResearchStack and do not plan to directly merge the develop branch into master. Perhaps we could chat about what you're working on to see if our next release will align with your requirements.

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 @liujoshua @dephillipsmichael @DwayneJengSage @EricSiegNW @nategbrown9