Emil Siverhall
|
c5c5632f24
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-27 14:32:01 +01:00 |
|
|
|
d4a8afa489
|
Removed milestone code related methods that were unused.
|
2014-02-27 14:31:52 +01:00 |
|
Emil Siverhall
|
391f9bc564
|
activity plan and some missing peer hookups
|
2014-02-27 14:30:07 +01:00 |
|
Richard
|
cfebeb7b19
|
Inputs and textareas on the different grading reports now shown correctly.
|
2014-02-27 14:28:59 +01:00 |
|
|
|
256839c2c9
|
Renamed impl to proper casing.
|
2014-02-27 14:25:55 +01:00 |
|
|
|
bd03217c4f
|
Hooked up milestone panels and pages to the module system.
|
2014-02-27 14:25:14 +01:00 |
|
Emil Siverhall
|
0b6c5c3184
|
test fix
|
2014-02-27 14:16:32 +01:00 |
|
|
|
e2b4072ea6
|
Removed left-over if check that made checklist in-accessible by students.
|
2014-02-27 14:15:16 +01:00 |
|
|
|
1dab46900c
|
Hooked up checklist module. Checklist templates can only be created for project types that currently have the checklist module activated.
|
2014-02-27 14:11:35 +01:00 |
|
Emil Siverhall
|
a23dc7643b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-27 13:52:02 +01:00 |
|
Emil Siverhall
|
37138f7ba2
|
modules for tests
|
2014-02-27 13:51:48 +01:00 |
|
|
|
3a98d0e72b
|
Find project types with specified module activated.
|
2014-02-27 13:51:03 +01:00 |
|
Emil Siverhall
|
83f9e5dac1
|
peer module hookups to new authorization strategy
|
2014-02-27 13:39:11 +01:00 |
|
|
|
3d5c3955bd
|
Such a neat little exporter and Wicket fails :(
|
2014-02-27 13:18:01 +01:00 |
|
|
|
3b1a35f0a1
|
Simplified DateColumn.
|
2014-02-27 13:11:13 +01:00 |
|
Emil Siverhall
|
a536cb6adf
|
removed abstract authorization strategy since it's only being used in the role based strategy for now
|
2014-02-27 12:55:58 +01:00 |
|
Emil Siverhall
|
23936f8afe
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-27 11:47:21 +01:00 |
|
Emil Siverhall
|
791995fd8d
|
admin interface for editing module settings
|
2014-02-27 11:47:08 +01:00 |
|
fred-fri
|
42e099ee58
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2014-02-27 19:22:20 +09:00 |
|
fred-fri
|
9f22d4c8cb
|
merging peer stuff
|
2014-02-27 19:21:43 +09:00 |
|
Emil Siverhall
|
e1b781b64d
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-27 10:38:59 +01:00 |
|
Emil Siverhall
|
9f5cb2a113
|
authorization strategy refactoring
|
2014-02-27 10:37:12 +01:00 |
|
fred-fri
|
1ff010c5f5
|
moving peer stuff
|
2014-02-27 18:33:20 +09:00 |
|
|
|
a64ebfd00b
|
Removed unnecessary call to MessageFormat#format
|
2014-02-27 10:31:20 +01:00 |
|
|
|
fbc28af5b4
|
Fixed generics warning.
|
2014-02-27 10:30:14 +01:00 |
|
|
|
69477d1c2d
|
Uh?
|
2014-02-27 10:20:13 +01:00 |
|
|
|
fda6726fe7
|
Fixed deprecated DateMidnight
|
2014-02-27 10:20:08 +01:00 |
|
|
|
084b144efb
|
Changed from Data to Getter/Setter to inherit equals/hashCode properly.
|
2014-02-27 10:11:16 +01:00 |
|
|
|
ded00d2da1
|
Changed from deprecated DateMidnight to DateTime#withTimeAtStartOfDay
|
2014-02-27 10:10:56 +01:00 |
|
|
|
d470105720
|
Changed order of plugins to prevent errors when compiling.
|
2014-02-27 10:10:23 +01:00 |
|
|
|
aeba8ee727
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-27 09:57:37 +01:00 |
|
|
|
f18fc7799d
|
Added warnings and deprecations to the compiler plugin so they are easier to fix.
|
2014-02-27 09:47:29 +01:00 |
|
fred-fri
|
e6dde8d917
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2014-02-27 17:47:02 +09:00 |
|
fred-fri
|
bcb39b6dcf
|
moved finalthesisreview stuff
|
2014-02-27 17:46:15 +09:00 |
|
Emil Siverhall
|
b5194be6da
|
wait with adding new authorization strategy
|
2014-02-27 09:43:02 +01:00 |
|
Emil Siverhall
|
849c868c22
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-27 09:33:53 +01:00 |
|
Emil Siverhall
|
b1da5e534a
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-27 09:23:58 +01:00 |
|
fred-fri
|
9345b5b3c0
|
moving target stuff
|
2014-02-27 17:23:35 +09:00 |
|
|
|
5572c7dc86
|
Moved spring-web dependency to view.
|
2014-02-27 09:22:15 +01:00 |
|
|
|
9128b8c329
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
core/src/main/java/se/su/dsv/scipro/comment/CommentThread.java
core/src/main/java/se/su/dsv/scipro/file/FileDescription.java
core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminar.java
core/src/main/java/se/su/dsv/scipro/project/Project.java
view/src/main/java/se/su/dsv/scipro/workerthreads/TurnItInCheckWorker.java
|
2014-02-27 09:16:29 +01:00 |
|
|
|
cdcd72470b
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
core/src/main/java/se/su/dsv/scipro/comment/CommentThread.java
core/src/main/java/se/su/dsv/scipro/file/FileDescription.java
core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminar.java
core/src/main/java/se/su/dsv/scipro/project/Project.java
view/src/main/java/se/su/dsv/scipro/workerthreads/TurnItInCheckWorker.java
|
2014-02-27 09:06:18 +01:00 |
|
Emil Siverhall
|
4471f7ca23
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-27 08:26:14 +01:00 |
|
fred-fri
|
730701ad4b
|
moved thesislink stuff
|
2014-02-27 15:58:03 +09:00 |
|
fred-fri
|
80e4b02eb9
|
moved turnitinstuff
|
2014-02-27 15:49:08 +09:00 |
|
fred-fri
|
8231109545
|
mergin peer stuff
|
2014-02-27 14:58:41 +09:00 |
|
fred-fri
|
f50dea4f62
|
merging application period stuff
|
2014-02-27 14:48:13 +09:00 |
|
fred-fri
|
d6b9aaa417
|
merging final seminar stuff
|
2014-02-27 14:42:22 +09:00 |
|
fred-fri
|
3af6da3e39
|
merging stuff
|
2014-02-27 14:24:08 +09:00 |
|
fred-fri
|
eb26592933
|
merging activity plan stuff
|
2014-02-27 14:20:17 +09:00 |
|
fred-fri
|
aa90b0add1
|
merging activity plan stuff
|
2014-02-27 14:17:29 +09:00 |
|
