Golrokh Moattar
|
026dc0e104
|
Could not fix problem with test methods after removing Select button in KeywordFilterPanel, some one better in test may look at it
|
2014-03-10 16:05:09 +01:00 |
|
leosu
|
cd94c8b831
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-10 15:41:14 +01:00 |
|
leosu
|
fc00b07959
|
added master templates
|
2014-03-10 15:37:37 +01:00 |
|
|
|
a7136516fa
|
Removes deleted authors.
|
2014-03-10 15:28:29 +01:00 |
|
|
|
797cafacb5
|
Refactoring.
|
2014-03-10 14:38:36 +01:00 |
|
Richard
|
8a3bf897d5
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-10 13:35:39 +01:00 |
|
Richard
|
b4395047a1
|
Improved styling of the SupervisorEditProjectPanel.
|
2014-03-10 13:35:25 +01:00 |
|
Golrokh Moattar
|
42cb5a5e55
|
KeywordFilterPanel is invisible when pages renders
|
2014-03-10 13:34:36 +01:00 |
|
Golrokh Moattar
|
50218f050c
|
KeywordFilterPanel is invisible when pages renders
|
2014-03-10 13:34:04 +01:00 |
|
Golrokh Moattar
|
2f99e348d5
|
KeywordFilterPanel is invisible when pages renders
|
2014-03-10 13:33:12 +01:00 |
|
Golrokh Moattar
|
81458ffd18
|
There is no Select button in KeywordFilterPanel and the whole panel set to visible/invisible from outside
|
2014-03-10 13:28:38 +01:00 |
|
leosu
|
bf0f36bc9a
|
credits added to grading report template
|
2014-03-10 13:21:30 +01:00 |
|
Richard
|
5d02e77100
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-10 13:13:49 +01:00 |
|
Richard
|
55b4c7c3f7
|
Styling of AdminEditActivityPanel.html
|
2014-03-10 13:13:34 +01:00 |
|
Golrokh Moattar
|
5ed5624ad2
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorEditIdeaPanel.java
|
2014-03-10 13:12:21 +01:00 |
|
Richard
|
e642016e68
|
Styling of EditActivityTemplatePanel.html
|
2014-03-10 12:59:18 +01:00 |
|
|
|
1b50c10e06
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-10 12:48:46 +01:00 |
|
|
|
9559647d17
|
Updates project data of already exported projects.
|
2014-03-10 12:47:02 +01:00 |
|
Emil Siverhall
|
3632b0d568
|
merge
|
2014-03-10 12:34:27 +01:00 |
|
|
|
81339a4a62
|
New projects are exported to Daisy.
|
2014-03-10 12:31:23 +01:00 |
|
|
|
54293a5e03
|
Made doWork() abstract. What is the point of a worker that does nothing?
|
2014-03-10 12:11:09 +01:00 |
|
|
|
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 |
|
