15099 Commits

Author SHA1 Message Date
da077a5826 Removed checks that could never be false. 2014-04-05 21:43:52 +02:00
6c1a6da598 Removed check that could never be false. 2014-04-05 21:40:58 +02:00
051d8c107e Removed some unused methods. 2014-04-05 21:38:00 +02:00
dc46b8cce3 Removed StudyPlanRepository. 2014-04-05 21:33:59 +02:00
37524bc576 Removed unused class. 2014-04-05 21:26:33 +02:00
89c1627332 Fixed stuff. 2014-04-05 13:14:38 +02:00
33469cd866 Refactored AbstractWorker to work with providers instead of classes and an injector reference. 2014-04-04 16:31:44 +02:00
3c83bb9bad Removed unnecessary class WorkerTimerTask. 2014-04-04 16:17:11 +02:00
d563db2e2c Merge remote-tracking branch 'origin/develop' into develop 2014-04-04 15:53:51 +02:00
d1f70f215e Made Scheduler a Guice-managed singleton. 2014-04-04 15:53:08 +02:00
Emil Siverhall
3eb6858d74 DisplayQuestionPanel simplified 2014-04-04 15:45:44 +02:00
Emil Siverhall
789bf2b0b6 ExpandableMultiLineLabel, thank you, goodbye 2014-04-04 14:33:37 +02:00
Emil Siverhall
4a10f579fb added sso setting to Admin -> General settings 2014-04-04 14:20:26 +02:00
Emil Siverhall
1ef7c64e70 sso part of loginpage now displayed based on setting 2014-04-04 14:17:03 +02:00
Emil Siverhall
bf4b3bd55c removed code that should display logged in users named based on Shibb header. Never worked.. 2014-04-04 13:39:52 +02:00
Emil Siverhall
ed97aaa7ec system setting to show/hide sso login 2014-04-04 13:33:03 +02:00
Emil Siverhall
96ff5d20ef bachelorCountDate and masterCountDate in GeneralSystemSettings haven't been used for years.. 2014-04-04 13:20:21 +02:00
38e904e0d0 Added line-break. 2014-04-04 12:56:24 +02:00
Emil Siverhall
bd581ccd91 style changes 2014-04-04 12:55:09 +02:00
Emil Siverhall
c3661d1375 detach on deletion to update properly release-2014-04-04_12-51-51 2014-04-04 12:12:40 +02:00
Emil Siverhall
c6b1bee117 ViewAttachmentPanel shows date if datestyle is provided 2014-04-04 11:47:06 +02:00
Emil Siverhall
a551b9ea5b deletion of current research plan implemented 2014-04-04 10:42:47 +02:00
Emil Siverhall
8e54f8a311 Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	view/src/main/java/se/su/dsv/scipro/latestevents/LatestEvent.java
	view/src/main/java/se/su/dsv/scipro/latestevents/LatestEventsPanel.html
	view/src/main/java/se/su/dsv/scipro/latestevents/LatestEventsPanel.java
	view/src/main/java/se/su/dsv/scipro/latestevents/LatestEventsPanel.properties
	view/src/test/java/se/su/dsv/scipro/latestevents/LatestEventsPanelTest.java
2014-04-04 09:50:34 +02:00
Emil Siverhall
09872121f3 merge conflict 2014-04-04 09:50:09 +02:00
40b8ade56a Merge remote-tracking branch 'origin/develop' into develop 2014-04-04 09:49:38 +02:00
0abaeb4fa8 Useless check. 2014-04-04 09:49:33 +02:00
e18a3f9750 Fixed some Sonar issues. 2014-04-04 09:42:38 +02:00
Emil Siverhall
7396ee61d3 public contructor 2014-04-04 09:41:51 +02:00
c62f906ae4 Naming fix for package (part 2/2) 2014-04-04 09:39:31 +02:00
e91222b624 Naming fix for package (part 1/2) 2014-04-04 09:39:20 +02:00
Emil Siverhall
1c5c9d3b13 Merge remote-tracking branch 'origin/develop' into develop 2014-04-04 09:38:16 +02:00
060992b3f6 Made class final. 2014-04-04 09:37:19 +02:00
Emil Siverhall
b8fbf67246 removed old thesislink table 2014-04-04 09:37:03 +02:00
577e353d7d Merge remote-tracking branch 'origin/develop' into develop 2014-04-04 09:32:49 +02:00
6828005c37 The form to add an external link is now hidden by default. Can be toggled with a button. 2014-04-04 09:32:31 +02:00
6217329cde Moved external link back to the right column. 2014-04-04 09:29:07 +02:00
a46283daa0 Bootstrapified the add new form. 2014-04-04 09:26:09 +02:00
6358c9b231 Refactoring. 2014-04-04 09:16:50 +02:00
db8792ee41 Minor HTML fixes. 2014-04-04 09:15:36 +02:00
38c39caaea Removed commented out code. 2014-04-04 09:13:16 +02:00
Emil Siverhall
f5ae2e0ffc removed all thesis link entities 2014-04-04 09:12:17 +02:00
Emil Siverhall
51b2c8b209 delete of research plans 2014-04-04 09:06:50 +02:00
bdc0b597ae Removed old code from IdeaServiceImpl 2014-04-04 09:04:57 +02:00
3d641af075 Revert: Navigation toolbar can only be seen if there is more than one page in data table (9dfdeca2c0aea56fb1adeba891fd469cdf60b215) 2014-04-04 09:03:24 +02:00
Emil Siverhall
adf13ea1a1 fixed upload of more than one research plan without refreshing the page 2014-04-04 08:27:32 +02:00
Emil Siverhall
761718c27b proper properties for range validator 2014-04-03 15:17:08 +02:00
Emil Siverhall
e95f905498 working removeBasicContract 2014-04-03 15:13:38 +02:00
Emil Siverhall
d3d380fc1b removed study plan creator 2014-04-03 15:05:30 +02:00
Emil Siverhall
d6de5de274 add a new study panel on upload of basic contract instead of when creating project. 2014-04-03 15:04:13 +02:00
Emil Siverhall
65c17f4c5b removed phdservice since this should be part of study plan service 2014-04-03 14:25:45 +02:00