6246 Commits

Author SHA1 Message Date
f75e40ccd7 Fixed lazy exception when opening user profile dialogs in the add multiple user panel.
This class sucks and is the embodiment of evil stateful yuck.
2014-12-02 13:44:05 +01:00
golrokh
697cca2849 added number of unread posts' badge in interact with supervisor tab 2014-12-02 13:31:22 +01:00
563cbc3780 Fixed potential lazy exception (could not reproduce myself). 2014-12-02 13:18:32 +01:00
fred-fri
884322dd46 Merge branch 'grade' into develop 2014-12-02 19:13:09 +09:00
fred-fri
a0b59657ec Merge remote-tracking branch 'origin/develop' into grade 2014-12-02 19:12:19 +09:00
fred-fri
01c64a57f7 grade statistics 2014-12-02 19:11:57 +09:00
golrokh
a2bdb1a4c1 Set cancel = false when move final seminar 2014-12-02 11:03:56 +01:00
fred-fri
41724dca56 points instead of radios 2014-12-02 17:30:17 +09:00
fred-fri
ff27c4672b clarifying 2014-12-02 16:01:08 +09:00
fred-fri
41b5b3f172 dont know how to implement provider 2014-12-02 15:56:00 +09:00
ba884932ca Mocks ftw... 2014-12-01 16:01:12 +01:00
bdd87f098b Merge branch 'develop' into notification_cleaning_after_landing_page 2014-12-01 15:33:09 +01:00
golrokh
aa0cab0841 Merge remote-tracking branch 'origin/develop' into develop 2014-12-01 15:08:23 +01:00
golrokh
eca6773042 Generalizing FinalSeminar DateValidator and adding tests 2014-12-01 15:08:12 +01:00
b8662f13d6 Reporting grade now saves the date it was reported and also who reported it. 2014-12-01 13:51:08 +01:00
fred-fri
b4eb3e513b lazy 2014-12-01 11:33:38 +09:00
fred-fri
b78bdde93b Merge remote-tracking branch 'origin/develop' into develop 2014-12-01 09:24:24 +09:00
fred-fri
99afef9ec8 this is in the wrong place 2014-12-01 09:23:11 +09:00
golrokh
a36da0f60b Merge remote-tracking branch 'origin/develop' into develop 2014-11-28 16:00:20 +01:00
golrokh
3d05607150 Fixed the problem with error in final seminar date when update room 2014-11-28 16:00:10 +01:00
0236ef4a0e IntelliJ cant find classes in the same package if they use reserved Scala keywords, using an alias to get around it. 2014-11-28 10:44:06 +01:00
db64781ffe Removed stupid "unused" presentation logic method from Idea and created appropriate and reusable IColumn and IModel implementations instead. 2014-11-28 10:30:49 +01:00
79c99ecbab Fixed excel export of Admin/Match 2014-11-28 10:16:05 +01:00
4eced66f30 Fixed so that the models get properly detached. 2014-11-28 09:58:42 +01:00
fred-fri
fe34c5ae2e lazy 2014-11-28 12:35:57 +09:00
fred-fri
28030d0659 lazy 2014-11-28 12:31:40 +09:00
fred-fri
72e18fab41 custom css for idea panel 2014-11-28 11:47:08 +09:00
52805e3125 Removed a bunch of unnecessary NotificationSource parameters. 2014-11-27 16:50:30 +01:00
c59de3467e Removed user notifications, they are now sent as straight e-mails. 2014-11-27 15:54:19 +01:00
d0735d0116 Removed sending of user event notifications. 2014-11-27 15:48:51 +01:00
6869ef85a9 Fixed problem when saving and adding more projects that input fields retained their values.
Changed AdminEditProjectPage to use a page parameter instead of newing the page which forces wicket to do a redirect and the input parameters get cleared.
2014-11-27 14:42:34 +01:00
fred-fri
494e13cbbc admin 2014-11-27 16:39:47 +09:00
fred-fri
525548a09c using anchors instead of ajax 2014-11-27 15:05:33 +09:00
golrokh
68e440dba2 Fixed problem with exportable data table in admin ideas 2014-11-26 14:07:32 +01:00
fred-fri
eb4f10bd9c Merge remote-tracking branch 'origin/develop' into develop 2014-11-26 10:47:42 +09:00
fred-fri
3a1300f8ac moving change username 2014-11-26 10:43:00 +09:00
golrokh
0d7741757e Started instead of created for projects 2014-11-25 14:31:56 +01:00
fred-fri
8b75deb7b9 change username 2014-11-25 17:09:10 +09:00
fred-fri
2750710c08 change username 2014-11-25 16:36:48 +09:00
fred-fri
5f194b9bc4 delete user 2014-11-25 14:56:45 +09:00
fred-fri
aaa79711ec default content 2014-11-25 14:07:45 +09:00
fred-fri
12b752bb10 wrong boolean 2014-11-25 09:06:37 +09:00
f8fc5cee66 HTML fixes. 2014-11-24 16:38:01 +01:00
a27fc58cc1 Stop unpacking models. 2014-11-24 15:38:48 +01:00
af7714fcfc Changed administrator to admin.
(cherry picked from commit 550d58b)
2014-11-24 15:28:40 +01:00
4af51b32c3 Removed unused field. 2014-11-24 11:12:43 +01:00
b31fdbfb07 Merge branch 'develop' into landing_page
Conflicts:
	core/src/main/java/modules/CoreModule.java
2014-11-24 10:38:53 +01:00
fred-fri
e53fda6a8b expand checklist overview 2014-11-24 16:41:06 +09:00
c181a72567 Moved group forum notifications to event based. 2014-11-21 15:29:21 +01:00
738f1f6403 Moved project forum notifications to event based. 2014-11-21 15:25:34 +01:00