|
|
c5393f6a9f
|
Changed DateFormatter to DateLabel.
|
2014-04-09 15:51:57 +02:00 |
|
|
|
9cd86e2dad
|
Changed DateFormatter to DateLabel.
|
2014-04-09 15:50:29 +02:00 |
|
|
|
ac1c422cfa
|
Changed DateFormatter to DateLabel.
|
2014-04-09 15:49:48 +02:00 |
|
|
|
9c8b7b65ac
|
Changed DateFormatter to DateLabel.
|
2014-04-09 15:48:54 +02:00 |
|
|
|
6c06584cdb
|
Changed DateFormatter to DateLabel.
|
2014-04-09 15:48:18 +02:00 |
|
|
|
4a7ce99a79
|
Changed DateFormatter to DateLabel.
|
2014-04-09 15:47:24 +02:00 |
|
|
|
895e84b241
|
Changed DateFormatter to DateLabel.
|
2014-04-09 15:46:44 +02:00 |
|
|
|
1339c5ab04
|
Changed DateFormatter to DateLabel.
|
2014-04-09 15:46:08 +02:00 |
|
|
|
768bbf16e6
|
Changed DateFormatter to DateLabel.
|
2014-04-09 15:45:19 +02:00 |
|
|
|
3bccec1984
|
Changed DateFormatter to DateLabel.
|
2014-04-09 15:44:34 +02:00 |
|
|
|
ffdbd0e0c5
|
Changed DateFormatter to DateLabel.
|
2014-04-09 15:43:53 +02:00 |
|
|
|
b9f39aac80
|
Changed DateFormatter to DateLabel.
|
2014-04-09 15:43:26 +02:00 |
|
|
|
763fdde1ee
|
Changed DateFormatter to DateLabel.
|
2014-04-09 15:41:25 +02:00 |
|
Golrokh Moattar
|
e51d36d1a3
|
GenericDataPanel used in Admin->Project management-> Projects
|
2014-04-09 15:40:57 +02:00 |
|
|
|
9e30e8ecbc
|
Changed DateFormatter to DateLabel.
|
2014-04-09 15:40:23 +02:00 |
|
|
|
fbe014f88c
|
Changed DateFormatter to DateLabel.
|
2014-04-09 15:37:37 +02:00 |
|
Golrokh Moattar
|
951f7c575a
|
Test class added for ProjectMyIdeaPanel
|
2014-04-09 15:24:21 +02:00 |
|
Golrokh Moattar
|
9b0d21241c
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-09 15:18:49 +02:00 |
|
Golrokh Moattar
|
5f86d22aa8
|
GenericDataPanel used in Admin->Project management-> Final seminars
|
2014-04-09 15:18:44 +02:00 |
|
Emil Siverhall
|
c285eef4b4
|
added second peer review event to milestone activator
|
2014-04-09 15:07:26 +02:00 |
|
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 |
|
Emil Siverhall
|
c48b719d2f
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-09 13:11:39 +02:00 |
|
Emil Siverhall
|
414da2b6c6
|
fixed saving of active participant state on final seminars
|
2014-04-09 13:11:28 +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 |
|
|
|
d16822788d
|
Refactoring.
|
2014-04-09 12:58:55 +02:00 |
|
|
|
9b275bfeeb
|
Permuated
|
2014-04-09 12:54:49 +02:00 |
|
|
|
f4ebf75a37
|
Task now holds a reference to its schedule rather than period directly.
|
2014-04-09 12:48:13 +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 |
|
fred-fri
|
b04387d278
|
working on transactions
|
2014-04-09 19:31:05 +09: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 |
|
|
|
2ed8a23a34
|
Refactoring.
|
2014-04-09 12:21:12 +02:00 |
|
|
|
fac068acc5
|
The scheduler now keeps track of running tasks.
|
2014-04-09 12:19:10 +02:00 |
|
|
|
1a7da89f18
|
Switched from int to long
|
2014-04-09 11:41:53 +02:00 |
|
