fred-fri
|
062c5b6a62
|
switches and sql
|
2014-03-11 14:42:05 +09:00 |
|
fred-fri
|
530967ca09
|
switches
|
2014-03-11 14:37:50 +09:00 |
|
fred-fri
|
ef3d156622
|
switches
|
2014-03-11 14:34:42 +09:00 |
|
fred-fri
|
0960e04102
|
switches
|
2014-03-11 14:24:29 +09:00 |
|
fred-fri
|
6de9b0e426
|
switches
|
2014-03-11 14:21:38 +09:00 |
|
fred-fri
|
578e8d8602
|
switches
|
2014-03-11 14:20:29 +09:00 |
|
fred-fri
|
8d86f5d9d5
|
switches
|
2014-03-11 14:12:41 +09:00 |
|
fred-fri
|
2075015c3c
|
switches
|
2014-03-11 14:11:10 +09:00 |
|
fred-fri
|
fc6dda7e48
|
switches
|
2014-03-11 14:09:51 +09:00 |
|
fred-fri
|
6b3fe40537
|
switches
|
2014-03-11 13:55:38 +09:00 |
|
fred-fri
|
93d579a9a9
|
switch
|
2014-03-11 13:51:25 +09:00 |
|
fred-fri
|
aa99e995fa
|
switch
|
2014-03-11 13:50:10 +09:00 |
|
fred-fri
|
4db595718d
|
switch
|
2014-03-11 13:49:25 +09:00 |
|
fred-fri
|
82dc4d16d3
|
switch
|
2014-03-11 13:48:56 +09:00 |
|
fred-fri
|
06d23ddcc0
|
switch
|
2014-03-11 13:48:01 +09:00 |
|
fred-fri
|
0dfb8d11cb
|
visibility
|
2014-03-11 13:47:41 +09:00 |
|
fred-fri
|
4f6a9cc0bd
|
switch
|
2014-03-11 13:46:42 +09:00 |
|
fred-fri
|
e0a220b6df
|
adding sets to project entity
|
2014-03-11 11:52:13 +09:00 |
|
fred-fri
|
c1262f258c
|
adding db tables for reviewers and cosupervisors
|
2014-03-11 11:50:13 +09:00 |
|
leosu
|
25f89128b4
|
broke out calculation and renamed GradeCalculator
|
2014-03-10 16:45:39 +01:00 |
|
leosu
|
fc00b07959
|
added master templates
|
2014-03-10 15:37:37 +01:00 |
|
|
|
a7136516fa
|
Removes deleted authors.
|
2014-03-10 15:28:29 +01:00 |
|
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 |
|
