|
|
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 |
|
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
|
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 |
|
|
|
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 |
|
fred-fri
|
6085014298
|
merging checklist stuff
|
2014-02-27 13:27:59 +09:00 |
|
fred-fri
|
c833f5d009
|
moved phd stuff
|
2014-02-27 13:07:01 +09:00 |
|
fred-fri
|
b0cc7a7373
|
moved milestone stuff
|
2014-02-27 12:57:00 +09:00 |
|
fred-fri
|
2661e8fcd1
|
moved forum stuff
|
2014-02-27 12:49:39 +09:00 |
|
fred-fri
|
541230b322
|
moved firstmeeting stuff
|
2014-02-27 12:48:32 +09:00 |
|
fred-fri
|
665cbdf1a8
|
moving finalthesis stuff
|
2014-02-27 12:40:42 +09:00 |
|
fred-fri
|
1522309772
|
moving final seminar stuff
|
2014-02-27 12:24:27 +09:00 |
|
fred-fri
|
29c5e5d711
|
moving file stuff
|
2014-02-27 11:09:32 +09:00 |
|
fred-fri
|
f63a9b3a0c
|
moving stuff
|
2014-02-27 10:45:57 +09:00 |
|
fred-fri
|
bc9ca094f6
|
moving checklist stuff
|
2014-02-27 10:39:53 +09:00 |
|
fred-fri
|
569fde3f28
|
moving checklist answer stuff
|
2014-02-27 10:31:17 +09:00 |
|
fred-fri
|
8f02475764
|
moving application period stuff
|
2014-02-27 10:27:31 +09:00 |
|
Emil Siverhall
|
2dfb1ebf73
|
hi
|
2014-02-26 22:28:58 +01:00 |
|
Emil Siverhall
|
11dfbde215
|
session handles modules instead of project type
|
2014-02-26 21:31:55 +01:00 |
|
Emil Siverhall
|
59085a1645
|
no need for more than one module in annotation
|
2014-02-26 21:08:17 +01:00 |
|
Emil Siverhall
|
79a2648bc1
|
module based authorization strategy
|
2014-02-26 20:29:04 +01:00 |
|
|
|
a027a8a51c
|
Removed MySQL connector dependency, it should be provided by the container.
|
2014-02-26 17:20:41 +01:00 |
|
|
|
d9273b55cc
|
Added dependency on javax.inject and excluded transitive dependency on hk2s own implementation.
Shuffled hibernate dependencies to runtime and depend on the JSR API instead.
|
2014-02-26 17:18:52 +01:00 |
|
|
|
91caa31e32
|
Shuffled some annotations around to reduce dependencies
|
2014-02-26 17:16:16 +01:00 |
|
|
|
69eaf7c5e7
|
Removed some hibernate dependencies.
|
2014-02-26 16:50:55 +01:00 |
|
|
|
3f160abdcc
|
Updated all dependency versions.
Still stuck with Spring 3.2.8 due to Spring-data-jpa.
Hibernate introduced a bug in 4.3.* so until that is resolved we use 4.2.8.
|
2014-02-26 16:47:14 +01:00 |
|
|
|
e3299add39
|
Removed stupid initial title and description that prevented placeholder values.
|
2014-02-26 15:48:17 +01:00 |
|
|
|
3bbfe91a97
|
Removed duplicate filter parameter.
Date filtering is now always from 00:00 to 23:59 on the specified dates.
|
2014-02-26 15:42:27 +01:00 |
|
leosu
|
0bb04670fd
|
added space in mail format
|
2014-02-26 12:16:36 +01:00 |
|
fred-fri
|
072c9aa72b
|
moving applicationperiodprojecttype stuff
|
2014-02-26 18:32:18 +09:00 |
|
fred-fri
|
1bfa14c83d
|
moving project stuff
|
2014-02-26 18:15:17 +09:00 |
|
fred-fri
|
d7a9422ce2
|
moving phd stuff
|
2014-02-26 18:12:43 +09:00 |
|
fred-fri
|
5b7834d639
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2014-02-26 18:04:59 +09:00 |
|
fred-fri
|
f8c61154be
|
moving project stuff
|
2014-02-26 18:03:56 +09:00 |
|
|
|
11b795aa16
|
Fixed suppression
|
2014-02-26 09:13:17 +01:00 |
|
fred-fri
|
e82957b3f7
|
bug fixes
|
2014-02-26 12:23:18 +09:00 |
|
Golrokh Moattar
|
098680eb25
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-25 14:14:19 +01:00 |
|
Golrokh Moattar
|
c898bc390e
|
Problems with AdminProjectTypePanel were fixed
|
2014-02-25 14:09:21 +01:00 |
|
