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

Dave test #27

Open
wants to merge 682 commits into
base: master
Choose a base branch
from
Open

Dave test #27

wants to merge 682 commits into from

Conversation

Jkat
Copy link

@Jkat Jkat commented May 25, 2017

Dave test

driusan and others added 30 commits February 26, 2014 13:52
@driusan
Aligned continue button on right hand side
5df0a8a
@driusan
Changed colours/layout for direct data entry
2f8e87d
@driusan
Fixed bug with save instrument not working
6209088
@driusan
Enlargened textarea for participant account email message
7f66056
@driusan
Added review to direct data entry
3228bef
@driusan
Fixed menu filter on participant accounts page
7aaa5d2
@driusan
Auto save date_taken on completion of instrument
7b6273d
@driusan
Added some smarty filters to humanize review
7613378
@driusan
Added per instrument email instructions
3dcc756
@driusan
Added lorisSubHeader field type for direct data entry
eb5b88b
@driusan
Fixed some code duplication from rebasing conflicts
831807e
@rathisekaran
adding lorisSubHeader to quickform parser to be ingored while buildin…
1bbc546 
…g ip_output. Fixing minor typos on review page for direct data entry
@driusan
Updated schema for direct data entry options
6965fdd
@driusan
Merge pull request #19 from rathisekaran/rathi_DirectEntry
689c793 
adding lorisSubHeader to quickform parser to be ingored while building i...
@rathisekaran
adding success message when survey is succesfully created. Also fixin…
93e957c 
…g error message when candidate does not have visit populated in battery
@rathisekaran
adding comment to ucfirst function in utility
e17e8fc
@driusan
Added per instrument email template support
261172d
@driusan
Merge branch 'DirectEntry' of github.com:driusan/Loris-Trunk into Dir…
2fc0add 
…ectEntry
@rathisekaran
Merge remote-tracking branch 'driusan/DirectEntry' into rathi_DirectE…
eec5971 
…ntry
@driusan
Fixed some malformed HTML which was causing CSS to not load correctly
fb2db03
@rathisekaran
updating frontend and fixing issues with naming convention etc
9083752
@rathisekaran
fixing typo
46f6ef8
@driusan
Merge pull request #20 from rathisekaran/rathi_DirectEntry
1b19188 
Rathi direct entry
@driusan
Merge branch 'DirectEntry'
2ebf015 
Conflicts:
	SQL/2013-09-06-DirectDataEntry.sql
	htdocs/direct.css
	htdocs/js/modules/participant_accounts.js
	htdocs/submit.php
	php/libraries/NDB_BVL_Instrument.class.inc
	php/libraries/NDB_Caller.class.inc
	php/libraries/NDB_Form_participant_accounts.class.inc
	php/libraries/NDB_Menu_Filter_participant_accounts.class.inc
	smarty/templates/directentry.tpl
	smarty/templates/menu_participant_accounts.tpl
@driusan
Merge branch 'DirectEntry'
630cb0a
@driusan
Removed conflict markers
255d62f
@driusan
Increased with of dialog in add survey module
b70060a
@driusan
Merge branch 'DirectEntry'
33cee3a
@driusan
Initial page to create accounts for end users direct data entry
d5a9730
@driusan
added Tests and direct pass at direct entry page
509f2db
driusan and others added 13 commits January 12, 2015 13:57
@driusan
Making formatting consistent with aces/master
b1ef995
@driusan
Merge pull request #8 from rathisekaran/remove_identifying_parent_info
a03a661 
Remove identifying parent info
@driusan
Merge branch 'master' of github.com:driusan/Loris
2ac1151
@rathisekaran
adding candidate age field in dqt and excel dump
bbedcc1
@driusan
Merge pull request #9 from rathisekaran/candidate_Age_field
2289b38 
adding candidate age field in dqt and excel dump
@driusan
Merge branch 'master' of github.com:driusan/Loris
f0e34eb
@driusan
Added consent to all other import scripts
5212c1d 
Conflicts:

	tools/CouchDB_Import_MRI.php
@driusan
Added select for study consent before deleting
825684e
@driusan
Restore MRI_upload file from backup
3d8238b
@driusan
Took conflict_resolver from Loris/master
0341526
@driusan
Removed debug statement
f45d89d
@driusan
Remove deletion of consent-free candidatesy
f3f9e68
@Jkat
Dave test
2fccab0 
Dave test
@driusan driusan self-assigned this May 30, 2017
@driusan driusan force-pushed the master branch 4 times, most recently from f3f9e68 to 325be40 Compare October 30, 2017 14:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@johnsaigle johnsaigle johnsaigle approved these changes

Assignees

@driusan driusan

Labels
duplicate
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Jkat @johnsaigle @driusan @rathisekaran