|
|
269ed76dfe
|
Changed injection logic so that it is no longer required to override the transaction methods. This also enables mock injection and verification of transactional behaviour.
|
2014-03-10 12:08:22 +01:00 |
|
Emil Siverhall
|
a9842347c6
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
core/src/main/java/se/su/dsv/scipro/project/ProjectService.java
|
2014-03-10 12:02:35 +01:00 |
|
leosu
|
07a523ab6f
|
supervisor change project status
|
2014-03-10 11:52:46 +01:00 |
|
leosu
|
b167ecae67
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-10 11:24:47 +01:00 |
|
leosu
|
39d07c47a8
|
changed student to user
|
2014-03-10 11:24:39 +01:00 |
|
fred-fri
|
a8ade4c8a9
|
removing stupid attributes
|
2014-03-10 14:17:04 +09:00 |
|
fred-fri
|
c59245e95a
|
sysadmin boolean
|
2014-03-10 13:54:49 +09:00 |
|
fred-fri
|
75af45ffe8
|
refactoring
|
2014-03-10 13:47:29 +09:00 |
|
fred-fri
|
b0d2a0797b
|
refactoring
|
2014-03-10 13:40:26 +09:00 |
|
fred-fri
|
7b5e4a4eab
|
tests
|
2014-03-10 11:44:52 +09:00 |
|
fred-fri
|
af8a1d9ae6
|
rename
|
2014-03-10 11:27:11 +09:00 |
|
Golrokh Moattar
|
b819a2654e
|
Supervisor can see keywords only if s/he select a research area which has keywords
|
2014-03-07 17:10:59 +01:00 |
|
Golrokh Moattar
|
dc905ec4f8
|
Supervisor can see keywords only if s/he select a research area which has keywords
|
2014-03-07 17:03:11 +01:00 |
|
Golrokh Moattar
|
3eccc18dbe
|
In "create student idea", Student can view keywordfilter only if s/he select a researchArea which has keywords
|
2014-03-07 16:47:58 +01:00 |
|
Golrokh Moattar
|
6e416395fb
|
Student can view keywordfilter only if s/he select a researchArea which has keywords
|
2014-03-07 16:22:01 +01:00 |
|
Golrokh Moattar
|
6beac96add
|
KeywordPanel can be visible only if supervisor select a research area
|
2014-03-07 16:12:52 +01:00 |
|
Emil Siverhall
|
da9f6a4bba
|
page that lists all authors with more than one project within specified filter limits.
|
2014-03-07 16:09:57 +01:00 |
|
leosu
|
dc099f9ded
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-07 15:50:15 +01:00 |
|
leosu
|
60338cf1b3
|
fixed redirect logic
|
2014-03-07 15:50:10 +01:00 |
|
fred-fri
|
f702d17119
|
merge resolve conflicts
|
2014-03-07 23:36:21 +09:00 |
|
Golrokh Moattar
|
f79dfab563
|
if selected research area has any keyword, the keyword panel is visible
|
2014-03-07 15:34:36 +01:00 |
|
Golrokh Moattar
|
9ce3429bda
|
Select button removed from KeywordFilterPanel
|
2014-03-07 15:33:56 +01:00 |
|
fred-fri
|
c4df433cfe
|
adding new admin edit activity plan template page
|
2014-03-07 23:24:23 +09:00 |
|
leosu
|
378ad0eb54
|
inactive projects info fix after POR
|
2014-03-07 14:25:31 +01:00 |
|
leosu
|
57ad91c498
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
view/src/main/java/se/su/dsv/scipro/project/panels/ProjectsOverviewPanel.java
|
2014-03-07 13:12:44 +01:00 |
|
leosu
|
ec15109113
|
inactive projects info fix after POR
|
2014-03-07 13:10:27 +01:00 |
|
Emil Siverhall
|
3ebbe84226
|
nullvalid properties when editing targets
|
2014-03-07 13:01:21 +01:00 |
|
Emil Siverhall
|
3b5c9fff65
|
getLocalizer warning
|
2014-03-07 11:48:35 +01:00 |
|
Emil Siverhall
|
3267701ab9
|
lazy init onAuthor - My ideas
|
2014-03-07 11:38:42 +01:00 |
|
Emil Siverhall
|
2281fd44d5
|
lazy init on Supervisor -> All Projects - Final seminars
|
2014-03-07 10:51:45 +01:00 |
|
Emil Siverhall
|
bf73863e8d
|
test fix
|
2014-03-07 10:28:30 +01:00 |
|
Emil Siverhall
|
4038ade960
|
fixed lazy init on supervisor -> all student ideas
|
2014-03-07 10:15:20 +01:00 |
|
Emil Siverhall
|
f2cf5f7124
|
fixed lazy init on supervisor -> all supervisor ideas
|
2014-03-07 09:41:31 +01:00 |
|
Emil Siverhall
|
7dc2b4878e
|
fixed lazy init on supervisor idea submission
|
2014-03-07 09:33:59 +01:00 |
|
Emil Siverhall
|
5ec15f9b64
|
fixed lazy init in threaded forum
|
2014-03-07 08:39:05 +01:00 |
|
|
|
b05b8ade45
|
Removed unused private field.
|
2014-03-06 19:47:00 +01:00 |
|
Emil Siverhall
|
3f835926ae
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-06 19:34:02 +01:00 |
|
|
|
55435148ac
|
Sonar issues.
|
2014-03-06 19:33:55 +01:00 |
|
Emil Siverhall
|
d2cd00149a
|
fixed some role/user issues on application periods -> edit targets
|
2014-03-06 19:28:53 +01:00 |
|
|
|
b17ce4fad1
|
Compilation errors.
|
2014-03-06 19:27:50 +01:00 |
|
|
|
1712c60723
|
Sonar issues.
|
2014-03-06 19:24:12 +01:00 |
|
|
|
3681a36976
|
Simplified.
|
2014-03-06 19:23:09 +01:00 |
|
|
|
59b7dfd699
|
Simplified.
|
2014-03-06 19:21:06 +01:00 |
|
|
|
72c949b668
|
Use isEmpty()
|
2014-03-06 19:18:06 +01:00 |
|
|
|
797772fdb8
|
Removed unused private field.
|
2014-03-06 19:16:58 +01:00 |
|
|
|
66f491a024
|
Removed defunct UserProfilePanelFactory.
|
2014-03-06 19:16:32 +01:00 |
|
|
|
69df664be7
|
Final clean up.
|
2014-03-06 17:58:58 +01:00 |
|
|
|
900cc525cf
|
Fixed tests
|
2014-03-06 17:46:03 +01:00 |
|
|
|
bac334a225
|
Merge remote-tracking branch 'origin/develop' into improvement/roles
Conflicts:
core/src/main/java/se/su/dsv/scipro/project/ProjectFollower.java
|
2014-03-06 17:34:09 +01:00 |
|
|
|
faae5862c7
|
Fixed more lazy init
|
2014-03-06 17:33:30 +01:00 |
|
