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.

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

OC 6905 v1.1 #54

Open
wants to merge 106 commits into
base: 1.1
Choose a base branch
from
Open

OC 6905 v1.1 #54

wants to merge 106 commits into from

Conversation

rooney
Copy link
Contributor

@rooney rooney commented Jan 20, 2016

No description provided.

Ron Panduwana and others added 30 commits April 23, 2014 18:28
…rfsListOid.

Add test for start date and status.
OC-5353: Move Designer codebase to github, version the code & cleanup code
OC-5095 Update Rule Designer logo
rooney and others added 30 commits July 1, 2014 14:26
OC-5645 Remove hard coded values from HostAccessService
OC-5648 Rule Designer: Static Width breaks layout
OC-5694 footer CSS problem
# Conflicts:
#	src/main/java/org/akaza/openclinica/designer/web/controller/LazyRuleRefType2.java
#	src/main/java/org/akaza/openclinica/designer/web/controller/RuleBuilderController.java
…dback/bugfixes -- email message formatting bugfix still in progress
…igner produces an error

bugfix, email validator

Add new dependency commons-validator-1.4.1, and use their EmailValidator

Add repository maven-central from http://repo1.maven.org/maven2/, there was problem with packages downloaded by maven failing checksum

Add dependency jackson-core-asl, there was problem with rendering json http response

Add dependency apache.tiles, apache.httpcore, and ow2.asm, there was missing definition when building the package
Actually they were working but the results from OpenClinica were not
properly displayed.
Conflicts:
	LICENSE.txt
	pom.xml
	src/assemble/designer-assemble.xml
	src/main/resources/org/akaza/openclinica/i18n/licensing.properties
	src/main/webapp/WEB-INF/views/footer.jsp
	src/main/webapp/WEB-INF/views/south.jsp
	src/main/webapp/includes/NewLoginStyles.css
	src/main/webapp/includes/styles.css
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants