leosu
|
bf0f36bc9a
|
credits added to grading report template
|
2014-03-10 13:21:30 +01:00 |
|
|
|
1b50c10e06
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-10 12:48:46 +01:00 |
|
|
|
9559647d17
|
Updates project data of already exported projects.
|
2014-03-10 12:47:02 +01:00 |
|
Emil Siverhall
|
3632b0d568
|
merge
|
2014-03-10 12:34:27 +01:00 |
|
Emil Siverhall
|
a9842347c6
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
core/src/main/java/se/su/dsv/scipro/project/ProjectService.java
|
2014-03-10 12:02:35 +01:00 |
|
leosu
|
b167ecae67
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-10 11:24:47 +01:00 |
|
leosu
|
39d07c47a8
|
changed student to user
|
2014-03-10 11:24:39 +01:00 |
|
fred-fri
|
a8ade4c8a9
|
removing stupid attributes
|
2014-03-10 14:17:04 +09:00 |
|
Emil Siverhall
|
da9f6a4bba
|
page that lists all authors with more than one project within specified filter limits.
|
2014-03-07 16:09:57 +01:00 |
|
fred-fri
|
f702d17119
|
merge resolve conflicts
|
2014-03-07 23:36:21 +09:00 |
|
fred-fri
|
c4df433cfe
|
adding new admin edit activity plan template page
|
2014-03-07 23:24:23 +09:00 |
|
leosu
|
378ad0eb54
|
inactive projects info fix after POR
|
2014-03-07 14:25:31 +01:00 |
|
|
|
db6ba06f2f
|
Whops :p
|
2014-03-07 08:37:12 +01:00 |
|
Emil Siverhall
|
3f835926ae
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-06 19:34:02 +01:00 |
|
|
|
55435148ac
|
Sonar issues.
|
2014-03-06 19:33:55 +01:00 |
|
Emil Siverhall
|
d2cd00149a
|
fixed some role/user issues on application periods -> edit targets
|
2014-03-06 19:28:53 +01:00 |
|
|
|
1712c60723
|
Sonar issues.
|
2014-03-06 19:24:12 +01:00 |
|
|
|
69df664be7
|
Final clean up.
|
2014-03-06 17:58:58 +01:00 |
|
|
|
57335361a0
|
Removed role repo
|
2014-03-06 17:36:00 +01:00 |
|
|
|
bac334a225
|
Merge remote-tracking branch 'origin/develop' into improvement/roles
Conflicts:
core/src/main/java/se/su/dsv/scipro/project/ProjectFollower.java
|
2014-03-06 17:34:09 +01:00 |
|
Emil Siverhall
|
f386ba71e3
|
TreeSet -> HashSet on project-> project followers
|
2014-03-06 16:53:14 +01:00 |
|
|
|
f2e3d939c0
|
Improved autocomplete role speed.
|
2014-03-06 16:47:13 +01:00 |
|
|
|
0bab868a7c
|
Fixed role mapping.
|
2014-03-06 16:47:00 +01:00 |
|
|
|
0b1ec2993a
|
Fixed migration scripts.
|
2014-03-06 16:26:48 +01:00 |
|
|
|
ce5b277721
|
Renamed scripts.
|
2014-03-06 16:08:13 +01:00 |
|
|
|
1af1fed02a
|
Fixed merge problems.
|
2014-03-06 16:06:02 +01:00 |
|
|
|
98d62f44c3
|
Project head supervisor can now be null.
|
2014-03-06 16:05:52 +01:00 |
|
|
|
b701518530
|
Merge branch 'develop' into improvement/roles
Conflicts:
core/src/main/java/se/su/dsv/scipro/springdata/services/SupervisorService.java
view/src/main/java/se/su/dsv/scipro/admin/panels/AdminIdeaPopupPanel.java
view/src/main/java/se/su/dsv/scipro/datatables/project/ProjectDataPanel.java
view/src/test/java/se/su/dsv/scipro/match/panel/ApplicationPeriodInfoPanelTest.java
|
2014-03-06 15:59:21 +01:00 |
|
|
|
4289bac410
|
Fixed UserService filter
|
2014-03-06 15:53:30 +01:00 |
|
|
|
b8289e3679
|
Removed RoleBuilder.
|
2014-03-06 15:33:01 +01:00 |
|
|
|
d615293e32
|
wtf constructor injection plz
|
2014-03-06 15:30:47 +01:00 |
|
|
|
3c84dac775
|
Removed Examiner repo and role reference.
|
2014-03-06 15:30:39 +01:00 |
|
|
|
863431d4c8
|
Changed examiner in FinalSeminar to User.
|
2014-03-06 15:25:17 +01:00 |
|
|
|
25d27e71db
|
Removed SupervisorRepo
|
2014-03-06 15:14:02 +01:00 |
|
|
|
03a5905008
|
Removed StudentRepo
|
2014-03-06 15:08:48 +01:00 |
|
Emil Siverhall
|
3a8f8207a2
|
findByCode that still lives on does not take inacticated project types in account
|
2014-03-06 15:06:58 +01:00 |
|
|
|
bef2d3843f
|
Removed RoleService.
|
2014-03-06 15:01:46 +01:00 |
|
Emil Siverhall
|
d203860919
|
removed use of findByCode in data initializer
|
2014-03-06 14:55:16 +01:00 |
|
|
|
45127ec63e
|
View updated to use role enums.
|
2014-03-06 14:42:58 +01:00 |
|
Emil Siverhall
|
8f39128207
|
removed projectType connection from ProjectPartner since this never was used
|
2014-03-06 13:37:13 +01:00 |
|
|
|
b95008eb16
|
Rewrote SupervisorService to work with User.
|
2014-03-06 10:25:29 +01:00 |
|
|
|
368560d883
|
Removed Employee from core.
|
2014-03-06 10:12:40 +01:00 |
|
Golrokh Moattar
|
84483ce9fc
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
view/src/main/java/se/su/dsv/scipro/seminar/panels/SeminarOppositionPanel.html
view/src/main/java/se/su/dsv/scipro/seminar/panels/SeminarOppositionPanel.java
|
2014-03-06 09:17:08 +01:00 |
|
|
|
41d304eae4
|
Merge branch 'develop' into improvement/roles
|
2014-03-05 17:16:16 +01:00 |
|
|
|
c3635dad7c
|
Remove actual file data when deleting a FileDescription.
|
2014-03-05 17:15:51 +01:00 |
|
|
|
78fbb5fb35
|
Fixed merge problems.
|
2014-03-05 17:13:21 +01:00 |
|
|
|
127f160a23
|
Merge branch 'develop' into improvement/roles
Conflicts:
core/src/main/java/se/su/dsv/scipro/peer/PeerReview.java
core/src/main/java/se/su/dsv/scipro/peer/PeerReviewService.java
core/src/main/java/se/su/dsv/scipro/project/ProjectServiceImpl.java
|
2014-03-05 17:10:11 +01:00 |
|
|
|
99b69db64b
|
Core updated to no longer work with role entities.
|
2014-03-05 17:04:15 +01:00 |
|
|
|
2bdf262847
|
Fixed faulty foreign key reference.
|
2014-03-05 16:37:19 +01:00 |
|
Emil Siverhall
|
2a926a3807
|
count authors with more than one project participation on authors -> statistics
|
2014-03-05 16:11:33 +01:00 |
|
