16917 Commits

Author SHA1 Message Date
4eced66f30 Fixed so that the models get properly detached. 2014-11-28 09:58:42 +01:00
fred-fri
9c8e92375d activity thread bug 2014-11-28 17:49:47 +09:00
fred-fri
5a304d6fa5 we dont need this error 2014-11-28 13:41:50 +09: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
8c3a6b6f00 Removed absolute URL from notifications, they now always use the landing page and it is generated when required. 2014-11-27 16:03:50 +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
ed775b1ba9 tests 2014-11-27 15:07:33 +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
8b0b277a2a forum mail 2014-11-26 11:23:29 +09: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 release-2014-11-25_02-38-44 2014-11-25 09:06:37 +09:00
f8fc5cee66 HTML fixes. 2014-11-24 16:38:01 +01:00
94a10a2b11 Activity templates and peer requests now have their checklists set to null by the database instead of manually in the code. 2014-11-24 16:32:05 +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
d53dd6dbce Moved ProjectFinalSeminarStatisticsService to the proper package and created its own filter instead of re-using the same one from ProjectService. 2014-11-21 11:13:29 +01:00
36e5e7090b Merge remote-tracking branch 'origin/develop' into develop 2014-11-21 11:00:36 +01:00
14c29dab16 Removed reference to checklist from project. 2014-11-21 11:00:31 +01:00
golrokh
747fe9cbc1 Merge remote-tracking branch 'origin/develop' into develop 2014-11-21 10:45:09 +01:00
golrokh
ebb723c39f start added for application period exemption 2014-11-21 10:43:19 +01:00
fred-fri
6aaebcdda8 Merge branch 'plugins' into develop 2014-11-21 18:09:54 +09:00
fred-fri
e3be8a3776 refactoring 2014-11-21 18:09:01 +09:00
golrokh
5f36ea6ddf Merge remote-tracking branch 'origin/develop' into develop 2014-11-21 09:59:12 +01:00
7139658037 Changed to a property model. 2014-11-21 09:24:12 +01:00
fred-fri
daf43b7a64 removing plugin stuff 2014-11-21 13:44:08 +09:00
fred-fri
64fd784ea1 complete refactoring of language page 2014-11-21 11:34:29 +09:00
fred-fri
da3341e884 this accomplishes nothing 2014-11-21 10:58:53 +09:00
fred-fri
479bbd4b82 refactoring 2014-11-21 10:34:35 +09:00
fred-fri
485d47b6f7 refactoring 2014-11-21 10:32:56 +09:00
5f480f2fa7 Augh Lombok. 2014-11-20 16:30:59 +01:00
bb3cd4443b Migrated some final seminar related notifications to event based. 2014-11-20 16:28:10 +01:00
golrokh
2dad663c1e start added for application period exemption 2014-11-20 15:49:19 +01:00