|
|
a38628fb71
|
Renamed enum value from ABORTED to TIMED_OUT to better reflect what it actually means.
|
2013-11-28 09:52:07 +01:00 |
|
Leo
|
baf22a512f
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-28 09:44:19 +01:00 |
|
Leo
|
b538341840
|
ignore tests for jenkins
|
2013-11-28 09:43:10 +01:00 |
|
|
|
9ad51fa9eb
|
Renamed stupid panel.
|
2013-11-28 09:34:54 +01:00 |
|
Emil Siverhall
|
5e1f293fc9
|
feedback message when updating users
|
2013-11-28 09:01:46 +01:00 |
|
fred-fri
|
c831a3000a
|
set maximum
|
2013-11-28 16:55:48 +09:00 |
|
fred-fri
|
6866c8348d
|
tests
|
2013-11-28 16:51:15 +09:00 |
|
fred-fri
|
889bf111f5
|
cleanup
|
2013-11-28 16:44:58 +09:00 |
|
fred-fri
|
e14f3a14ec
|
fixes
|
2013-11-28 16:39:23 +09:00 |
|
Emil Siverhall
|
d6ddfcb1a4
|
update username instead of delete/create
|
2013-11-28 08:33:17 +01:00 |
|
Emil Siverhall
|
b0019fb832
|
make sure we can't edit users with external identifiers
|
2013-11-28 08:22:27 +01:00 |
|
fred-fri
|
d28343b57d
|
blabla
|
2013-11-28 16:14:52 +09:00 |
|
fred-fri
|
6a33dd8eaf
|
adding stuff
|
2013-11-28 15:36:51 +09:00 |
|
fred-fri
|
348645d952
|
fixes
|
2013-11-28 15:28:58 +09:00 |
|
fred-fri
|
4f21be7075
|
fixes
|
2013-11-28 15:28:40 +09:00 |
|
fred-fri
|
7a36a5da40
|
fixes
|
2013-11-28 15:11:27 +09:00 |
|
fred-fri
|
6271d8a22b
|
builders
|
2013-11-28 15:03:09 +09:00 |
|
fred-fri
|
aba91231d3
|
added maxpoints attribute
|
2013-11-28 14:07:08 +09:00 |
|
fred-fri
|
8fa22b3046
|
added info
|
2013-11-28 13:47:05 +09:00 |
|
Emil Siverhall
|
408bdf8b8b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-27 17:10:53 +01:00 |
|
Emil Siverhall
|
fcb403ede7
|
test fix
|
2013-11-27 17:10:37 +01:00 |
|
|
|
48859c8708
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-27 17:07:24 +01:00 |
|
|
|
662f8d86b9
|
Moved PeerPortal interface and its implementation.
|
2013-11-27 17:07:20 +01:00 |
|
Leo
|
03c34cb98d
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-27 17:04:15 +01:00 |
|
|
|
56b2edc3b9
|
Renamed PeerPortalController to PeerPortal. Technical stuff should not be in interface names.
|
2013-11-27 17:03:23 +01:00 |
|
|
|
a0f67b9ee0
|
Created submitReview(PeerReview) functionality for PeerPortalController.
|
2013-11-27 17:02:25 +01:00 |
|
Leo
|
f571154410
|
added a "/" to the start of the searchPath in recursive search
|
2013-11-27 16:57:00 +01:00 |
|
Emil Siverhall
|
7727bdb1e4
|
update of username for internal users
|
2013-11-27 16:54:56 +01:00 |
|
Richard
|
0c47ba787e
|
Styling of roles page.
|
2013-11-27 16:53:10 +01:00 |
|
Leo
|
7472dc873e
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-27 16:51:52 +01:00 |
|
Leo
|
72953480e3
|
removed FileRepositoryManager from FileDescriptionServiceImpl
|
2013-11-27 16:51:41 +01:00 |
|
Leo
|
144ed083d4
|
new implementation for searchFiles
|
2013-11-27 16:50:39 +01:00 |
|
Richard
|
6bdcb41497
|
Changed styling of feedback panels
|
2013-11-27 16:23:59 +01:00 |
|
niklas3
|
ef76312d12
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-27 15:53:53 +01:00 |
|
niklas3
|
de3e1a91e6
|
Opposition and participation in project now lists the name and role of each project author.
|
2013-11-27 15:53:50 +01:00 |
|
Leo
|
36e9163cd2
|
moved sortFolders
|
2013-11-27 15:46:37 +01:00 |
|
Leo
|
88c84b314b
|
added tests to FileDescriptionServiceImpl
|
2013-11-27 15:37:01 +01:00 |
|
Leo
|
3cc486b73f
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-27 15:19:46 +01:00 |
|
Leo
|
8509143592
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-27 15:14:29 +01:00 |
|
Leo
|
7f0998d6ef
|
fixed tests broken by refactoring
|
2013-11-27 15:14:14 +01:00 |
|
Emil Siverhall
|
822944cb74
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-27 15:14:13 +01:00 |
|
Emil Siverhall
|
76779de3e3
|
page mount
|
2013-11-27 15:13:59 +01:00 |
|
Emil Siverhall
|
3586f01e01
|
basic user editing for internal users
|
2013-11-27 15:05:49 +01:00 |
|
|
|
9716ad3412
|
Added filter to only show internal users under Admin / Users / Roles.
|
2013-11-27 14:39:30 +01:00 |
|
Leo
|
b4a781d63f
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-27 13:49:43 +01:00 |
|
Leo
|
e5e8bc676d
|
moved methods from FileRepo to FileDescService
|
2013-11-27 13:49:08 +01:00 |
|
Richard
|
955441649c
|
Removed <br> tags in information text about cancelled seminars.
Changed font-size on final seminar titles on the final seminar page.
|
2013-11-27 12:51:08 +01:00 |
|
Leo
|
8f095c3099
|
*Added tests to FileDescriptionService
*Removed unused methods
|
2013-11-27 12:48:57 +01:00 |
|
niklas3
|
1662986d6a
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-27 12:16:45 +01:00 |
|
niklas3
|
5aa8993d1c
|
Final seminar details now displays the project title.
|
2013-11-27 12:16:41 +01:00 |
|
