Leo
|
ce810eb605
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-16 09:46:27 +01:00 |
|
Leo
|
07cb5fc1f1
|
styling fixes
|
2013-12-16 09:45:36 +01:00 |
|
Leo
|
24ef89fb99
|
hides final seminar panel from supervisor overview page when ICT4D
|
2013-12-16 09:24:38 +01:00 |
|
fred-fri
|
b8be54e37f
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-12-16 17:18:56 +09:00 |
|
fred-fri
|
f743612106
|
adding users in datainitializer
|
2013-12-16 17:18:10 +09:00 |
|
Leo
|
e6a7682ef9
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-16 09:11:03 +01:00 |
|
fred-fri
|
acfca7f05a
|
adding users in datainitializer
|
2013-12-16 16:46:56 +09:00 |
|
Emil Siverhall
|
1a8793e01f
|
better feedback message when trying to save upload without selecting file
|
2013-12-16 08:46:05 +01:00 |
|
Emil Siverhall
|
a789088f34
|
make sure the feedback component on the ProjectStatePanel only accept feedback messages from the panels form
|
2013-12-16 08:45:05 +01:00 |
|
fred-fri
|
2b9799c748
|
adding users in datainitializer
|
2013-12-16 16:39:35 +09:00 |
|
fred-fri
|
082e623cf3
|
adding users in datainitializer
|
2013-12-16 16:27:20 +09:00 |
|
fred-fri
|
068a7621d3
|
adding users in datainitializer
|
2013-12-16 16:18:27 +09:00 |
|
Emil Siverhall
|
ca8ce04d3d
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-16 08:18:25 +01:00 |
|
Emil Siverhall
|
bf9edfc5f0
|
some refactoring after removal of filterstring panel
|
2013-12-16 08:18:03 +01:00 |
|
fred-fri
|
fd40e50a78
|
adding users in datainitializer
|
2013-12-16 15:35:38 +09:00 |
|
fred-fri
|
78200be924
|
adding users in datainitializer
|
2013-12-16 14:48:12 +09:00 |
|
fred-fri
|
ff7ccbcf39
|
making userbuilder
|
2013-12-16 14:20:00 +09:00 |
|
fred-fri
|
425ebc7089
|
datainitializer only does stuff if dev profile is on
|
2013-12-16 13:25:26 +09:00 |
|
fred-fri
|
3708358664
|
added peer codes to datainitialiser
|
2013-12-16 12:56:13 +09:00 |
|
niklas3
|
aa1e1a1a9f
|
Partially removed dependency on ProjectBuilder.
|
2013-12-13 17:19:51 +01:00 |
|
Emil Siverhall
|
f08c11736a
|
removed FilterStringPanel
|
2013-12-13 15:19:26 +01:00 |
|
Emil Siverhall
|
866c5c4188
|
removed redundant null check
|
2013-12-13 14:22:24 +01:00 |
|
Leo
|
1918f98880
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-13 13:33:13 +01:00 |
|
Emil Siverhall
|
ddedf1a698
|
removed filter string panel from checklist template data panel
|
2013-12-13 13:33:05 +01:00 |
|
Emil Siverhall
|
c20bfb7948
|
another research area/lombok issue
|
2013-12-13 12:46:59 +01:00 |
|
Emil Siverhall
|
2f68ff25ba
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-13 12:03:45 +01:00 |
|
Emil Siverhall
|
4a120e17e4
|
toString fix on research area dropdown when authors submitting ideas
|
2013-12-13 11:57:09 +01:00 |
|
Emil Siverhall
|
48117498f7
|
only show project types with degreeLevels FIRST_CYCLE and SECOND_CYCLE when submitting supervisor ideas
|
2013-12-13 11:33:36 +01:00 |
|
Emil Siverhall
|
30c235c0eb
|
fixed research area lombok/toString bug
|
2013-12-13 11:08:01 +01:00 |
|
fred-fri
|
ec5cb11806
|
filtering only on supervisors with targets
|
2013-12-13 15:20:46 +09:00 |
|
fred-fri
|
491efcfc9f
|
removed delete
|
2013-12-13 13:58:05 +09:00 |
|
Per Lundholm
|
95ad828bbc
|
Fixed some tests that lacked good data.
|
2013-12-12 17:18:41 +01:00 |
|
Per Lundholm
|
f69cfd757d
|
Moved logic to their panels.
|
2013-12-12 17:00:39 +01:00 |
|
Per Lundholm
|
46de633efb
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-12 16:29:21 +01:00 |
|
Per Lundholm
|
7d40f506dd
|
Removed warning.
|
2013-12-12 16:29:15 +01:00 |
|
Per Lundholm
|
8241c0aa12
|
Simplified panel hierarchy.
|
2013-12-12 16:28:51 +01:00 |
|
Richard
|
eac214152a
|
Removed forum.css.
|
2013-12-12 16:26:09 +01:00 |
|
Leo
|
5903aca6a4
|
hides final seminar panel from supervisor sub tabs
|
2013-12-12 16:11:19 +01:00 |
|
Richard
|
edb1556642
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-12 16:08:31 +01:00 |
|
Richard
|
c9fb5da4b8
|
Fixed crash on ManageTargetsPanel.
|
2013-12-12 16:08:27 +01:00 |
|
Emil Siverhall
|
9e94f1ff88
|
renamed panel
|
2013-12-12 16:08:04 +01:00 |
|
Leo
|
6ae9118566
|
hides final seminar panel from overview page
|
2013-12-12 16:06:30 +01:00 |
|
Emil Siverhall
|
a7ef684ee5
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-12 16:04:00 +01:00 |
|
Emil Siverhall
|
97de33b457
|
only show target numbers for the project types available in the currently open application period(s)
|
2013-12-12 16:02:39 +01:00 |
|
Richard
|
5393eadb26
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-12 16:00:18 +01:00 |
|
|
|
cb477e2dcb
|
Set up default filter for lazy supervisors.
|
2013-12-12 15:58:42 +01:00 |
|
Richard
|
92c387dcc9
|
Minor style changes to ManageTargetsPanel.
|
2013-12-12 15:56:10 +01:00 |
|
Leo
|
b3cde85899
|
Hides final seminar tab from project tab menu
|
2013-12-12 15:44:53 +01:00 |
|
niklas3
|
a497f5c2b0
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-12 15:43:37 +01:00 |
|
niklas3
|
bd7c151b71
|
Partially removed dependency on ProjectBuilder.
|
2013-12-12 15:43:34 +01:00 |
|
