Golrokh Moattar
|
908b273c59
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-17 16:10:45 +01:00 |
|
Golrokh Moattar
|
53b3e93f47
|
In Internal users/Registration page, Username field removed and Email address started to be used as Username
|
2014-02-17 16:10:34 +01:00 |
|
leosu
|
dbf61fb828
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-17 16:08:06 +01:00 |
|
leosu
|
9709debcc0
|
SeminarRespondentsPanel feedback
|
2014-02-17 16:07:33 +01:00 |
|
Richard
|
581e0fe9dd
|
Added thesis instructions to the footer panel.
|
2014-02-17 16:06:52 +01:00 |
|
Emil Siverhall
|
b22e7207aa
|
fixed property models for ProjectPartner infoText/infotext
|
2014-02-17 16:05:12 +01:00 |
|
Emil Siverhall
|
9ada84313b
|
fixed Localizer#getString warning in TurnitinPanel
|
2014-02-17 15:55:25 +01:00 |
|
Emil Siverhall
|
532a5931b2
|
getString("upload.success")
|
2014-02-17 15:52:06 +01:00 |
|
Golrokh Moattar
|
80a8c8ed2a
|
In Internal users/Edit page, Username field removed and Email address started to use as Username
|
2014-02-17 15:41:28 +01:00 |
|
Emil Siverhall
|
426c30d0a7
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-17 15:37:29 +01:00 |
|
leosu
|
4443f5d3b3
|
SeminarRespondentsPanel more stuff
|
2014-02-17 15:35:48 +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 |
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
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
|
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 |
|
leosu
|
09e7e8d3f7
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-14 14:49:10 +01:00 |
|
leosu
|
008fb306d8
|
changed SupervisorGradingReportSubmittedEvent to individual
|
2014-02-14 14:49:05 +01:00 |
|
Golrokh Moattar
|
6824d2b655
|
the old way for activation of FinalSeminarCreated milestone removed
|
2014-02-14 14:42:22 +01:00 |
|
Emil Siverhall
|
45e599f6c8
|
renamed V99 script to avoid pang boom bang when pushing
|
2014-02-14 14:33:54 +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 |
|
|
|
494ad3e75c
|
Added new columns to file_description to prepare for jackrabbit migration.
|
2014-02-14 14:22:24 +01:00 |
|
Golrokh Moattar
|
61951ebf7f
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-14 14:12:34 +01:00 |
|
Golrokh Moattar
|
829d49a9e0
|
Activate milestone after seminar created
|
2014-02-14 14:12:24 +01:00 |
|
|
|
3780adf2db
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-14 14:09:22 +01:00 |
|
