6886 Commits

Author SHA1 Message Date
fred-fri
7749966417 fixed worker 2013-12-18 16:28:21 +09:00
fred-fri
c72ddc58d2 feedbackpanel fix 2013-12-18 15:51:41 +09:00
Richard
59cce89d6d Fixed issue with checkboxes not working in firefox on admin > match. 2013-12-17 16:56:10 +01:00
Richard
7087ece907 Merge remote-tracking branch 'origin/develop' into develop 2013-12-17 16:47:23 +01:00
Richard
fecb183262 - Changed text on show/hide filter on MyProjects.
- Overwrite of css to create a margin between checkboxes and text on MyProject filters.
2013-12-17 16:47:16 +01:00
Leo
5a5e4310e2 SupervisorGradingPage now renders different panels depending on role of logged in user 2013-12-17 16:43:29 +01:00
Leo
f6103de22c Merge remote-tracking branch 'origin/develop' into develop 2013-12-17 16:33:09 +01:00
Emil Siverhall
78b0059c92 removed some unused methods from milestone panels 2013-12-17 16:23:23 +01:00
Leo
487e11cdc1 Broke out GradingReportPointsPanel from FillOutGradingReport 2013-12-17 16:20:08 +01:00
Leo
80c7719d99 Merge remote-tracking branch 'origin/develop' into develop 2013-12-17 15:47:39 +01:00
Leo
fb42aa0e8b broke out ScrollingSaveButton from FillOutGradingReportPanel 2013-12-17 15:47:22 +01:00
Richard
cec1b80a3f Merge remote-tracking branch 'origin/develop' into develop 2013-12-17 15:46:21 +01:00
Richard
23d431a4b7 Color and style changes to the feedbackpanels. 2013-12-17 15:46:13 +01:00
Emil Siverhall
b4bbfc5df5 Merge remote-tracking branch 'origin/develop' into develop 2013-12-17 15:28:19 +01:00
Leo
e81a2ee587 Broke out CriteriaPanel from FillOutGradingReportPanel 2013-12-17 15:24:19 +01:00
Emil Siverhall
3fb2130a36 added default project classes to user profile filtering when creating new ones 2013-12-17 15:23:38 +01:00
Richard
a0d401e997 Merge remote-tracking branch 'origin/develop' into develop 2013-12-17 13:26:36 +01:00
niklas3
d548e3dda9 Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	core/src/main/java/se/su/dsv/scipro/DataInitializer.java
2013-12-17 13:26:27 +01:00
niklas3
16b546c98f added option to hide project filter 2013-12-17 13:24:54 +01:00
Richard
4f3ee27f4d Added information that at least 5 characters are needed when choosing title for an idea. 2013-12-17 13:24:05 +01:00
Emil Siverhall
0982f9427f minor property change 2013-12-17 13:10:20 +01:00
Emil Siverhall
c133d8ede1 copy button label now specify author to copy from 2013-12-17 13:08:49 +01:00
Emil Siverhall
0d65e7b2dd added feedback panel to supervisor project details view 2013-12-17 11:02:37 +01:00
Emil Siverhall
2eaf24bf8d Merge remote-tracking branch 'origin/develop' into develop 2013-12-17 10:42:49 +01:00
Emil Siverhall
7533867c51 changes to copy service method and button label 2013-12-17 10:28:44 +01:00
Leo
d8eb63727d fixed a null pointer 2013-12-17 09:49:08 +01:00
Leo
e145bf8dec Merge remote-tracking branch 'origin/develop' into develop 2013-12-17 09:27:39 +01:00
Emil Siverhall
9a823dfdcd Merge remote-tracking branch 'origin/develop' into develop 2013-12-17 08:16:29 +01:00
Per Lundholm
d0265682f6 Merge remote-tracking branch 'origin/develop' into develop 2013-12-16 17:18:43 +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
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
Leo
2ec342b45c hides grading tab until final thesis is approved 2013-12-16 14:10:05 +01:00
niklas3
2b75f09a4c Renamed level to project type. 2013-12-16 11:26:32 +01:00
niklas3
bcfdb907e3 Removed ProjectBuilder. BYE 2013-12-16 10:18:40 +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
Leo
e6a7682ef9 Merge remote-tracking branch 'origin/develop' into develop 2013-12-16 09:11:03 +01: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
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
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
Leo
1918f98880 Merge remote-tracking branch 'origin/develop' into develop 2013-12-13 13:33:13 +01:00