|
|
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 |
|
Emil Siverhall
|
907777b54c
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-06 09:48:00 +01:00 |
|
Emil Siverhall
|
8785a851a2
|
excel export safety nets..
|
2014-03-06 09:47:07 +01:00 |
|
Golrokh Moattar
|
6f7fa1d8fe
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-06 09:32:10 +01:00 |
|
Golrokh Moattar
|
e64f973f00
|
Delete opponentReport and OppositionReport is possible by Admin Role
|
2014-03-06 09:24:56 +01:00 |
|
Richard
|
9ce8415b66
|
Replaced Skydrive with Onedrive. Added Box.
|
2014-03-06 09:21:44 +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 |
|
Richard
|
ec5a400b5a
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-06 09:15:45 +01:00 |
|
fred-fri
|
b081ce5850
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2014-03-06 10:51:01 +09:00 |
|
fred-fri
|
e463239de2
|
adding new edit templates page
|
2014-03-06 10:50:35 +09: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
|
94c543ddde
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-05 16:11:48 +01:00 |
|
Emil Siverhall
|
2a926a3807
|
count authors with more than one project participation on authors -> statistics
|
2014-03-05 16:11:33 +01:00 |
|
leosu
|
7c54a046d1
|
fixed NPE
release-2014-03-05_16-11-47
|
2014-03-05 15:53:13 +01:00 |
|
Richard
|
a0531c5524
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-05 15:43:50 +01:00 |
|
Richard
|
02b79c726a
|
Removed unused css file from BasePage.html.
|
2014-03-05 15:43:41 +01:00 |
|
Emil Siverhall
|
e7c4feb02c
|
deactivatable date picker on author statistics page
|
2014-03-05 14:43:52 +01:00 |
|
Emil Siverhall
|
e4f75abcfb
|
removed old date filter
release-2014-03-05_15-17-07
|
2014-03-05 14:29:34 +01:00 |
|
Emil Siverhall
|
c9b1769389
|
inactive not default selected
|
2014-03-05 12:47:11 +01:00 |
|
Emil Siverhall
|
cc112865d3
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-05 12:05:27 +01:00 |
|
leosu
|
ecde97a29a
|
annotation fix
|
2014-03-05 11:58:16 +01:00 |
|
Emil Siverhall
|
d8fe67bd56
|
reverted some unfinished peer stuff, peer sprint next week
|
2014-03-05 11:58:10 +01:00 |
|
leosu
|
5788a94ef1
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-05 11:33:45 +01:00 |
|
|
|
a966698ff0
|
Re-added opposition, reviewer and supervisor file upload/comment.
|
2014-03-05 11:29:05 +01:00 |
|
leosu
|
c10370f0d7
|
reverted beta annotations
|
2014-03-05 11:26:57 +01:00 |
|
leosu
|
9a7825dcda
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-05 11:17:49 +01:00 |
|
leosu
|
fd34129a8e
|
confirm dialogue
|
2014-03-05 11:17:42 +01:00 |
|
leosu
|
0652bbb864
|
cleanup
|
2014-03-05 11:16:53 +01:00 |
|
Emil Siverhall
|
092192e46e
|
fixed idea participation toString when submitting first meeting
|
2014-03-05 10:29:15 +01:00 |
|
Emil Siverhall
|
81e638d32f
|
fixed typo and added resource model for label on supervisor idea creation page
|
2014-03-05 09:56:51 +01:00 |
|
Emil Siverhall
|
a531598dca
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-05 09:43:16 +01:00 |
|
Emil Siverhall
|
7924fa2766
|
null check newSelection add remove students panel
|
2014-03-05 09:42:57 +01:00 |
|
Emil Siverhall
|
d4fc57f47f
|
changes to summary panel
|
2014-03-05 09:42:35 +01:00 |
|
leosu
|
331130d656
|
fixed outdated test
|
2014-03-05 09:23:02 +01:00 |
|
leosu
|
db7c8eff74
|
attachment icon
|
2014-03-05 09:20:27 +01:00 |
|
Emil Siverhall
|
4203449a80
|
some target issues
|
2014-03-05 08:32:21 +01:00 |
|
Richard
|
49fd24417d
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-04 17:56:30 +01:00 |
|
Richard
|
6d97fcfc66
|
Updated bootstrap glyphicons.
|
2014-03-04 17:56:07 +01:00 |
|
|
|
d39dc34ea0
|
Migrated user roles to enum.
|
2014-03-04 17:49:01 +01:00 |
|
|
|
f63d670af0
|
Removed EXTERNAL role.
|
2014-03-04 17:17:47 +01:00 |
|
|
|
b8800949eb
|
Migrating helper functions away from Employee.
|
2014-03-04 17:04:01 +01:00 |
|
Richard
|
993dcbbafd
|
Removed the use of icon user1.png. Replaced it with glyphicon-user.
|
2014-03-04 16:50:20 +01:00 |
|
|
|
915842d0d5
|
Moved Employee attributes to User.
|
2014-03-04 16:44:09 +01:00 |
|
|
|
8540edaa0c
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-04 16:39:34 +01:00 |
|
