|
|
69eaf7c5e7
|
Removed some hibernate dependencies.
|
2014-02-26 16:50:55 +01:00 |
|
|
|
3f160abdcc
|
Updated all dependency versions.
Still stuck with Spring 3.2.8 due to Spring-data-jpa.
Hibernate introduced a bug in 4.3.* so until that is resolved we use 4.2.8.
|
2014-02-26 16:47:14 +01:00 |
|
|
|
e3299add39
|
Removed stupid initial title and description that prevented placeholder values.
|
2014-02-26 15:48:17 +01:00 |
|
|
|
3bbfe91a97
|
Removed duplicate filter parameter.
Date filtering is now always from 00:00 to 23:59 on the specified dates.
|
2014-02-26 15:42:27 +01:00 |
|
leosu
|
0bb04670fd
|
added space in mail format
|
2014-02-26 12:16:36 +01:00 |
|
fred-fri
|
072c9aa72b
|
moving applicationperiodprojecttype stuff
|
2014-02-26 18:32:18 +09:00 |
|
fred-fri
|
1bfa14c83d
|
moving project stuff
|
2014-02-26 18:15:17 +09:00 |
|
fred-fri
|
d7a9422ce2
|
moving phd stuff
|
2014-02-26 18:12:43 +09:00 |
|
fred-fri
|
5b7834d639
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2014-02-26 18:04:59 +09:00 |
|
fred-fri
|
f8c61154be
|
moving project stuff
|
2014-02-26 18:03:56 +09:00 |
|
|
|
11b795aa16
|
Fixed suppression
|
2014-02-26 09:13:17 +01:00 |
|
fred-fri
|
e82957b3f7
|
bug fixes
|
2014-02-26 12:23:18 +09:00 |
|
Golrokh Moattar
|
098680eb25
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-25 14:14:19 +01:00 |
|
Golrokh Moattar
|
c898bc390e
|
Problems with AdminProjectTypePanel were fixed
|
2014-02-25 14:09:21 +01:00 |
|
|
|
3f8c5d987b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-25 13:26:18 +01:00 |
|
leosu
|
a2ffedf569
|
notification for activation and deactivation of project
|
2014-02-25 11:40:03 +01:00 |
|
|
|
c76ebd5dd0
|
Cascade in database since Hibernate sometimes misses.
|
2014-02-25 11:09:42 +01:00 |
|
|
|
b27089d570
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-25 11:05:44 +01:00 |
|
Golrokh Moattar
|
7b4c25a743
|
Admin can search Users by their EmailAddress
|
2014-02-25 10:51:17 +01:00 |
|
|
|
24f2e864f8
|
Added setCancelled/isCancelled methods to FinalSeminar that delegates to deleted to better communicate intent even if it is still stupid.
Successful submit in CRUD panel now uncancels the seminar.
|
2014-02-25 10:33:46 +01:00 |
|
leosu
|
a0a3570166
|
can oppose if not approved on previous oppositions
|
2014-02-25 09:52:50 +01:00 |
|
|
|
12c77af272
|
Added constructor FinalSeminar(Project)
|
2014-02-25 09:49:17 +01:00 |
|
|
|
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 |
|
