Golrokh Moattar
|
7f71526ea7
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-09 14:54:57 +02:00 |
|
Emil Siverhall
|
204fa6a59f
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-09 14:13:45 +02:00 |
|
Emil Siverhall
|
4f5f4a9a4d
|
info dialog in department service header, explaning gru need to approve
|
2014-04-09 14:13:34 +02:00 |
|
Golrokh Moattar
|
dd0a2d3434
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-09 14:06:41 +02:00 |
|
Golrokh Moattar
|
c3b3269f1a
|
removed property file since we get warnings: Tried to retrieve a localized string for a component that has not yet been added to the page. This can sometimes lead to an invalid or no localized resource returned. Make sure you are not calling Component#getString() inside your Component's constructor.
|
2014-04-09 14:06:30 +02:00 |
|
Golrokh Moattar
|
30442f4719
|
GenericDataPanel used in Author->Ideas->My idea
|
2014-04-09 13:58:19 +02:00 |
|
fred-fri
|
e326d14b20
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-09 20:56:01 +09:00 |
|
fred-fri
|
9583543767
|
working on transactions
|
2014-04-09 20:54:47 +09:00 |
|
fred-fri
|
8b11facb6d
|
working on transactions
|
2014-04-09 20:37:58 +09:00 |
|
|
|
0845bd9bf4
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-09 13:35:19 +02:00 |
|
|
|
ca904c5705
|
Changed DateFormatter to DateLabel.
|
2014-04-09 13:34:47 +02:00 |
|
Emil Siverhall
|
43c8ec7d30
|
property for hours.required
|
2014-04-09 13:23:57 +02:00 |
|
|
|
4f9247d2c9
|
Changed Worker interface to fit our actual worker needs. Used the Worker interface instead of AbstractWorker everywhere.
|
2014-04-09 13:20:54 +02:00 |
|
Emil Siverhall
|
ec5aec9e73
|
make sure submission form is visible when form validation fails
|
2014-04-09 13:19:39 +02:00 |
|
|
|
f5a1dec19f
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-09 13:03:19 +02:00 |
|
Emil Siverhall
|
d0b0d12ae6
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-09 13:00:29 +02:00 |
|
fred-fri
|
c8caab2e64
|
working on transactions
|
2014-04-09 19:45:06 +09:00 |
|
Emil Siverhall
|
968e7c533d
|
hide/show all link only visible if previous exists
|
2014-04-09 12:34:16 +02:00 |
|
|
|
85c2751e43
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-09 12:30:27 +02:00 |
|
fred-fri
|
d1cc8ab1c7
|
working on transactions
|
2014-04-09 19:25:26 +09:00 |
|
|
|
7f0eabbccb
|
Removed the generic parameter from Task.
|
2014-04-09 12:22:47 +02:00 |
|
Golrokh Moattar
|
92263a1817
|
test problem fixed
|
2014-04-09 11:41:51 +02:00 |
|
Golrokh Moattar
|
f976d14527
|
test problem fixed
|
2014-04-09 11:34:24 +02:00 |
|
Emil Siverhall
|
45728452b6
|
deletion of service objects implemented
|
2014-04-09 11:06:55 +02:00 |
|
Emil Siverhall
|
79b857bfb2
|
cleanup
|
2014-04-09 10:47:41 +02:00 |
|
Emil Siverhall
|
bc5f165207
|
feedback fix
|
2014-04-09 10:35:31 +02:00 |
|
|
|
d3e3c20a7f
|
Refactored so that Scheduler exposes Tasks, not AbstractWorker.
|
2014-04-09 10:13:49 +02:00 |
|
|
|
400ea78dcc
|
Manually starting tasks is now done via the scheduler.
|
2014-04-09 09:55:10 +02:00 |
|
|
|
275ae7afab
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-09 09:51:31 +02:00 |
|
Emil Siverhall
|
d22696ee77
|
buttons now work fine with more than one participant
|
2014-04-09 09:46:42 +02:00 |
|
Richard
|
0ac513c65a
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-09 09:37:13 +02:00 |
|
Richard
|
b161aa0674
|
Added new SciPro Projects header.
Changed title to SciPro Projects, DSV
|
2014-04-09 09:35:55 +02:00 |
|
|
|
c184fcb464
|
Renamed WorkerSchedule to Task
|
2014-04-09 09:30:23 +02:00 |
|
Emil Siverhall
|
02a6b86449
|
added department service panel to supervisor view as well
|
2014-04-09 08:59:16 +02:00 |
|
fred-fri
|
e1fe56abf0
|
creating transaction entity
|
2014-04-09 13:00:11 +09:00 |
|
Emil Siverhall
|
84f37d9181
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-08 19:53:14 +02:00 |
|
Emil Siverhall
|
458be4486a
|
local feedback in study plan panel
|
2014-04-08 19:53:04 +02:00 |
|
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 |
|
