|
|
96559097b9
|
Fixed UserImportWorker so that it updates existing users personal details.
|
2014-04-09 16:45:52 +02:00 |
|
|
|
8b0b881c9c
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-09 16:43:31 +02:00 |
|
|
|
9aa831219e
|
Fixed UserImportWorker so that it updates existing users personal details.
|
2014-04-09 16:43:24 +02:00 |
|
|
|
52a6f4eb63
|
Removed unused stuff.
|
2014-04-09 16:40:41 +02:00 |
|
Golrokh Moattar
|
f3d6ca9281
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-09 16:36:45 +02:00 |
|
Golrokh Moattar
|
20dce4e35f
|
GenericDataPanel used in Admin->Match->Ideas
|
2014-04-09 16:36:40 +02:00 |
|
Emil Siverhall
|
2004dac050
|
working links in forum without threads
|
2014-04-09 16:26:51 +02:00 |
|
Emil Siverhall
|
a9bfdeaaed
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-09 16:22:51 +02:00 |
|
Emil Siverhall
|
d68bbc79bc
|
test fix
|
2014-04-09 16:20:14 +02:00 |
|
|
|
10ba7e17c3
|
Changed DateFormatter to DateLabel.
|
2014-04-09 16:09:45 +02:00 |
|
Emil Siverhall
|
bae56a0ef5
|
don't show attachment panel before report is submitted
|
2014-04-09 16:09:08 +02:00 |
|
|
|
d026b2aea8
|
Changed DateFormatter to DateLabel.
|
2014-04-09 16:08:14 +02:00 |
|
|
|
ac0fe74323
|
Removed unused class.
|
2014-04-09 16:06:22 +02:00 |
|
|
|
92034c1954
|
Changed DateFormatter to DateLabel.
Other minor refactorings.
|
2014-04-09 16:05:29 +02:00 |
|
|
|
5d595486a0
|
Added constructor only taking id to enable model inheritance.
|
2014-04-09 16:04:28 +02:00 |
|
Emil Siverhall
|
e2d62ed668
|
file attachment on save instead of submit when handling opposition- and preliminary grading reports
|
2014-04-09 16:02:05 +02:00 |
|
|
|
41fbe2f1d0
|
Changed DateFormatter to DateLabel.
|
2014-04-09 16:00:32 +02:00 |
|
|
|
085dc38d00
|
Changed DateFormatter to DateLabel.
|
2014-04-09 15:59:59 +02:00 |
|
|
|
f1ef48ab21
|
Changed DateFormatter to DateLabel.
|
2014-04-09 15:59:30 +02:00 |
|
|
|
cb338c975b
|
Changed DateFormatter to DateLabel.
|
2014-04-09 15:58:42 +02:00 |
|
|
|
f5130583a2
|
Changed DateFormatter to DateLabel.
|
2014-04-09 15:56:48 +02:00 |
|
|
|
6e950bf792
|
Changed DateFormatter to DateLabel.
|
2014-04-09 15:56:41 +02:00 |
|
|
|
9c04d8c846
|
Changed DateFormatter to DateLabel.
|
2014-04-09 15:55:23 +02:00 |
|
|
|
a024448e1a
|
Changed DateFormatter to DateLabel.
|
2014-04-09 15:54:19 +02:00 |
|
|
|
90712a1e0d
|
Changed DateFormatter to DateLabel.
|
2014-04-09 15:52:24 +02:00 |
|
|
|
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 |
|
