3976 Commits

Author SHA1 Message Date
Emil Siverhall
cafe386836 suppress warnings 2014-02-20 12:19:15 +01:00
leosu
15585cc747 moved things being checked in view to where they belong 2014-02-20 12:02:14 +01:00
leosu
02f8c8e38d Merge remote-tracking branch 'origin/develop' into develop 2014-02-20 11:52:09 +01:00
leosu
828306d655 formatting 2014-02-20 11:34:20 +01:00
Emil Siverhall
1bcb7f6c3d cleanup 2014-02-20 11:18:44 +01:00
Emil Siverhall
549f6916f4 distinct count on author statistics 2014-02-20 09:43:38 +01:00
fred-fri
d837051fbf Merge branch 'phd' into develop 2014-02-20 15:42:30 +09:00
Emil Siverhall
e453d8e795 Merge remote-tracking branch 'origin/develop' into develop 2014-02-19 16:57:40 +01:00
Emil Siverhall
52b0d45840 IdeaParticipation toString issues, datatables + excel exports 2014-02-19 16:57:25 +01:00
4056e253b8 Made filter save between page changes in admin mail log. 2014-02-19 16:39:35 +01:00
2ba6238baa Merge remote-tracking branch 'origin/develop' into develop 2014-02-19 16:31:56 +01:00
Emil Siverhall
2e58d2f953 Merge remote-tracking branch 'origin/develop' into develop 2014-02-19 16:29:02 +01:00
Emil Siverhall
839ed709dd keyword toString issues 2014-02-19 16:28:45 +01:00
09259188c7 Removed circular toString which caused stack overflow. 2014-02-19 16:23:53 +01:00
bde47c2dad Changed import from junit 3 to 4. 2014-02-19 15:53:59 +01:00
71284b6772 Removed stupid print. 2014-02-19 15:52:01 +01:00
leosu
47350bfedf Merge remote-tracking branch 'origin/develop' into develop 2014-02-19 15:50:28 +01:00
leosu
d74839fc00 fixed deleting oppositions with reports 2014-02-19 15:50:20 +01:00
Emil Siverhall
a8573955c2 Merge remote-tracking branch 'origin/develop' into develop 2014-02-19 15:22:26 +01:00
Emil Siverhall
a629af037a sql migration scripts for removing all checklists with supervisor only connection 2014-02-19 15:20:54 +01:00
Emil Siverhall
fa0b5708f5 fixed display for checklist categories 2014-02-19 12:39:36 +01:00
fred-fri
e3a23c40dc fixing fitnesse+selenium 2014-02-19 19:52:37 +09:00
Emil Siverhall
40e01eb958 removed some supervisor checklist specific methods 2014-02-19 11:20:57 +01:00
leosu
77367e4f47 Merge remote-tracking branch 'origin/develop' into develop 2014-02-19 10:58:13 +01:00
Emil Siverhall
996f8cfd8e removed unnecessary service 2014-02-19 10:32:59 +01:00
Emil Siverhall
bafee3a83e removed unnecessary services 2014-02-19 10:27:41 +01:00
Emil Siverhall
1c221925de removed unused method 2014-02-19 10:10:56 +01:00
fred-fri
49c5d2bd34 phd stuff 2014-02-19 16:44:59 +09:00
8a15107e7f Merge remote-tracking branch 'origin/develop' into develop 2014-02-18 18:34:05 +01:00
478bf0cbe7 Fixed hashCode problem in Keyword. 2014-02-18 18:27:37 +01:00
Emil Siverhall
530079a3ac removed overrided toString-methods with checklist connection 2014-02-18 16:30:00 +01:00
9b520d9716 Added ugly date filtering to mail log. 2014-02-18 16:19:42 +01:00
27cd67bab6 Suppressed a bunch of warnings due to Lombok. 2014-02-18 16:06:56 +01:00
6d57e9237a Removed targetLastModified attribute from FileDescription, now uses dateCreated instead. 2014-02-18 15:10:10 +01:00
leosu
d6528c61e5 SeminarOppositionPanel stuffs 2014-02-18 14:41:35 +01:00
4082b7a2e6 Removed content-type column from file page. 2014-02-18 14:22:51 +01:00
839dac42ee Merge branch 'develop' into improvement/files 2014-02-18 13:49:28 +01:00
leosu
d4a6898291 SeminarOppositionPanel first draft
FinalSeminarOppositionService.findAll() can now find by FinalSeminar
2014-02-18 13:41:31 +01:00
24d65f08c7 Deleted obsolete migration scripts. 2014-02-18 12:50:32 +01:00
b38787e329 Renamed SQL file to prevent version collision. 2014-02-18 12:39:31 +01:00
1a0a98e940 Merge remote-tracking branch 'origin/develop' into improvement/files 2014-02-18 12:39:01 +01:00
leosu
eee542014c Merge remote-tracking branch 'origin/develop' into develop 2014-02-18 11:50:40 +01:00
leosu
64f7205ea8 SeminarActiveParticipantsPanel finished 2014-02-18 11:50:32 +01:00
Golrokh Moattar
37013bb1af script name changed so that it can be run in deployment server 2014-02-18 10:13:17 +01:00
247fa06efd Jackrabbit is no more! 2014-02-18 10:04:41 +01:00
8252ac2b7b Removed the final dependency on jackrabbit. 2014-02-18 09:38:44 +01:00
51111fac81 Removed a bunch dependencies to jackrabbit. 2014-02-18 09:20:52 +01:00
0201113425 Removed data column from file_description table and added foreign key constraint to user. 2014-02-17 17:25:19 +01:00
523df0d0b4 Merge remote-tracking branch 'origin/develop' into improvement/files 2014-02-17 17:15:51 +01:00
834cc418c7 Files are now stored/retrieved on disk rather than in the database. 2014-02-17 17:14:28 +01:00