scipro

DMC/scipro

Go to file

Tom Vahlman 158c53ef7a Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/main/java/se/su/dsv/scipro/admin/pages/AbstractAdminStatisticsPage.java
	src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorProjectIdeaPage.java
	src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorUnmatchedProjectIdeaPage.java
	src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorTabMenuPanel.java

2012-03-26 11:37:04 +02:00

resources/db_update_scripts

No table for supervisors that are interested in handling different project ideas.

2012-03-23 14:08:04 +01:00

src

Merge remote-tracking branch 'origin/develop' into develop

2012-03-26 11:37:04 +02:00

.gitignore

Changed .gitignore to include Thumbs.db

2012-03-02 14:17:58 +01:00

pom.xml

Set the application to check for a JNDI datasource first, and use that if it exists (to be able to configure a datasource on the servers instead of in code)

2012-03-15 13:09:30 +01:00

settings.xml

Added Maven settings.xml for the DSV Maven repo.

2012-01-25 14:19:34 +01:00