|
|
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 |
|
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 |
|
|
|
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 |
|
|
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
|
|
d00fb9718b
|
Added the concept of life-cycles to the Guice components.
|
2014-04-07 11:27:01 +02:00 |
|
|
|
546f05ea4b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-07 10:27:00 +02:00 |
|
|
|
49cce736ba
|
Clean up.
|
2014-04-07 10:26:50 +02:00 |
|
fred-fri
|
47a259232a
|
fixed remove bug
|
2014-04-06 14:40:21 +09:00 |
|
|
|
df3713d31d
|
Test fixes.
|
2014-04-05 23:47:00 +02:00 |
|
|
|
89c1627332
|
Fixed stuff.
|
2014-04-05 13:14:38 +02:00 |
|
|
|
33469cd866
|
Refactored AbstractWorker to work with providers instead of classes and an injector reference.
|
2014-04-04 16:31:44 +02:00 |
|
|
|
3c83bb9bad
|
Removed unnecessary class WorkerTimerTask.
|
2014-04-04 16:17:11 +02:00 |
|
|
|
d563db2e2c
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-04 15:53:51 +02:00 |
|
|
|
d1f70f215e
|
Made Scheduler a Guice-managed singleton.
|
2014-04-04 15:53:08 +02:00 |
|
Emil Siverhall
|
3eb6858d74
|
DisplayQuestionPanel simplified
|
2014-04-04 15:45:44 +02:00 |
|
Emil Siverhall
|
789bf2b0b6
|
ExpandableMultiLineLabel, thank you, goodbye
|
2014-04-04 14:33:37 +02:00 |
|
Emil Siverhall
|
4a10f579fb
|
added sso setting to Admin -> General settings
|
2014-04-04 14:20:26 +02:00 |
|
Emil Siverhall
|
1ef7c64e70
|
sso part of loginpage now displayed based on setting
|
2014-04-04 14:17:03 +02:00 |
|
Emil Siverhall
|
bf4b3bd55c
|
removed code that should display logged in users named based on Shibb header. Never worked..
|
2014-04-04 13:39:52 +02:00 |
|
Emil Siverhall
|
96ff5d20ef
|
bachelorCountDate and masterCountDate in GeneralSystemSettings haven't been used for years..
|
2014-04-04 13:20:21 +02:00 |
|
|
|
38e904e0d0
|
Added line-break.
|
2014-04-04 12:56:24 +02:00 |
|
Emil Siverhall
|
bd581ccd91
|
style changes
|
2014-04-04 12:55:09 +02:00 |
|
Emil Siverhall
|
c3661d1375
|
detach on deletion to update properly
|
2014-04-04 12:12:40 +02:00 |
|
Emil Siverhall
|
c6b1bee117
|
ViewAttachmentPanel shows date if datestyle is provided
|
2014-04-04 11:47:06 +02:00 |
|
Emil Siverhall
|
a551b9ea5b
|
deletion of current research plan implemented
|
2014-04-04 10:42:47 +02:00 |
|
|
|
40b8ade56a
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-04 09:49:38 +02:00 |
|
|
|
e18a3f9750
|
Fixed some Sonar issues.
|
2014-04-04 09:42:38 +02:00 |
|
