fred-fri
|
2a9a0bd609
|
Merge branch 'release20130405'
20130405
|
2013-04-05 13:57:27 +09:00 |
|
fred-fri
|
bcd7c64e21
|
added new db file
|
2013-04-05 13:57:08 +09:00 |
|
Emil Siverhall
|
37dcf999c8
|
Merge branch 'meeting_fix' into develop
|
2013-04-02 23:21:53 +02:00 |
|
Emil Siverhall
|
d1e9d784e0
|
supervisors may now create first meeting on ideas with status completed as well..
|
2013-04-02 23:16:42 +02:00 |
|
|
635fbc10fa
|
Attempt to fix transitive dependencies involving jackrabbit/rome/jdom (Attempt #2)
|
2013-03-27 15:48:10 +01:00 |
|
|
16793fdf75
|
Attempt to fix transitive dependencies involving jackrabbit/rome/jdom
|
2013-03-27 15:36:00 +01:00 |
|
Emil Siverhall
|
41347715a0
|
Merge branch 'autocomplete_fix' into develop
|
2013-03-27 11:02:56 +01:00 |
|
Emil Siverhall
|
938f14e8da
|
fixed auto complete bug, first selection is no longer autosuggested since this didnt work good with using key arrows
|
2013-03-27 10:55:52 +01:00 |
|
Emil Siverhall
|
73539151dc
|
Merge branch 'examiner' into develop
|
2013-03-26 13:04:59 +01:00 |
|
Emil Siverhall
|
ee9e18c3fc
|
text fix
|
2013-03-26 12:56:10 +01:00 |
|
Emil Siverhall
|
7f796118ae
|
thesis review upload panel is hidden if no final seminar thesis is uploaded
|
2013-03-26 12:56:08 +01:00 |
|
Emil Siverhall
|
262ec2bfed
|
examiners may now select between my reviews and available seminars
|
2013-03-26 12:56:06 +01:00 |
|
Emil Siverhall
|
356ef30d1f
|
test changes and added Not enabled text when entering page without thesis reviews enabled on the application
|
2013-03-26 12:56:04 +01:00 |
|
Emil Siverhall
|
953a5c004f
|
radio choice renderer now uses string resource models
|
2013-03-26 12:56:02 +01:00 |
|
Emil Siverhall
|
d311aa46ed
|
added filtering on taken/available seminars to review
|
2013-03-26 12:56:00 +01:00 |
|
Emil Siverhall
|
4f31cc2460
|
added a custom ajax radio choice component
|
2013-03-26 12:55:58 +01:00 |
|
Emil Siverhall
|
7c15a7bfe4
|
text fixes
|
2013-03-26 12:55:55 +01:00 |
|
Emil Siverhall
|
ed92fe68d5
|
added sql for adding examiner to final seminar
|
2013-03-26 12:55:53 +01:00 |
|
Emil Siverhall
|
643b59be58
|
only show examiner deadline info if we're in examinerView
|
2013-03-26 12:55:51 +01:00 |
|
Emil Siverhall
|
6dd3d89087
|
only the seminar examiner may open review upload dialog
|
2013-03-26 12:55:48 +01:00 |
|
Emil Siverhall
|
36895556b6
|
show correct review date if existing
|
2013-03-26 12:55:46 +01:00 |
|
Emil Siverhall
|
aa41534d2e
|
added examiner to list of thesis reviewers
|
2013-03-26 12:55:44 +01:00 |
|
Emil Siverhall
|
f3baeb7d70
|
added no examiner text if a sysadmin enters the page
|
2013-03-26 12:55:42 +01:00 |
|
Emil Siverhall
|
26fdf12744
|
adding components to dialog panel
|
2013-03-26 12:55:39 +01:00 |
|
Emil Siverhall
|
7c849f6fd6
|
added addExaminer method to seminarService and some panel refactoring
|
2013-03-26 12:55:37 +01:00 |
|
Emil Siverhall
|
a0f70642d4
|
repo and service for examiners
|
2013-03-26 12:55:35 +01:00 |
|
Emil Siverhall
|
1cd047d178
|
added confirmation to review button and some new constructors to use with string resource models
|
2013-03-26 12:55:33 +01:00 |
|
Emil Siverhall
|
782a41ee89
|
added dialog for examiners to add thesis reviews
|
2013-03-26 12:55:30 +01:00 |
|
Emil Siverhall
|
b5804eefa0
|
implementation for review deadline and reviewed date columns added
|
2013-03-26 12:55:28 +01:00 |
|
Emil Siverhall
|
f9c2671f52
|
added examiner to a final seminar
|
2013-03-26 12:55:26 +01:00 |
|
Emil Siverhall
|
09af344cb3
|
added examiner review panel with datatable with the seminars.
|
2013-03-26 12:55:24 +01:00 |
|
Emil Siverhall
|
c5160fe602
|
added page structure for examiner pages
|
2013-03-26 12:55:21 +01:00 |
|
|
3f5f2f79c6
|
Generic data table excel link is now text instead of an arrow icon
|
2013-03-22 17:01:10 +01:00 |
|
|
3c8e02ad9c
|
Removed requester as an author member of peer requests to prevent double notifications if they are turned on for both requester and author types.
|
2013-03-22 15:48:04 +01:00 |
|
|
895b2db863
|
Removed new method since it is no longer needed
|
2013-03-22 15:48:04 +01:00 |
|
|
baccbaa50d
|
Expired request worker uses landing pages for peer requests.
Peer requests are now marked cancelled instead of deleted when they expire.
|
2013-03-22 15:48:04 +01:00 |
|
|
81acb5d13d
|
Landing page for peer request urls
|
2013-03-22 15:48:04 +01:00 |
|
|
cd5c2845a6
|
Added method to specify a custom id when generating URLs to get around the problem of deletion.
|
2013-03-22 15:48:04 +01:00 |
|
|
38bde216d1
|
Refactored landing pages to use the new membership interface.
|
2013-03-22 15:48:03 +01:00 |
|
|
226c71d7d6
|
Introduced new interface for getMembers()
|
2013-03-22 15:48:03 +01:00 |
|
Emil Siverhall
|
f36add57b3
|
Merge branch 'activity_plan' into develop
|
2013-03-22 14:29:52 +01:00 |
|
Emil Siverhall
|
88b8b4d8ed
|
we now make sure that the activity plan is refreshed on new file upload, using ajax to keep current filters
|
2013-03-22 14:28:09 +01:00 |
|
Emil Siverhall
|
11b2bc0528
|
label alignments on activity plan radio choices
|
2013-03-22 14:22:54 +01:00 |
|
|
71d48cdf4d
|
Stupid test should never fail now.
|
2013-03-22 12:44:34 +01:00 |
|
|
33a6ba4ff4
|
Merge branch 'release20130322'
20130322
|
2013-03-22 11:14:04 +01:00 |
|
|
77b8795097
|
Archived SQL changes.
|
2013-03-22 11:12:50 +01:00 |
|
|
8607825376
|
With ExporterFacade having a dependency on ExternalImporter an implementation of that interface is required in test context. Added no-op implementation.
|
2013-03-22 10:42:42 +01:00 |
|
|
cde0024b96
|
Changed java message format from %d to {0}
|
2013-03-22 10:25:13 +01:00 |
|
|
39da009a94
|
Added filtering component for reviewer assigned
|
2013-03-22 10:25:13 +01:00 |
|
|
8367d00b6a
|
Added filter params for reviewer assigned
|
2013-03-22 10:25:13 +01:00 |
|