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 |
|
|
|
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 |
|
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 |
|
Emil Siverhall
|
70862f99b5
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-26 12:09:19 +01:00 |
|
Emil Siverhall
|
4221ca98da
|
panel-> generic panel + null check on idea export panel
|
2014-02-26 12:08:56 +01:00 |
|
Golrokh Moattar
|
962561fb8d
|
all titles in idea panel are clickable
|
2014-02-26 11:58:42 +01:00 |
|
leosu
|
1a58b89c21
|
better feedback and link to login page
|
2014-02-26 11:36:03 +01:00 |
|
leosu
|
9e47d4cc25
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-26 11:04:32 +01:00 |
|
leosu
|
d81c10c8ee
|
fixed failing test
|
2014-02-26 11:04:25 +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
|
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 |
|
leosu
|
ec49af8add
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-26 09:36:35 +01:00 |
|
leosu
|
171489f7d3
|
first time registration triggered with empty database
|
2014-02-26 09:36:22 +01:00 |
|
Golrokh Moattar
|
2a24b6b86d
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-26 09:34:12 +01:00 |
|
fred-fri
|
ea33b02f0c
|
bug fixes
|
2014-02-26 12:59:11 +09:00 |
|
