Emil Siverhall
|
b2baa8becb
|
allow remove checklist only if it isn't attached to an activity plan
|
2014-02-17 15:15:32 +01:00 |
|
leosu
|
09434835de
|
removed outdated test
|
2014-02-17 14:42:57 +01:00 |
|
leosu
|
1126939fe6
|
SeminarRespondentsPanel more stuff
|
2014-02-17 14:42:31 +01:00 |
|
leosu
|
17c79643e1
|
SeminarRespondentsPanel first draft
|
2014-02-17 14:35:46 +01:00 |
|
Emil Siverhall
|
b3e443f2d5
|
redirect to different view checklist page if supervisor or follower
|
2014-02-17 14:20:30 +01:00 |
|
leosu
|
00b4ca0eea
|
cleanup
|
2014-02-17 14:12:03 +01:00 |
|
Emil Siverhall
|
a42f43038b
|
author-> checklists not uses new panel to display current checklists of a project
|
2014-02-17 14:02:51 +01:00 |
|
leosu
|
cdafcc11a1
|
milestone checkbox always visible
|
2014-02-17 13:53:01 +01:00 |
|
leosu
|
5d02233345
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-17 13:42:38 +01:00 |
|
leosu
|
424092dca0
|
final thesis renaming
|
2014-02-17 13:42:34 +01:00 |
|
Golrokh Moattar
|
354a387ea2
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-17 13:40:20 +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
|
12af6a00a1
|
refactoring to remove critical
|
2014-02-17 10:39:56 +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 |
|
leosu
|
2e04e135d9
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-14 16:31:33 +01:00 |
|
leosu
|
f0373b2f48
|
name changes
|
2014-02-14 16:31:27 +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 |
|
Emil Siverhall
|
807bf05b7a
|
fixed lazy init exception when editing application periods
|
2014-02-14 15:18:54 +01:00 |
|
Emil Siverhall
|
f62048beed
|
displaying checklist description on ViewChecklistPage (if one exists)
|
2014-02-14 15:16:27 +01:00 |
|
Golrokh Moattar
|
6824d2b655
|
the old way for activation of FinalSeminarCreated milestone removed
|
2014-02-14 14:42:22 +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 |
|
|
|
3780adf2db
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-14 14:09:22 +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 |
|
|
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
