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
|
692211bac0
|
Merge branch 'per' into develop
|
2013-11-18 13:29:42 +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 |
|
Per Lundholm
|
25b16b1404
|
Removed dependency to FileRepository and replaced with FileDescriptionService.
|
2013-11-15 17:40:46 +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 |
|
Per Lundholm
|
9fb332c1f9
|
Code cleaning.
|
2013-11-15 16:39:44 +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 |
|
Richard
|
3b0eff1c07
|
Continued styling of final thesis panels.
|
2013-11-15 14:20:07 +01:00 |
|
Emil Siverhall
|
f551c2fcc4
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-15 14:09:33 +01:00 |
|
Emil Siverhall
|
dd6dbe11cf
|
removed grade from .txt creation since this isn't implemented to grading report yet
|
2013-11-15 14:08:41 +01:00 |
|
|
|
48f27012a1
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-15 13:40:47 +01:00 |
|
|
|
31bddcde33
|
Fixed project title cleaning to not remove åäö before persisting.
|
2013-11-15 13:40:42 +01:00 |
|
niklas3
|
774fad061e
|
Added link to threaded forum in the author view when a revision request has been sent.
|
2013-11-15 13:39:08 +01:00 |
|
Emil Siverhall
|
db6abfee3d
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-15 13:37:22 +01:00 |
|
Emil Siverhall
|
ec6474f83f
|
Supervisors are not allowed to specify a first meeting date that occurs before application period course start
|
2013-11-15 13:35:49 +01:00 |
|
Richard
|
969812b6d0
|
Flyttat final thesis panel längst upp till vänster på project overview.
Tillfälligt tagit bort info-texten då den visades på felaktiga final thesis-paneler.
|
2013-11-15 13:28:18 +01:00 |
|
fred-fri
|
8c3fe39747
|
Merge branch 'develop' into perper
|
2013-11-15 19:59:52 +09:00 |
|
fred-fri
|
3318f7f63c
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-11-15 19:59:34 +09:00 |
|
fred-fri
|
c2a5b3e8eb
|
get
|
2013-11-15 19:58:52 +09:00 |
|
fred-fri
|
123cde29a2
|
last changes
|
2013-11-15 19:56:32 +09:00 |
|
fred-fri
|
3123697fc7
|
get
|
2013-11-15 17:36:03 +09:00 |
|
Emil Siverhall
|
cbda30a080
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-15 09:28:51 +01:00 |
|
Emil Siverhall
|
256b672109
|
renamed SubmitNewFirstMeetingPanel
|
2013-11-15 09:28:36 +01:00 |
|
Richard
|
a91aa6b6d4
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-15 09:25:23 +01:00 |
|
fred-fri
|
4d6afffae9
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-11-15 17:24:44 +09:00 |
|
