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 |
|
|
|
0010aa6ce9
|
Clean up.
|
2014-02-17 17:13:34 +01:00 |
|
Emil Siverhall
|
62c4b9d757
|
removed unused method
|
2014-02-17 17:07:30 +01:00 |
|
Emil Siverhall
|
0a5f27dc14
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-17 16:43:08 +01:00 |
|
Emil Siverhall
|
71e0e8f356
|
removed checklistrole, addchecklistpanel and refactoring
|
2014-02-17 16:42:48 +01:00 |
|
Golrokh Moattar
|
908b273c59
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-17 16:10:45 +01:00 |
|
Emil Siverhall
|
426c30d0a7
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-17 15:37:29 +01:00 |
|
Emil Siverhall
|
2299dfb602
|
removed old list checklist panel and implemented remove checklist properly
|
2014-02-17 15:35:18 +01:00 |
|
Emil Siverhall
|
b2baa8becb
|
allow remove checklist only if it isn't attached to an activity plan
|
2014-02-17 15:15:32 +01:00 |
|
Golrokh Moattar
|
bdf6da1ada
|
In DataInitializer, usernames changed to email addresses
|
2014-02-17 14:18:39 +01:00 |
|
leosu
|
00b4ca0eea
|
cleanup
|
2014-02-17 14:12:03 +01:00 |
|
Golrokh Moattar
|
354a387ea2
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-17 13:40:20 +01:00 |
|
Golrokh Moattar
|
7d400d2549
|
Milstone deactivation after deletion of FinalSeminar tested and problem with deleted fixed
|
2014-02-17 13:40:08 +01:00 |
|
|
|
f9f6efa7a9
|
Made type nullable until migration is done.
|
2014-02-17 13:38:44 +01:00 |
|
|
|
2c35825ae8
|
Merge remote-tracking branch 'origin/develop' into improvement/files
Conflicts:
core/src/main/java/se/su/dsv/scipro/activityplan/facade/ProjectScheduleFacadeImpl.java
core/src/main/java/se/su/dsv/scipro/peer/PeerPortal.java
core/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/FileDescriptionServiceImpl.java
core/src/main/java/se/su/dsv/scipro/springdata/services/FileDescriptionService.java
core/src/main/java/se/su/dsv/scipro/springdata/services/FinalThesisService.java
view/src/main/java/se/su/dsv/scipro/repository/panels/AbstractFilePanel.java
|
2014-02-17 13:02:19 +01:00 |
|
fred-fri
|
7a970dfe2d
|
cleaning
|
2014-02-17 20:20:50 +09:00 |
|
fred-fri
|
5a83baa422
|
cleaning
|
2014-02-17 13:17:14 +09:00 |
|
fred-fri
|
9664ca99ee
|
refactoring to remove critical
|
2014-02-17 10:34:41 +09:00 |
|
Golrokh Moattar
|
e00899aeea
|
Milstone deactivation for the deleted final seminar added
|
2014-02-14 16:42:47 +01:00 |
|
Golrokh Moattar
|
bb80108108
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
core/src/test/java/se/su/dsv/scipro/milestones/service/MilestoneActivatorTest.java
|
2014-02-14 15:43:36 +01:00 |
|
Golrokh Moattar
|
3a487a5304
|
Event class for deletion of a FinalSeminar created
|
2014-02-14 15:32:28 +01:00 |
|
Emil Siverhall
|
ca63babcd7
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-14 15:19:11 +01:00 |
|
Emil Siverhall
|
f62048beed
|
displaying checklist description on ViewChecklistPage (if one exists)
|
2014-02-14 15:16:27 +01:00 |
|
