Emil Siverhall
|
d2172fb107
|
added unit tests for new project service and some minor bug fixes to problems that was found while testing.
|
2012-04-24 14:29:51 +02:00 |
|
Emil Siverhall
|
7d45ef87cd
|
Merge branch 'serviceFix' into develop
|
2012-04-24 11:34:19 +02:00 |
|
Emil Siverhall
|
12f889d818
|
added some missed implementation when filtering on author or title in a reviewer or co-supervisor role
|
2012-04-24 11:33:36 +02:00 |
|
Emil Siverhall
|
ccbd47cbf3
|
Merge branch 'latestReviewerLink' into develop
|
2012-04-24 10:31:44 +02:00 |
|
Emil Siverhall
|
9eb276c4fc
|
changes to latest reviewer panel to make the links work for both students and supervisor with correct redirects
|
2012-04-24 10:31:27 +02:00 |
|
Emil Siverhall
|
1c5956f3c4
|
Merge branch 'projectServiceFix' into develop
|
2012-04-24 09:08:21 +02:00 |
|
Emil Siverhall
|
b657122e24
|
small fix on project service to make it return empty lists if not the correct role is found
|
2012-04-24 09:08:08 +02:00 |
|
Emil Siverhall
|
cede90a29c
|
Merge branch 'supervisorPeerMyProjects' into develop
|
2012-04-24 08:55:43 +02:00 |
|
fred-fri
|
9ef9bd2d93
|
finished adding all settings
|
2012-04-24 14:56:55 +09:00 |
|
fred-fri
|
8c477fefdd
|
added final seminar thesis and opposition uploaded settings
|
2012-04-24 14:18:01 +09:00 |
|
fred-fri
|
c1663468c5
|
added final seminar created and edited settings
|
2012-04-24 14:12:51 +09:00 |
|
fred-fri
|
08e70d54cc
|
added conference comment setting
|
2012-04-24 14:03:32 +09:00 |
|
fred-fri
|
02b459b740
|
added all settings to notificationsettings entity
|
2012-04-24 13:57:47 +09:00 |
|
fred-fri
|
bccc90ff88
|
priority setting is not enabled when boolean is false
|
2012-04-24 13:50:20 +09:00 |
|
fred-fri
|
bfdd21dd2b
|
added new setting to page, everything works. should setenabled false when boolean is false though
|
2012-04-24 13:46:55 +09:00 |
|
fred-fri
|
23a5af7caa
|
ajaxdropdown works
|
2012-04-24 13:26:31 +09:00 |
|
fred-fri
|
e1b23659ea
|
added markup for ajaxdropdown
|
2012-04-24 13:21:29 +09:00 |
|
fred-fri
|
d4697110e6
|
ajaxdropdown class created
|
2012-04-24 13:20:16 +09:00 |
|
fred-fri
|
1318478e03
|
singleton notificationsettings loaded
|
2012-04-24 12:51:31 +09:00 |
|
fred-fri
|
0f2a2e972c
|
added page for notification settings
|
2012-04-24 12:44:08 +09:00 |
|
fred-fri
|
decbb1e5cf
|
added enum explanation to supervisor profile gui
|
2012-04-24 12:36:30 +09:00 |
|
fred-fri
|
de620dbcee
|
changing the enum
|
2012-04-24 12:26:13 +09:00 |
|
fred-fri
|
d211d1fc3c
|
changing the enum
|
2012-04-24 12:26:05 +09:00 |
|
fred-fri
|
c0a170e022
|
added repo and service layer
|
2012-04-24 12:22:32 +09:00 |
|
fred
|
18318813a5
|
created entity
|
2012-04-24 12:14:57 +09:00 |
|
Emil Siverhall
|
bca6abc1ca
|
small fix when someone without student role tries to access the author tab. not sure if someone without author role should be able to see the tab though
|
2012-04-23 16:18:58 +02:00 |
|
Emil Siverhall
|
0d1d8eb368
|
code cleanup and deletion of peer info panel that is no longer used
|
2012-04-23 16:18:56 +02:00 |
|
Emil Siverhall
|
ae721660ec
|
queryinit annotation on peerreview domain object to make 2nd level querydsl expression work
|
2012-04-23 16:18:54 +02:00 |
|
Emil Siverhall
|
096d6ea2c3
|
new details panel added for the supervisor - peer - my projects page. a new list of projects that looks like mockups. language filtering is not implemented since this probably isnt the first place to that on
|
2012-04-23 16:18:51 +02:00 |
|
Emil Siverhall
|
ecdcd35c84
|
added new repos, services and implementations for peer reviews and peer requests. methods that is being used in supervisor peer my projects is added as well
|
2012-04-23 16:16:54 +02:00 |
|
Emil Siverhall
|
d84375ceb4
|
created new panel for supervisor peer project details since the two that were used before needed major refactoring
|
2012-04-23 16:16:52 +02:00 |
|
Emil Siverhall
|
9384cf8b31
|
some improvements to author auto complete when field is cleared after previous input
|
2012-04-23 16:16:48 +02:00 |
|
Emil Siverhall
|
6d9ef10700
|
added filtering on authors and free text search on project title to supervisor-peer-my projects
|
2012-04-23 16:16:46 +02:00 |
|
Emil Siverhall
|
809a2c0ee4
|
added new service methods and a few repos
|
2012-04-23 16:16:44 +02:00 |
|
Emil Siverhall
|
035c2fab84
|
started with refactoring of supervisor peer my projects. code restructuring, more filtering and use of new repos
|
2012-04-23 16:16:41 +02:00 |
|
Niklas Herder
|
fb16361754
|
Skeleton for rest testing
|
2012-04-23 14:29:14 +02:00 |
|
Niklas Herder
|
0c20a6961f
|
Add jersey-json dependency, eliminate duplicate deps for jackson.
|
2012-04-23 14:28:15 +02:00 |
|
Emil Siverhall
|
5f56def98c
|
Merge branch 'cleanup' into develop
* cleanup:
removed unnecessary sys out printlines that filled up the logs
|
2012-04-22 21:30:53 +02:00 |
|
Emil Siverhall
|
3eddc8693e
|
removed unnecessary sys out printlines that filled up the logs
|
2012-04-22 21:30:25 +02:00 |
|
Fredrik Friis
|
f9e32cd0ee
|
added supervisor interest to watsonpanel
|
2012-04-20 12:21:08 +09:00 |
|
Fredrik Friis
|
3894652cb6
|
changed wording of match status
|
2012-04-20 11:42:01 +09:00 |
|
Fredrik Friis
|
f15588f724
|
new update db file
|
2012-04-20 10:52:49 +09:00 |
|
Fredrik Friis
|
6692d65585
|
Merge branch 'css' into develop
|
2012-04-20 10:27:51 +09:00 |
|
Fredrik Friis
|
566c6672f4
|
use same background header as in footer
|
2012-04-19 15:37:00 +09:00 |
|
Fredrik Friis
|
521743a4ce
|
changed span-22s to span-24s except in css files
|
2012-04-19 15:34:54 +09:00 |
|
Emil Siverhall
|
1982879115
|
Merge branch 'importRoleFix' into develop
* importRoleFix:
small bug fix when translating between participant dto and project member
|
2012-04-18 19:33:44 +02:00 |
|
Emil Siverhall
|
0263ac39ad
|
small bug fix when translating between participant dto and project member
|
2012-04-18 19:33:18 +02:00 |
|
Fredrik Friis
|
b1d0e8fa9c
|
added space to admin pages to they dont flow into the menu
|
2012-04-18 15:24:56 +09:00 |
|
Fredrik Friis
|
ee349627b7
|
added some spaces to supervisor pages so they dont flow into menu
|
2012-04-18 15:21:33 +09:00 |
|
Fredrik Friis
|
5ea685e224
|
added space back under peer-title
|
2012-04-18 15:13:00 +09:00 |
|