[go: up one dir, main page]
Menu ▾ ▴

Commit [r2540]  Maximize  Restore  History

Fixed spreadsheet uploads being forgotten on study save

Fixed PMF theming frontpage
Added EJB query for fetching only active studies

markdturner 2014-12-19

Browse code at this revision

Parent: [r2539]

Child: [r2541]

changed /trunk/code/server/ServerBeans/src/main/java/com/connexience/server/ejb/project/StudyBean.java
changed /trunk/code/server/ServerCommon/src/main/java/com/connexience/server/ejb/project/StudyRemote.java
changed /trunk/code/server/ServerCommon/src/main/java/com/connexience/server/model/project/study/Study.java
changed /trunk/code/server/Website/src/main/webapp/WEB-INF/jspf/page/ticket.jspf
changed /trunk/code/server/Website/src/main/webapp/pages/studies/studies.jsp
changed /trunk/code/server/Website/src/main/webapp/pages/studies/study.jsp
copied /trunk/code/server/Website/src/main/webapp/styles/esc/frontpage/css/bootstrap.min.css -> /trunk/code/server/Website/src/main/webapp/styles/unilever/frontpage/css/bootstrap.min.css
copied /trunk/code/server/Website/src/main/webapp/styles/esc/frontpage/css/style.css -> /trunk/code/server/Website/src/main/webapp/styles/unilever/frontpage/css/style.css
copied /trunk/code/server/Website/src/main/webapp/styles/esc/frontpage/img/alternative_white.png -> /trunk/code/server/Website/src/main/webapp/styles/unilever/frontpage/img/alternative_white.png
copied /trunk/code/server/Website/src/main/webapp/styles/esc/frontpage/img/glyphicons-halflings-white.png -> /trunk/code/server/Website/src/main/webapp/styles/unilever/frontpage/img/glyphicons-halflings-white.png
copied /trunk/code/server/Website/src/main/webapp/styles/esc/frontpage/img/glyphicons-halflings.png -> /trunk/code/server/Website/src/main/webapp/styles/unilever/frontpage/img/glyphicons-halflings.png
copied /trunk/code/server/Website/src/main/webapp/styles/esc/frontpage/img/register_white.png -> /trunk/code/server/Website/src/main/webapp/styles/unilever/frontpage/img/register_white.png
copied /trunk/code/server/Website/src/main/webapp/styles/esc/frontpage/img/shibboleth.png -> /trunk/code/server/Website/src/main/webapp/styles/unilever/frontpage/img/shibboleth.png
copied /trunk/code/server/Website/src/main/webapp/styles/esc/frontpage/img/signin_white.png -> /trunk/code/server/Website/src/main/webapp/styles/unilever/frontpage/img/signin_white.png
copied /trunk/code/server/Website/src/main/webapp/styles/esc/frontpage/img/splash.png -> /trunk/code/server/Website/src/main/webapp/styles/unilever/frontpage/img/splash.png
copied /trunk/code/server/Website/src/main/webapp/styles/esc/frontpage/js/bootstrap.min.js -> /trunk/code/server/Website/src/main/webapp/styles/unilever/frontpage/js/bootstrap.min.js
copied /trunk/code/server/Website/src/main/webapp/styles/esc/frontpage/js/jquery-1.8.3.min.js -> /trunk/code/server/Website/src/main/webapp/styles/unilever/frontpage/js/jquery-1.8.3.min.js
copied /trunk/code/server/Website/src/main/webapp/styles/esc/jspf/frontPageBottom.jsp -> /trunk/code/server/Website/src/main/webapp/styles/unilever/jspf/frontPageBottom.jsp
/trunk/code/server/ServerBeans/src/main/java/com/connexience/server/ejb/project/StudyBean.java Diff Switch to side-by-side view
Loading...
/trunk/code/server/ServerCommon/src/main/java/com/connexience/server/ejb/project/StudyRemote.java Diff Switch to side-by-side view
Loading...
/trunk/code/server/ServerCommon/src/main/java/com/connexience/server/model/project/study/Study.java Diff Switch to side-by-side view
Loading...
/trunk/code/server/Website/src/main/webapp/WEB-INF/jspf/page/ticket.jspf Diff Switch to side-by-side view
Loading...
/trunk/code/server/Website/src/main/webapp/pages/studies/studies.jsp Diff Switch to side-by-side view
Loading...
/trunk/code/server/Website/src/main/webapp/pages/studies/study.jsp Diff Switch to side-by-side view
Loading...
/trunk/code/server/Website/src/main/webapp/styles/esc/frontpage/css/bootstrap.min.css to /trunk/code/server/Website/src/main/webapp/styles/unilever/frontpage/css/bootstrap.min.css
File was copied.
/trunk/code/server/Website/src/main/webapp/styles/esc/frontpage/css/style.css to /trunk/code/server/Website/src/main/webapp/styles/unilever/frontpage/css/style.css
File was copied.
/trunk/code/server/Website/src/main/webapp/styles/esc/frontpage/img/alternative_white.png to /trunk/code/server/Website/src/main/webapp/styles/unilever/frontpage/img/alternative_white.png
File was copied.
/trunk/code/server/Website/src/main/webapp/styles/esc/frontpage/img/glyphicons-halflings-white.png to /trunk/code/server/Website/src/main/webapp/styles/unilever/frontpage/img/glyphicons-halflings-white.png
File was copied.
/trunk/code/server/Website/src/main/webapp/styles/esc/frontpage/img/glyphicons-halflings.png to /trunk/code/server/Website/src/main/webapp/styles/unilever/frontpage/img/glyphicons-halflings.png
File was copied.
/trunk/code/server/Website/src/main/webapp/styles/esc/frontpage/img/register_white.png to /trunk/code/server/Website/src/main/webapp/styles/unilever/frontpage/img/register_white.png
File was copied.
/trunk/code/server/Website/src/main/webapp/styles/esc/frontpage/img/shibboleth.png to /trunk/code/server/Website/src/main/webapp/styles/unilever/frontpage/img/shibboleth.png
File was copied.
/trunk/code/server/Website/src/main/webapp/styles/esc/frontpage/img/signin_white.png to /trunk/code/server/Website/src/main/webapp/styles/unilever/frontpage/img/signin_white.png
File was copied.
/trunk/code/server/Website/src/main/webapp/styles/esc/frontpage/img/splash.png to /trunk/code/server/Website/src/main/webapp/styles/unilever/frontpage/img/splash.png
File was copied.
/trunk/code/server/Website/src/main/webapp/styles/esc/frontpage/js/bootstrap.min.js to /trunk/code/server/Website/src/main/webapp/styles/unilever/frontpage/js/bootstrap.min.js
File was copied.
/trunk/code/server/Website/src/main/webapp/styles/esc/frontpage/js/jquery-1.8.3.min.js to /trunk/code/server/Website/src/main/webapp/styles/unilever/frontpage/js/jquery-1.8.3.min.js
File was copied.
/trunk/code/server/Website/src/main/webapp/styles/esc/jspf/frontPageBottom.jsp to /trunk/code/server/Website/src/main/webapp/styles/unilever/jspf/frontPageBottom.jsp
File was copied.