Richard
|
dae2557f9f
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-10 10:24:01 +02:00 |
|
Richard
|
79e54aed5d
|
Added new help-box div.
Added the help-box div to DepartmentServicePanel.
|
2014-04-10 10:23:53 +02:00 |
|
fred-fri
|
9e779f30be
|
missing stuff
|
2014-04-10 17:04:30 +09:00 |
|
fred-fri
|
b761a789b0
|
added budget module and annotated relevant components
|
2014-04-10 16:50:40 +09:00 |
|
fred-fri
|
84567189c5
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-10 16:45:47 +09:00 |
|
fred-fri
|
e02e877bd7
|
date fix
|
2014-04-10 16:45:29 +09:00 |
|
|
|
85c5375d11
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-10 09:35:31 +02:00 |
|
|
|
9b77dac996
|
Fixed critical security exploit. No longer possible to create sys-admin users at any point by going to the url leading to the FirstTimeRegistrationPage.
|
2014-04-10 09:35:12 +02:00 |
|
Richard
|
b70ac8da83
|
Added overview-box to DepartmentServicePanel.
Moved DepartmentService below upcoming activities.
|
2014-04-10 09:30:15 +02:00 |
|
fred-fri
|
5f29c69867
|
date fix
|
2014-04-10 15:29:08 +09:00 |
|
fred-fri
|
87a28205a4
|
us visa style info
|
2014-04-10 14:31:48 +09:00 |
|
fred-fri
|
2d44f5d979
|
sonar
|
2014-04-10 12:16:51 +09:00 |
|
fred-fri
|
d0d67b2401
|
sonar
|
2014-04-10 12:15:59 +09:00 |
|
fred-fri
|
fbbe65770f
|
sonar
|
2014-04-10 12:13:38 +09:00 |
|
fred-fri
|
d5f733757c
|
sonar
|
2014-04-10 12:06:26 +09:00 |
|
fred-fri
|
931e12d07a
|
sonar
|
2014-04-10 11:54:22 +09:00 |
|
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 |
|
|
|
8b0b881c9c
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-09 16:43:31 +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 |
|
