fred-fri
|
0942a2bce4
|
title change
|
2014-04-10 11:10:21 +09:00 |
|
Golrokh Moattar
|
99064df9c3
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-09 17:33:21 +02:00 |
|
Golrokh Moattar
|
05b64bc3fb
|
GenericDataPanel used in Admin->Match->Keywords & research areas
|
2014-04-09 17:33:16 +02:00 |
|
|
|
36326acc66
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-09 17:28:37 +02:00 |
|
|
|
fc7449f064
|
Pushed deprecated annotation.
|
2014-04-09 17:28:32 +02:00 |
|
|
|
83ae64ebbf
|
Changed DateFormatter to DateLabel.
|
2014-04-09 17:24:44 +02:00 |
|
|
|
5e44d178aa
|
Changed DateFormatter to DateLabel.
|
2014-04-09 17:21:42 +02:00 |
|
|
|
abf9f6e989
|
Changed DateFormatter to DateLabel.
|
2014-04-09 17:21:23 +02:00 |
|
|
|
7a191589dc
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-09 17:20:55 +02:00 |
|
|
|
9c2d368308
|
Changed DateFormatter to DateLabel.
|
2014-04-09 17:20:24 +02:00 |
|
|
|
5087be5f5e
|
Changed DateFormatter to DateLabel and other minor things.
Also wtf? Holy null-check-batman
|
2014-04-09 17:20:05 +02:00 |
|
Golrokh Moattar
|
f86f346291
|
GenericDataPanel used in Admin->Match->Keywords & research areas
|
2014-04-09 17:13:45 +02:00 |
|
Golrokh Moattar
|
31438beb6e
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-09 16:56:48 +02:00 |
|
Golrokh Moattar
|
a73a554274
|
There no export link in the AdminIdeaOverviewPanel, the export should be done by dataTable's export link
|
2014-04-09 16:56:40 +02:00 |
|
|
|
c5ce649ef0
|
Changed DateFormatter to DateLabel and other minor things.
|
2014-04-09 16:54:58 +02:00 |
|
|
|
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 |
|
