Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge Develop into Master #79

Merged
merged 32 commits into from
Oct 19, 2015
Merged

Merge Develop into Master #79

merged 32 commits into from
Oct 19, 2015

Conversation

awatson1978
Copy link
Owner

Lets publish!

@awatson1978
testing milestone completed
b878765
@awatson1978
lots of ui updates
b2ea321
@awatson1978
updated default route on signup
bed39c5
@awatson1978
/view/collaboration/collaborationId route working; fixes #52
87835f1
@awatson1978
completed meteor method refactor; fixes #53
a638ade
@awatson1978
active-questionnaire package created
2ba2879
@awatson1978
user picklist modal and root_url support
18754ef
@awatson1978
review requests workflow back in
204f4ee
@awatson1978
make sure active-questionnaire is checked in
a2102d5
@awatson1978
lets publish
d1722ad
@awatson1978
active-questionnaires cleanup; no dynamic schemas yet
ff58642
@awatson1978
active-questionnaires package; theming controls
44911c9
@awatson1978
two page layout
6535c68
@awatson1978
user/study search inputs
7c91da1
@awatson1978
able to delete collaborations
5d1dc3c
@awatson1978
D. UserA Can Add a Questionnaire
01d1e9e
@awatson1978
E. UserA Can complete a Questionnaire
ec045af
@awatson1978
saveData button clones questionnaire into data record
00bb058
@awatson1978
F. View Questionnaires associated with a Collaboration; 165 tests; al…
4eaa19a 
…l green
@awatson1978
165 tests; all green; with clinical-meteor packages
bb859a5
@awatson1978
make sure were in the correct directory
cd12a0a
@awatson1978
make sure were in the correct directory
f24e6e1
@awatson1978
gah; make sure we fetch before build
ae48648
@awatson1978
give it a bit more time?
bda80c3
@awatson1978
get some visibility on dir structures
060ffb5
@awatson1978
corrected ActiveRecord typo
b1385ac
@awatson1978
why are we still using the old version of active-record?
0448f0f
@awatson1978
more diagnostics
e6c33a5
@awatson1978
more diagnostics
6d3f811
@awatson1978
more diagnostics
5a5ec7f
@awatson1978 awatson1978 changed the title Develop Merge Develop into Master Oct 19, 2015
awatson1978 added a commit that referenced this pull request Oct 19, 2015
@awatson1978
Merge pull request #79 from awatson1978/develop
b45d69b 
Merge Develop into Master
@awatson1978 awatson1978 merged commit b45d69b into master Oct 19, 2015
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.
1 participant
@awatson1978