5982 Commits

Author SHA1 Message Date
Emil Siverhall
084c3cc281 basic styling to page 2014-03-03 10:45:01 +01:00
Emil Siverhall
8f815bea98 date validator only allowed to work with <Date> formComponents 2014-03-03 10:24:53 +01:00
Emil Siverhall
4fe333711a page mount and header change 2014-03-03 10:04:25 +01:00
Emil Siverhall
a15142e358 Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	view/src/main/java/se/su/dsv/scipro/match/panel/MatchPeriodEditPanel.java
	view/src/test/java/se/su/dsv/scipro/SciProTest.java
2014-03-03 08:47:45 +01:00
Emil Siverhall
3db1993b2b formatting 2014-03-03 08:45:21 +01:00
Emil Siverhall
0a18c2cda9 deleted old match period edit panel and moved doesPeriodOverlap to application period service 2014-03-03 08:37:11 +01:00
Emil Siverhall
64dcc086ea overlapping application period not allowed 2014-03-03 08:28:49 +01:00
Emil Siverhall
e219c0002d feedback and redirect on submit 2014-03-02 15:42:08 +01:00
Emil Siverhall
907c1ed22d new page for creating/editing application periods 2014-03-02 15:35:45 +01:00
d5db5f580a StudyPlan uses a Comparator for the set instead of AnnualReview implementing Comparable. With the internal set ordered the sort method is not needed. 2014-03-02 00:48:38 +01:00
15861cf0ba Consolidated three different idea data tables to use the new GenericDataPanel2 and a FilteredDataProvider. 2014-03-01 14:51:13 +01:00
90680a2b2b Ensure the data table is added to a table tag. 2014-03-01 11:33:46 +01:00
3c3e3a9033 Renamed countAll to count 2014-03-01 09:22:40 +01:00
d916727653 Created a generic filtered data provider. 2014-03-01 08:54:03 +01:00
2e87b53fe6 Diamond operator. 2014-03-01 08:03:07 +01:00
a649666063 Removed commented out code. 2014-03-01 07:58:54 +01:00
7a8884df25 Fixed some issues. 2014-03-01 07:41:32 +01:00
26c89cd353 Fixed mapping of ApplicationPeriodProjectType. 2014-02-28 22:28:31 +01:00
bd55bd6bb2 Made the tests in the view module run in parallel with one thread/core. 2014-02-28 22:01:19 +01:00
f0da49a17f Fixed some sonar issues. 2014-02-28 17:19:48 +01:00
00c2acc297 Moved NotificationController to notifications package. 2014-02-28 17:11:05 +01:00
afe1376b8d Moved NotificationRepo, NotificationService, NotificationServiceImpl to notifications package. 2014-02-28 17:10:00 +01:00
3d37178a54 Merge remote-tracking branch 'origin/develop' into develop 2014-02-28 17:05:39 +01:00
b966520386 Rewrote a QueryDSL predicate so that ProjectFollowerRepo, ProjectFollowerService and ProjectFollowerServiceImpl could be removed. Save new project followers by changing the project (it is the aggregate root). 2014-02-28 17:05:33 +01:00
Golrokh Moattar
f02f298ae3 Merge remote-tracking branch 'origin/develop' into develop 2014-02-28 16:36:15 +01:00
d00c7a79be Consolidated file and files package. 2014-02-28 16:12:37 +01:00
Golrokh Moattar
19832e739d Merge remote-tracking branch 'origin/develop' into develop 2014-02-28 16:09:03 +01:00
Golrokh Moattar
75764ccc3c Activate milestone from overview 2014-02-28 16:08:57 +01:00
a86304e7ec Renamed turnitin package to plagiarism 2014-02-28 16:06:42 +01:00
e9a0045bfc Moved PlagiarismControl to turnitin package. 2014-02-28 15:59:55 +01:00
8d48226b64 Merge remote-tracking branch 'origin/develop' into develop 2014-02-28 15:53:10 +01:00
85494e4202 Updated test to better and improved code. 2014-02-28 15:53:06 +01:00
Golrokh Moattar
5f5793e8a0 Merge remote-tracking branch 'origin/develop' into develop 2014-02-28 15:48:36 +01:00
Richard
afa2cd7b9d Merge remote-tracking branch 'origin/develop' into develop 2014-02-28 15:43:14 +01:00
Richard
489aad9c59 Improved the design on the request peer review page.
Added 10px bottom margin on feedback panels.
2014-02-28 15:43:06 +01:00
41a58815ff Changing targets now saves the new target instead of cascading via employee. 2014-02-28 15:37:00 +01:00
ca2c380ff5 Massive improvement to Target.
Annotations are fun.
2014-02-28 15:20:17 +01:00
Golrokh Moattar
aff58b048d Commented on a method 2014-02-28 14:08:25 +01:00
6786fb756f Moved program from match to system. Like unit it is not part of the match process but as part of a student (or employee for unit). 2014-02-28 13:54:06 +01:00
2fb74a23f6 Merge remote-tracking branch 'origin/develop' into develop 2014-02-28 13:51:50 +01:00
11b55e1fcf Fixed NPE when idea status is pending. 2014-02-28 13:51:44 +01:00
Emil Siverhall
d202070550 Merge remote-tracking branch 'origin/develop' into develop 2014-02-28 13:37:43 +01:00
Richard
4c256a2aa1 Added information about PhD authors not being able to activate all milestones themselves. 2014-02-28 13:26:47 +01:00
Richard
dbab38a26b Added heading to the phdLinkPanel on SupervisorProjectDetailsPage. 2014-02-28 13:23:52 +01:00
Richard
62c99e3ade Added heading for the phd links panel.
Added link to the phd handbook.
Removed button on phd link.
Removed target="blank" on phd link.
2014-02-28 13:21:22 +01:00
Emil Siverhall
279973de1a failing test 2014-02-28 13:08:43 +01:00
Richard
f9ef585278 Removed <br> above Study plan on ProjectDetailsPage. 2014-02-28 13:02:18 +01:00
Emil Siverhall
3899eb0b03 unit unit unit 2014-02-28 12:51:11 +01:00
Emil Siverhall
72dac46408 Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	view/src/main/java/se/su/dsv/scipro/admin/panels/AbstractAdminIdeaPanel.java
2014-02-28 12:40:04 +01:00
Emil Siverhall
ca0bc22d06 create application period.. 2014-02-28 12:39:04 +01:00