|
|
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 |
|
fred-fri
|
86ae601318
|
removing ignored tests
|
2013-11-20 18:19:07 +09:00 |
|
fred-fri
|
615dea0426
|
inlined some stuff
|
2013-11-20 16:51:34 +09:00 |
|
fred-fri
|
36e1ceaf66
|
removed slash that isnt needed anymore
|
2013-11-20 16:40:17 +09:00 |
|
fred-fri
|
80365851ce
|
adding trailing slash to path
|
2013-11-20 16:30:46 +09:00 |
|
fred-fri
|
54e39d5a3c
|
made method try to return first element in a collection
|
2013-11-20 15:24:00 +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 |
|
fred-fri
|
95c857ce69
|
path fixed, and save fixed, but selecting an already uploaded file as a file to an activity still stores another copy of the filedesc with same identifier
|
2013-11-20 13:17:22 +09:00 |
|
fred-fri
|
57f481b5d6
|
clean
|
2013-11-19 17:51:29 +09:00 |
|
fred-fri
|
cceb833e28
|
comment
|
2013-11-19 17:46:06 +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
|
02d65907cc
|
clean
|
2013-11-19 17:28:07 +09:00 |
|
fred-fri
|
0ebd731261
|
duplication
|
2013-11-19 17:23:51 +09:00 |
|
fred-fri
|
22545b9abd
|
fixed test
|
2013-11-19 16:53:27 +09:00 |
|
fred-fri
|
dd690983e3
|
for some reason the retrievebypath method doesnt work, replaced with retrievebyidentifier
|
2013-11-19 16:44:51 +09:00 |
|
fred-fri
|
9c04f59c2b
|
adding / to path in storefile method, this crashes some view links
|
2013-11-19 16:12:26 +09:00 |
|
|
|
c2ef6f1308
|
Removed ignored tests.
|
2013-11-18 11:41:25 +01:00 |
|
|
|
47ee75d77c
|
Added safety-net to FileDescriptions that are only in jackrabbit.
|
2013-11-18 11:18:12 +01:00 |
|
|
|
03d56428e5
|
Fixed compareTo in user to return 0 when objects are equal.
|
2013-11-18 10:59:35 +01:00 |
|
|
|
4f6f3e4c36
|
Updated daisy import to the new level format.
|
2013-11-18 10:31:46 +01:00 |
|
fred-fri
|
692211bac0
|
Merge branch 'per' into develop
|
2013-11-18 13:29:42 +09:00 |
|
|
|
d666d68958
|
Removed useless interface and abstract implementation.
|
2013-11-16 12:41:59 +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 |
|
Per Lundholm
|
9fb332c1f9
|
Code cleaning.
|
2013-11-15 16:39:44 +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 |
|
|
|
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 |
|
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 |
|
fred-fri
|
de7f90721f
|
fixed tests
|
2013-11-15 17:24:13 +09:00 |
|
fred-fri
|
b3916a0079
|
moved thesis review stuff
|
2013-11-15 17:19:13 +09:00 |
|
fred-fri
|
63bb51d417
|
moved finalthesis stuff
|
2013-11-15 17:14:37 +09:00 |
|
fred-fri
|
190f9db676
|
moved forum stuff
|
2013-11-15 17:13:21 +09:00 |
|
fred-fri
|
96099a6a54
|
refactoring, removed retrievebyidentifier method
|
2013-11-15 15:39:46 +09:00 |
|
fred-fri
|
a5143e16bf
|
refactoring, removed retrievebyidentifier method
|
2013-11-15 15:39:18 +09:00 |
|
fred-fri
|
060ca7edd4
|
refactored a method
|
2013-11-15 15:03:33 +09:00 |
|
fred-fri
|
f5eef30cf3
|
moving some common methods
|
2013-11-15 13:50:51 +09:00 |
|
fred-fri
|
c5859cb86c
|
refactored storethesisreview method
|
2013-11-15 13:09:59 +09:00 |
|
fred-fri
|
e8e0fee816
|
refactored storefinalthesis method
|
2013-11-15 12:27:03 +09:00 |
|
fred-fri
|
08827a0a41
|
Merge branch 'per' into develop
|
2013-11-15 11:05:01 +09:00 |
|
Per Lundholm
|
95422c5f12
|
Method storeForumFile made private part of ForumService
|
2013-11-14 17:10:14 +01:00 |
|
niklas3
|
414f32626e
|
Project builder igen...
|
2013-11-14 16:34:23 +01:00 |
|
niklas3
|
fc761ed351
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-14 16:03:16 +01:00 |
|
niklas3
|
737de64995
|
fix'd
|
2013-11-14 16:02:57 +01:00 |
|
Emil Siverhall
|
d123c82b07
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-11-14 15:49:29 +01:00 |
|
Emil Siverhall
|
86604e5777
|
make sure download of grading report txt works even without reviewer on the project
|
2013-11-14 15:49:21 +01:00 |
|
