6238 Commits

Author SHA1 Message Date
Emil Siverhall
4603716fc1 testing request details panel 2013-11-20 15:56:58 +01:00
1836ca4f7a Fixed file upload when performing peer reviews. 2013-11-20 14:52:57 +01:00
64d38c37ac Cleaned up old code. 2013-11-20 14:28:03 +01:00
e853f0705c Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	view/src/test/java/se/su/dsv/scipro/project/panels/FinalThesisPanelTest.java
2013-11-20 14:23:29 +01:00
Emil Siverhall
08a3961271 deleted unused CheckListModel 2013-11-20 13:39:20 +01:00
Emil Siverhall
a9406c9a76 testing admin idea overview panel 2013-11-20 13:34:37 +01:00
Emil Siverhall
56f01f1d4d Merge remote-tracking branch 'origin/develop' into develop 2013-11-20 10:48:01 +01:00
Emil Siverhall
4ac15fc43d seminar notifications to opponents and active participants now redirects to a seminar details page that actually renders 2013-11-20 10:45:45 +01:00
fred-fri
86ae601318 removing ignored tests 2013-11-20 18:19:07 +09:00
fred-fri
bee23deaa4 removed feature to select already uploaded files as this just causes problems 2013-11-20 14:33:05 +09:00
Emil Siverhall
cc451f43da Merge remote-tracking branch 'origin/develop' into develop 2013-11-19 11:12:22 +01:00
Emil Siverhall
2c9bfceff2 fixed bug where students couldn't see seminar info on other final seminars than their own and where supervisors where redirected to a final seminar of another project, when going through all final seminars view. 2013-11-19 11:12:06 +01:00
fred-fri
dc9a71a82f removed call to getfilestream 2013-11-19 18:15:27 +09:00
fred-fri
9797734b58 all calls to filerepo storefile now go through filedescription storefile 2013-11-19 18:02:11 +09:00
fred-fri
f4dae09643 removed retrievebyidentifier method 2013-11-19 17:44:52 +09:00
fred-fri
15cacd8a90 the reason retrievebypath failed was because rootnode already is / so if the path contains another / no file is found 2013-11-19 17:37:25 +09:00
fred-fri
7164edd008 Merge branch 'develop' 2013-11-19 17:02:54 +09:00
fred-fri
dd690983e3 for some reason the retrievebypath method doesnt work, replaced with retrievebyidentifier 2013-11-19 16:44:51 +09:00
Richard
26d5385326 Turned links to "Select student ideas", "Create Idea" and "Select from available ideas" into buttons for better visibility. 2013-11-18 16:00:43 +01:00
c2ef6f1308 Removed ignored tests. 2013-11-18 11:41:25 +01:00
fred-fri
6587e2e4c0 Merge branch 'release20131118' 2013-11-18 17:57:36 +09:00
fred-fri
c53a5d0d39 fixed tests 2013-11-18 17:36:33 +09:00
fred-fri
444cbc69e5 removed unused panel 2013-11-18 16:13:11 +09:00
fred-fri
841c58e6a7 fixed keyword bugs 2013-11-18 14:50:31 +09:00
fred-fri
e847b14cae theres a form in between 2013-11-18 12:20:11 +09:00
d666d68958 Removed useless interface and abstract implementation. 2013-11-16 12:41:59 +01:00
39f8643623 Fixed critical issues. 2013-11-15 23:36:34 +01:00
1f56efe886 Refactored ActivityPlanPanel. 2013-11-15 23:21:27 +01:00
Richard
ceaa1c705d Merge remote-tracking branch 'origin/develop' into develop 2013-11-15 17:30:50 +01:00
niklas3
0d7cc067fd test fix 2013-11-15 17:28:36 +01:00
niklas3
09590a9c35 Final seminars now have their own page. CRUD works. 2013-11-15 17:22:36 +01:00
Richard
df6b664fc2 Styling of RejectFinalThesisPanel. Moved the cancel link to the form. 2013-11-15 17:22:22 +01:00
Richard
dde2bcbda9 Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	view/src/main/java/se/su/dsv/scipro/forum/panels/RejectFinalThesisPanel.html
2013-11-15 17:06:46 +01:00
Richard
f14efbb97a Styling of RejectFinalThesisPanel. 2013-11-15 17:03:41 +01:00
niklas3
6ac3d0cc33 Merge remote-tracking branch 'origin/develop' into develop 2013-11-15 17:02:54 +01:00
niklas3
c378159577 Button in rejectfinalthesispanel now has its own property and the same button in createforumthreadpanel has its own seperate property. 2013-11-15 17:02:48 +01:00
Richard
de99842d27 Merge remote-tracking branch 'origin/develop' into develop 2013-11-15 16:29:23 +01:00
Emil Siverhall
dccef1f4c9 changed date formatting 2013-11-15 16:18:30 +01:00
niklas3
a488a29edb RejectFinalThesisPanel now has its own markup(again). 2013-11-15 16:05:18 +01:00
niklas3
5bc9025138 RejectFinalThesisPanel got its own markup!!
(+ project)
2013-11-15 15:53:43 +01:00
niklas3
ee6d384070 Revert "added teardown and cleared database after test."
This reverts commit 6cc65c9518365976e1fdf25b2bc57e4947af38ca.
2013-11-15 14:53:36 +01:00
niklas3
6cc65c9518 added teardown and cleared database after test. 2013-11-15 14:45:02 +01:00
niklas3
f8a64bc310 Merge remote-tracking branch 'origin/develop' into develop 2013-11-15 14:43:13 +01:00
Richard
bbd857eb29 Merge remote-tracking branch 'origin/develop' into develop 2013-11-15 14:42:00 +01:00
Richard
34ffb33414 Continued styling of final thesis panels. 2013-11-15 14:39:22 +01:00
Emil Siverhall
4f667a8154 Merge remote-tracking branch 'origin/develop' into develop 2013-11-15 14:25:12 +01:00
niklas3
6253d0bfe6 Merge remote-tracking branch 'origin/develop' into develop 2013-11-15 14:24:51 +01:00
Emil Siverhall
1986f93e59 added info panel to final thesis when status is NO_DECISION 2013-11-15 14:24:47 +01:00
niklas3
2f7a5b5383 because crunch 2013-11-15 14:24:43 +01:00
Richard
473741648f Merge remote-tracking branch 'origin/develop' into develop 2013-11-15 14:20:14 +01:00