|
|
45cbd001cf
|
Added delete(T entity) to GenericService
|
2014-02-25 09:48:52 +01:00 |
|
fred-fri
|
4f2c8ddea9
|
creating phd
|
2014-02-25 12:32:08 +09:00 |
|
|
|
9332ab392b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-24 16:53:32 +01:00 |
|
Emil Siverhall
|
1a9308844c
|
changed to notification compilation worker to only go through notifications by users with mail compilation enabled
|
2014-02-24 16:40:20 +01:00 |
|
|
|
919bab0743
|
Renamed enum to singular form instead of plural.
|
2014-02-24 16:40:17 +01:00 |
|
|
|
536a24670a
|
Switched to Enum renderer instead of implicit toString() reliance
|
2014-02-24 16:39:08 +01:00 |
|
Emil Siverhall
|
aaf6341ee1
|
service method to fetch users with mail compilation switched on
|
2014-02-24 16:02:33 +01:00 |
|
|
|
dbdb96e155
|
Refactored SeminarCRUDPanel so that it no longer inherits from AbstractCRUDPanel.
|
2014-02-24 14:21:35 +01:00 |
|
fred-fri
|
0951b356a7
|
fixing issues
|
2014-02-24 15:02:25 +09:00 |
|
Golrokh Moattar
|
daa087df99
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-21 17:16:38 +01:00 |
|
Golrokh Moattar
|
62e0d8ab02
|
daisyStartDate deleted from Project class and in all over the project dateCreated used instead
|
2014-02-21 16:58:54 +01:00 |
|
leosu
|
b41dd35160
|
removed line breaks after prefix
|
2014-02-21 16:23:20 +01:00 |
|
Emil Siverhall
|
06baa5a5ec
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
core/src/main/java/se/su/dsv/scipro/data/dataobjects/FileDescription.java
view/src/main/java/se/su/dsv/scipro/repository/panels/ProjectFilePanel.java
|
2014-02-21 15:57:01 +01:00 |
|
Emil Siverhall
|
50895db80b
|
ProjectFilePanel now uses a data table instead of list view with weird sorting.. SortOrder is now gone as well
|
2014-02-21 15:50:08 +01:00 |
|
leosu
|
c56ce9d51c
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
core/src/main/java/se/su/dsv/scipro/data/dataobjects/FinalSeminarOpposition.java
|
2014-02-21 15:17:25 +01:00 |
|
leosu
|
a844875dde
|
added the new sub panels for SeminarPanel to SeminarPanel
|
2014-02-21 15:16:27 +01:00 |
|
Golrokh Moattar
|
d49a6c88ad
|
db script for copying daisyStartDate to createdDate and dropping it was written
|
2014-02-21 15:06:23 +01:00 |
|
fred-fri
|
549de8ba59
|
fixing issues
|
2014-02-21 20:05:16 +09:00 |
|
fred-fri
|
6214ee443e
|
fixing style issues
|
2014-02-21 18:40:21 +09:00 |
|
fred-fri
|
0b608e2fd7
|
utf8
|
2014-02-21 17:55:24 +09:00 |
|
fred-fri
|
8a670c1bb5
|
adding phd stuff
|
2014-02-21 16:29:05 +09:00 |
|
fred-fri
|
145a843674
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-21 15:56:18 +09:00 |
|
fred-fri
|
afa124ae36
|
adding phd stuff
|
2014-02-21 15:55:51 +09:00 |
|
Emil Siverhall
|
476837714f
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-20 16:53:58 +01:00 |
|
Emil Siverhall
|
3dfa7193f0
|
files uploaded through files tab sets deletable = true
|
2014-02-20 15:23:21 +01:00 |
|
Emil Siverhall
|
dff0c0d81e
|
deletable boolean to project files
|
2014-02-20 14:58:32 +01:00 |
|
leosu
|
e41fde1441
|
moved things being checked in view to where they belong
|
2014-02-20 13:38:35 +01:00 |
|
Emil Siverhall
|
f0a79cb819
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-20 12:20:17 +01:00 |
|
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 |
|
