Golrokh Moattar
|
dc00210260
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-08 17:45:21 +02:00 |
|
Golrokh Moattar
|
5d471999f5
|
GenericDataPanel used in Supervisor->Reviewing->Final seminar preliminary grading report and Examiner->Examining->Final seminar preliminary grading report
|
2014-04-08 17:45:14 +02:00 |
|
Emil Siverhall
|
1be4924511
|
fixed test
|
2014-04-08 17:44:58 +02:00 |
|
Emil Siverhall
|
0ce0143630
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-08 17:17:10 +02:00 |
|
Emil Siverhall
|
40a4813a69
|
feedback on correct place in research plan panel
|
2014-04-08 17:10:38 +02:00 |
|
Golrokh Moattar
|
524f046d80
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-08 17:09:16 +02:00 |
|
Golrokh Moattar
|
e9bd729fae
|
GenericDataPanel used in Supervisor->Reviewing->Final seminar preliminary grading report and Examiner->Examining->Final seminar preliminary grading report
|
2014-04-08 17:08:45 +02:00 |
|
Emil Siverhall
|
b00a5ee696
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-08 17:03:05 +02:00 |
|
Emil Siverhall
|
f6975e68fa
|
display
|
2014-04-08 17:02:30 +02:00 |
|
Emil Siverhall
|
cfe6257664
|
test
|
2014-04-08 16:59:33 +02:00 |
|
Emil Siverhall
|
d78de35209
|
2 x department service panels
|
2014-04-08 16:50:20 +02:00 |
|
|
|
b0625753e9
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-08 16:46:11 +02:00 |
|
|
|
eb6fe5f62a
|
Renamed class to reflect its new purpose.
|
2014-04-08 16:46:01 +02:00 |
|
|
|
caae63a700
|
Minor cleaning.
|
2014-04-08 16:45:36 +02:00 |
|
|
|
f0e097ba64
|
Scheduler/GuiceWebApplication is no longer responsible for scheduling workers. It is now done by the temporary (yeah right) TemporaryWorkerScheduler.
|
2014-04-08 16:44:35 +02:00 |
|
Emil Siverhall
|
6c794a1425
|
obladi oblada
|
2014-04-08 16:33:18 +02:00 |
|
Golrokh Moattar
|
0a68951c27
|
GenericDataPanel2 to GenericDataPanel & GenericDataPanel to GenericDataPanel_
|
2014-04-08 16:32:08 +02:00 |
|
Golrokh Moattar
|
88e677413f
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-08 16:27:54 +02:00 |
|
Golrokh Moattar
|
bd4f3ce970
|
GenericDataPanel used in Supervisor->MyProject-> Opposition & Active participations
|
2014-04-08 16:27:35 +02:00 |
|
|
|
737dd6026b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-08 15:50:12 +02:00 |
|
|
|
7310ff6b59
|
Moved the project exporter and user bulk import to the daisy-integration module.
|
2014-04-08 15:38:43 +02:00 |
|
|
|
33a5096ce9
|
Removed all the static stuff that was left in the Scheduler and hid the implementation behind an interface.
|
2014-04-08 15:26:53 +02:00 |
|
Golrokh Moattar
|
be5b87a1e1
|
GenericDataPanel used in Supervisor->MyProject-> Files
|
2014-04-08 15:02:08 +02:00 |
|
Golrokh Moattar
|
760964291a
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-08 14:51:15 +02:00 |
|
Golrokh Moattar
|
c801597c4a
|
bootstrap styling on navigations
|
2014-04-08 14:51:07 +02:00 |
|
|
|
5a4c8b8dfc
|
Moved worker-related stuff to core.
|
2014-04-08 14:16:41 +02:00 |
|
Emil Siverhall
|
b065de67e2
|
removed feedback from page and added department service panel (visibility based on module settings)
|
2014-04-08 13:58:40 +02:00 |
|
Emil Siverhall
|
31a6da8e90
|
feedback for department service panel
|
2014-04-08 13:57:13 +02:00 |
|
|
|
63bf727ece
|
Cleaning.
|
2014-04-08 13:50:17 +02:00 |
|
|
|
38acd2b571
|
Made it possible for outside components to schedule workers.
It should not be the schedulers responsibility to schedule them all, just running them on schedule.
|
2014-04-08 13:43:33 +02:00 |
|
Emil Siverhall
|
68e1aa612b
|
list all department services
|
2014-04-08 13:17:01 +02:00 |
|
|
|
0d8fb19459
|
Removed unused field.
|
2014-04-08 12:30:06 +02:00 |
|
|
|
2cabfada93
|
Fixed Wicket to use DEPLOYMENT when in production mode.
|
2014-04-08 12:29:15 +02:00 |
|
|
|
c9f02ead54
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-08 12:06:40 +02:00 |
|
|
|
04556971e3
|
Fixed Wicket to use DEPLOYMENT when in production mode.
|
2014-04-08 12:06:28 +02:00 |
|
Emil Siverhall
|
75bf466ee1
|
department_service module added
|
2014-04-08 10:05:21 +02:00 |
|
Golrokh Moattar
|
5fe83f890e
|
in SupervisorMyProjectsPanel, GenericDataPanel changed to GenericDataPanel2
|
2014-04-07 17:19:19 +02:00 |
|
Golrokh Moattar
|
bfd9830ffa
|
In DataTable: Rows per page should be always visible but pagination should be visible only if there is more than one page
|
2014-04-07 16:57:20 +02:00 |
|
Emil Siverhall
|
a8d37dc63f
|
feedback when saving department service
|
2014-04-07 16:44:13 +02:00 |
|
Emil Siverhall
|
b67adefaea
|
no current label visibility
|
2014-04-07 16:34:24 +02:00 |
|
Emil Siverhall
|
3424ecc56a
|
basic styling
|
2014-04-07 16:27:18 +02:00 |
|
Emil Siverhall
|
73f6bfd2b6
|
DateTimeField -> DateField
|
2014-04-07 15:24:30 +02:00 |
|
Golrokh Moattar
|
300aae4e48
|
In DataTable: Rows per page should be always visible but pagination should be visible only if there is more than one page
|
2014-04-07 15:16:47 +02:00 |
|
Emil Siverhall
|
55cc94d702
|
implemented service method
|
2014-04-07 14:34:54 +02:00 |
|
Golrokh Moattar
|
c18b6bfc99
|
Added Download as Excel to the dataTable - bottom toolbar
|
2014-04-07 13:48:42 +02:00 |
|
|
|
1a878ceccb
|
Uses GuiceWebApplicationFactory to create the wicket application to enable transparent injection.
|
2014-04-07 13:02:25 +02:00 |
|
Emil Siverhall
|
a9866c1661
|
basic form implementations
|
2014-04-07 13:00:29 +02:00 |
|
Golrokh Moattar
|
e3f44bfa3b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-07 12:42:12 +02:00 |
|
|
|
d11e2023ed
|
Renamed class to better reflect what it does.
|
2014-04-07 12:23:53 +02:00 |
|
|
|
93c05a7e78
|
Removed some unnecessary mocks.
|
2014-04-07 11:28:56 +02:00 |
|
