16805 Commits

Author SHA1 Message Date
Per Lundholm
0c0b61415b Employees now can educate in English and Swedish by default. Methods were named to indicate whether they create data conditionally or not. 2013-12-16 17:18:35 +01:00
Per Lundholm
dae85499a2 Removed reference to Daisy. 2013-12-16 17:16:38 +01:00
Leo
69dd46b82f added file panel 2013-12-16 17:15:42 +01:00
Leo
90cd1239f1 fixed an unnecessary constant 2013-12-16 17:01:39 +01:00
Emil Siverhall
50bff534f6 more detailed feedback message 2013-12-16 16:52:13 +01:00
Leo
9594f96711 new hide/show logic for approve final thesis panel concerning reviewers 2013-12-16 16:47:13 +01:00
Per Lundholm
854bfcb624 Merge remote-tracking branch 'origin/develop' into develop 2013-12-16 16:40:07 +01:00
Emil Siverhall
5c5a9e1352 confirmation dialog before copying 2013-12-16 16:13:59 +01:00
Emil Siverhall
0e2e29e76a added copy report button to report tabs if coauthor exists 2013-12-16 15:24:13 +01:00
Leo
09a270cda7 fixed some weirdly implemented notifications for approving or rejecting final thesis 2013-12-16 15:22:58 +01:00
Emil Siverhall
80baf5c020 first version of copy to for grading reports 2013-12-16 14:22:06 +01:00
Leo
2ec342b45c hides grading tab until final thesis is approved 2013-12-16 14:10:05 +01:00
Per Lundholm
4ee316d052 Added reaserach areas. 2013-12-16 11:39:47 +01:00
niklas3
d6f5c63a3d Merge remote-tracking branch 'origin/develop' into develop 2013-12-16 11:26:38 +01:00
niklas3
2b75f09a4c Renamed level to project type. 2013-12-16 11:26:32 +01:00
Per Lundholm
34bb1982b8 Merge remote-tracking branch 'origin/develop' into develop 2013-12-16 10:59:30 +01:00
Per Lundholm
51711602c9 Revamped the names of the users. Blocked running when users already present. 2013-12-16 10:59:22 +01:00
Per Lundholm
5a149694fc email address is always lowercase. 2013-12-16 10:58:28 +01:00
niklas3
bcfdb907e3 Removed ProjectBuilder. BYE 2013-12-16 10:18:40 +01:00
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