6313 Commits

Author SHA1 Message Date
e18a3f9750 Fixed some Sonar issues. 2014-04-04 09:42:38 +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
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
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
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
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
Emil Siverhall
79196bc8a7 test fix 2014-04-03 14:08:24 +02:00
Emil Siverhall
cba7aec7fd added research plan panel to supervisor view as well.. 2014-04-03 13:56:15 +02:00
Emil Siverhall
6fbc67c69c Merge remote-tracking branch 'origin/develop' into develop 2014-04-03 13:41:06 +02:00
Emil Siverhall
151bd1c387 view attachment panels dateVisible changed to use a Setter 2014-04-03 13:40:40 +02:00
Emil Siverhall
963c911c74 research plan module + feedback 2014-04-03 13:22:12 +02:00
85b9211dbd Switched Timer to a ScheduledExecutorService. 2014-04-03 13:04:38 +02:00
Emil Siverhall
e7ca75c3c5 show history 2014-04-03 13:02:30 +02:00
fred-fri
be14398160 externalfile 2014-04-03 19:38:14 +09:00
fred-fri
a0f971386e Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	view/src/main/java/se/su/dsv/scipro/project/pages/ProjectDetailsPage.java
2014-04-03 19:35:08 +09:00
fred-fri
cd63c9f656 externalfile 2014-04-03 19:32:43 +09:00
Emil Siverhall
1cc8adb8b2 display current research plan, if existing 2014-04-03 11:14:49 +02:00
3f3a960fbb Bleh 2014-04-03 10:55:34 +02:00
eb35196f44 Removed isIdeaExportable(Idea) method and merged the conditions into the database fetch. 2014-04-03 10:01:37 +02:00
dc65c600d6 Merge remote-tracking branch 'origin/develop' into develop 2014-04-03 09:28:16 +02:00
e27dc6238a Cleaning in the test. 2014-04-03 09:27:33 +02:00
0aa4f2f1f7 Removed explicit setting of default values. 2014-04-03 09:25:37 +02:00
fe3119eec4 Removed unused dependencies. 2014-04-03 09:25:06 +02:00
e35c987edf Starting a project from an idea now adds a completed match to the idea. 2014-04-03 09:23:59 +02:00
Emil Siverhall
e87aa92d83 Merge remote-tracking branch 'origin/develop' into develop 2014-04-03 08:25:28 +02:00
Emil Siverhall
966a9a9569 Project -> Title on final theses listing 2014-04-03 08:25:07 +02:00
Emil Siverhall
a736228cc9 module and beta annotation 2014-04-03 08:14:51 +02:00
Emil Siverhall
31a81ef2ce basic upload for research plan implemented in panel 2014-04-02 15:38:49 +02:00
Golrokh Moattar
cc11a6486f change in stylesheet for data table navigation bar 2014-04-02 14:55:37 +02:00
Golrokh Moattar
9dfdeca2c0 Navigation toolbar can only be seen if there is more than one page in data table 2014-04-02 14:12:38 +02:00
Golrokh Moattar
24fa0d0212 Added norwegian grade link to phd links 2014-04-02 14:11:42 +02:00
Emil Siverhall
fc4fcafed9 removed check to see if study plan exists in onConfigure for the PhDLinkPanel. visibility based on module only. 2014-04-02 13:25:30 +02:00
Emil Siverhall
945cea40b4 only display approved final theses 2014-04-02 12:15:07 +02:00
Emil Siverhall
87d7f404df Merge remote-tracking branch 'origin/develop' into develop 2014-04-02 10:41:56 +02:00
Emil Siverhall
00cc8a8b0d all final theses displayed 2014-04-02 10:36:26 +02:00
Golrokh Moattar
7a4cc9e528 Changed important links to phd links 2014-04-02 10:20:52 +02:00
Emil Siverhall
cc037e0da8 base page for final theses listing added 2014-04-02 09:36:38 +02:00
Emil Siverhall
b5ab6fab26 make sure master may select ideas.. 2014-04-02 09:27:04 +02:00
Emil Siverhall
a07d59c0fc make sure checkbox in accept idea dialog panel actually do something.. 2014-04-02 09:13:19 +02:00