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 |
|
|
|
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 |
|
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
|
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
|
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 |
|
fred-fri
|
17b525555e
|
adding phd to supervisor project details page
|
2014-02-27 10:23:01 +09:00 |
|
Emil Siverhall
|
b504cc29cd
|
some refactoring
|
2014-02-26 22:11:14 +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
|
e6cef89338
|
abstract superclass for both our custom authorization strategies
|
2014-02-26 20:37:11 +01:00 |
|
Emil Siverhall
|
79a2648bc1
|
module based authorization strategy
|
2014-02-26 20:29:04 +01:00 |
|
Golrokh Moattar
|
82c2d1f517
|
Create first meeting ska inte visas på inaktiverade idéer
|
2014-02-26 17:45:44 +01:00 |
|
|
|
91caa31e32
|
Shuffled some annotations around to reduce dependencies
|
2014-02-26 17:16:16 +01:00 |
|
Golrokh Moattar
|
0476a1ec46
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
view/src/main/java/se/su/dsv/scipro/project/pages/ProjectDetailsPage.html
|
2014-02-26 15:56:24 +01:00 |
|
Golrokh Moattar
|
3b3908d949
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
view/src/main/java/se/su/dsv/scipro/project/pages/ProjectDetailsPage.html
|
2014-02-26 15:43:21 +01:00 |
|
Richard
|
4eaebd55cd
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-26 15:18:22 +01:00 |
|
Golrokh Moattar
|
e0dbbd0922
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-26 15:16:02 +01:00 |
|
Richard
|
23f6da0553
|
Removed link to SciPro Resources since it's now located in the footer.
|
2014-02-26 15:12:18 +01:00 |
|
Richard
|
725551a9ef
|
Added milestone information on the MileStoneOverviewPanel
|
2014-02-26 15:11:12 +01:00 |
|
Richard
|
aaa73226e6
|
Styling of the Study plan upload.
|
2014-02-26 15:07:36 +01:00 |
|
leosu
|
d6252dc01b
|
cleanup
|
2014-02-26 14:14:10 +01:00 |
|
