12557 Commits

Author SHA1 Message Date
leosu
09e7e8d3f7 Merge remote-tracking branch 'origin/develop' into develop 2014-02-14 14:49:10 +01:00
leosu
008fb306d8 changed SupervisorGradingReportSubmittedEvent to individual 2014-02-14 14:49:05 +01:00
Golrokh Moattar
6824d2b655 the old way for activation of FinalSeminarCreated milestone removed 2014-02-14 14:42:22 +01:00
Emil Siverhall
45e599f6c8 renamed V99 script to avoid pang boom bang when pushing 2014-02-14 14:33:54 +01:00
Emil Siverhall
ac901f540f Merge remote-tracking branch 'origin/develop' into develop 2014-02-14 14:33:03 +01:00
Emil Siverhall
df2383d3ba renamed ProjectFacade to ChecklistFacade since we only perform checklist operations in the class. Also added description from template 2014-02-14 14:32:19 +01:00
fb3bbec7e6 Merge branch 'develop' into improvement/files
Conflicts:
	view/src/main/java/se/su/dsv/scipro/repository/panels/AbstractFilePanel.java
2014-02-14 14:25:53 +01:00
494ad3e75c Added new columns to file_description to prepare for jackrabbit migration. 2014-02-14 14:22:24 +01:00
Golrokh Moattar
61951ebf7f Merge remote-tracking branch 'origin/develop' into develop 2014-02-14 14:12:34 +01:00
Golrokh Moattar
829d49a9e0 Activate milestone after seminar created 2014-02-14 14:12:24 +01:00
3780adf2db Merge remote-tracking branch 'origin/develop' into develop 2014-02-14 14:09:22 +01:00
Emil Siverhall
ab63587d5e description to checklist entity as well 2014-02-14 13:39:11 +01:00
fred-fri
6ff7f76622 cleaning 2014-02-14 20:06:49 +09:00
fred-fri
c73a89bacc cleaning 2014-02-14 15:23:59 +09:00
d1344644ae Merge branch 'develop' into improvement/files
Conflicts:
	core/src/test/java/se/su/dsv/scipro/data/controllers/impl/FinalSeminarUploadControllerImplTest.java
2014-02-13 17:02:50 +01:00
b9fdd0d17b Merge remote-tracking branch 'origin/develop' into develop 2014-02-13 16:56:15 +01:00
Emil Siverhall
8046d16348 Merge remote-tracking branch 'origin/develop' into develop 2014-02-13 16:28:30 +01:00
Emil Siverhall
55a4d93712 fixed project type sorting 2014-02-13 16:28:18 +01:00
Golrokh Moattar
70c9522bf9 TestCases written for creation of FinalSeminarCreatedEvent cr 2014-02-13 16:22:20 +01:00
Golrokh Moattar
fe1aadc11f Merge remote-tracking branch 'origin/develop' into develop 2014-02-13 16:18:23 +01:00
019ed5fe2e Merge remote-tracking branch 'origin/develop' into develop 2014-02-13 16:14:20 +01:00
leosu
861596f8f4 Merge remote-tracking branch 'origin/develop' into develop 2014-02-13 16:12:58 +01:00
leosu
6bdd61885b visibility for grade container 2014-02-13 16:12:46 +01:00
Emil Siverhall
0950473e76 Merge remote-tracking branch 'origin/develop' into develop 2014-02-13 15:45:20 +01:00
Emil Siverhall
2e3ffc6178 possible to add a description when creating/editing a checklist template 2014-02-13 15:45:03 +01:00
Emil Siverhall
c52522d476 description field to checklist templates 2014-02-13 15:11:05 +01:00
leosu
b5269490db Merge remote-tracking branch 'origin/develop' into develop 2014-02-13 14:56:25 +01:00
leosu
98ff87cc3d hide label if not supervisor 2014-02-13 14:56:13 +01:00
Richard
a33db1ff63 Moved wicket:id from well to row. 2014-02-13 14:47:08 +01:00
Richard
f1a0148820 Merge remote-tracking branch 'origin/develop' into develop 2014-02-13 14:43:13 +01:00
Richard
fe55d7a433 Changes to the styling (points and motivation). 2014-02-13 14:43:04 +01:00
leosu
eaef3c698e Merge remote-tracking branch 'origin/develop' into develop 2014-02-13 14:23:29 +01:00
leosu
055daa8526 activate milestone when posting grading report events 2014-02-13 14:23:08 +01:00
Emil Siverhall
5003e6f0d5 Merge remote-tracking branch 'origin/develop' into develop 2014-02-13 14:17:33 +01:00
Emil Siverhall
1bfdd79596 some cleanup 2014-02-13 14:17:17 +01:00
Golrokh Moattar
77145ab60a "final seminar created" added to "event" table 2014-02-13 14:07:12 +01:00
leosu
f63a05b666 posts SubmittedEvents 2014-02-13 13:56:55 +01:00
leosu
e5761b5986 moved OppositionReportService to where it belongs 2014-02-13 13:48:10 +01:00
leosu
086869c2d6 new events in database 2014-02-13 13:29:45 +01:00
leosu
bafb2018a0 Merge remote-tracking branch 'origin/develop' into develop 2014-02-13 13:25:44 +01:00
leosu
d85b51e0ec hides empty comments 2014-02-13 13:02:51 +01:00
fred-fri
8b614b250f Merge remote-tracking branch 'origin/develop' into develop 2014-02-13 19:54:47 +09:00
fred-fri
ff7ecb6b45 refactoring application period exemptions 2014-02-13 19:54:24 +09:00
Richard
a79fc4f126 Column changes 2014-02-13 11:16:34 +01:00
Golrokh Moattar
1ece2025f7 The old way for activating a milestone removed 2014-02-13 10:56:34 +01:00
Golrokh Moattar
82e9f74457 FinalThesisUploaded changed to FinalSeminarThesisUploaded 2014-02-13 10:47:24 +01:00
Golrokh Moattar
611e94e445 Milestone activated after seminar uploaded 2014-02-13 10:44:07 +01:00
Golrokh Moattar
d67aaab600 Final Thesis Uploaded event will be sent 2014-02-13 10:14:30 +01:00
Golrokh Moattar
380e02e9b9 Final Thesis Uploaded added to the Event Table 2014-02-13 09:36:26 +01:00
fred-fri
ab81bd4fb0 fixed pdf bug 2014-02-13 17:29:12 +09:00