6886 Commits

Author SHA1 Message Date
fred-fri
0a1e32e618 working with panel 2014-01-07 18:23:16 +09:00
fred-fri
07d6dc077e working with panel 2014-01-07 17:55:58 +09:00
fred-fri
9a9483289a working with panel 2014-01-07 17:29:50 +09:00
fred-fri
a91d707799 working with panel 2014-01-07 16:59:05 +09:00
fred-fri
206379b43f working with panel 2014-01-07 16:50:56 +09:00
fred-fri
a7a82a95bd working with panel 2014-01-07 16:41:42 +09:00
fred-fri
02e0a52b34 working with panel 2014-01-07 16:37:43 +09:00
fred-fri
22278379f8 working with panel 2014-01-07 16:29:34 +09:00
fred-fri
7545715131 working with panel 2014-01-07 16:13:59 +09:00
fred-fri
e76db55723 creating new panel 2014-01-07 15:40:25 +09:00
fred-fri
560778181f delete internal users 2014-01-07 13:55:16 +09:00
fred-fri
3e817c1ecf rename 2014-01-06 17:07:29 +09:00
fred-fri
12f4705504 creating new page for preliminary grade report 2014-01-06 15:53:35 +09:00
fred-fri
ea1513935b creating new page for preliminary grade report 2014-01-06 15:25:00 +09:00
fred-fri
f00fdbf10f creating new page for preliminary grade report 2014-01-06 15:10:26 +09:00
fred-fri
a30e6e7d55 creating new page for preliminary grade report 2014-01-06 13:30:43 +09:00
fred-fri
e422524034 creating new page for preliminary grade report 2014-01-06 13:17:08 +09:00
Emil Siverhall
9989caa3fe Merge remote-tracking branch 'origin/develop' into develop 2014-01-03 10:17:55 +01:00
Emil Siverhall
16547719b1 beta annotations on grading tab and approve final thesis panel 2014-01-03 09:52:25 +01:00
fred-fri
1765d81b0f making checkbox usable by students if milestoneactivity iseditablebystudents 2014-01-03 17:33:10 +09:00
fred-fri
307fe88d0f added new boolean editablebystudents to milestoneactivity 2014-01-03 17:09:39 +09:00
Emil Siverhall
9e1544a7c2 new beta auth role 2014-01-02 15:58:25 +01:00
Emil Siverhall
3b366779ed Added new beta role entity 2014-01-02 15:34:33 +01:00
Emil Siverhall
19637fd467 catch illegal state exception when trying to submit a form that's been changed between save and submit 2014-01-02 13:42:50 +01:00
Richard
cf00b56ffb Merge remote-tracking branch 'origin/develop' into develop 2013-12-20 17:32:03 +01:00
Richard
3c963be2d5 First styling of the reviewerGradingReport.
Minor style changes to the supervisorGradingReport.
2013-12-20 17:31:54 +01:00
f41dba3aef Removed unused code. 2013-12-20 17:19:45 +01:00
fedd9d708c Removed unused method. 2013-12-20 17:16:18 +01:00
d472c13c37 MailEventWorker does not delete MailEvent entities if the application is running in TEST mode. 2013-12-20 16:46:16 +01:00
Leo
7837a370d8 changed logic for activating download button because the previous was somewhat faulty 2013-12-20 16:08:47 +01:00
Leo
fe024bfa3f Merge remote-tracking branch 'origin/develop' into develop 2013-12-20 15:47:55 +01:00
Leo
77cd6286c7 added confirmation dialogs to submit buttons in grading report 2013-12-20 15:47:47 +01:00
Emil Siverhall
ac98d568e6 do not allow copying to submitted reports 2013-12-20 15:34:39 +01:00
Emil Siverhall
40c40ab160 component feedback panels on author idea submissions as well 2013-12-19 22:27:37 +01:00
Emil Siverhall
beae9fe35d CounterTextArea now has it's own component feedback panel 2013-12-19 22:13:25 +01:00
Emil Siverhall
1f0a03943c no need to pass co author to choice component since we don't allow editing of submitted ideas 2013-12-19 21:01:57 +01:00
Emil Siverhall
c1404fbb87 Merge remote-tracking branch 'origin/develop' into develop 2013-12-19 17:06:48 +01:00
Emil Siverhall
d040c56e1f component feedback panels on supervisor idea submission page 2013-12-19 17:06:37 +01:00
Richard
6850fedddc Added white-space: pre-wrap to grading report criterions. 2013-12-19 17:04:34 +01:00
69900e2498 Changed setSubmitted to a one-way method. No backsies! 2013-12-19 16:51:30 +01:00
2cef9792de Removed method call, it should not be possible to "unsubmit" a grading report 2013-12-19 16:46:44 +01:00
ae6d05ac85 Merge remote-tracking branch 'origin/develop' into develop 2013-12-19 16:40:29 +01:00
b2f9d5e210 Removed unused constructor. 2013-12-19 16:17:09 +01:00
ed01ff15bc Removed unused constructor. 2013-12-19 16:16:25 +01:00
7a23eacc7c Refactored a bit and removed unused constructor. 2013-12-19 16:15:32 +01:00
b9561e031b Removed unused method. 2013-12-19 16:08:14 +01:00
Emil Siverhall
adc770face merge 2013-12-19 16:05:32 +01:00
Emil Siverhall
067d49ad31 Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	view/src/main/java/se/su/dsv/scipro/project/panels/PartnerAdditionPanel.java
	view/src/main/java/se/su/dsv/scipro/project/panels/ProjectIdeaSubmissionPanel.java
2013-12-19 16:05:01 +01:00
Emil Siverhall
743a7a25fe removed validateStudentIdeaSubmission 2013-12-19 16:01:06 +01:00
Leo
a45d172c9c Merge remote-tracking branch 'origin/develop' into develop 2013-12-19 16:01:01 +01:00