6916 Commits

Author SHA1 Message Date
leosu
fbd56ab354 properties string 2014-02-10 16:00:32 +01:00
leosu
da77d84521 new approve-strings and feedback 2014-02-10 15:49:49 +01:00
leosu
6d9a1e1a9e fixed NPE when switching to empty user 2014-02-10 14:57:07 +01:00
a1acdbe88a Merge remote-tracking branch 'origin/develop' into develop 2014-02-10 14:51:40 +01:00
leosu
244724cce0 no more magic numbers for dialog height 2014-02-10 14:39:46 +01:00
b5e2282941 Start of admin mail log page. 2014-02-10 14:34:25 +01:00
leosu
3952d945bb no more magic numbers for dialogs 2014-02-10 14:21:56 +01:00
cd007e4b0d Added sub menu to the admin mail page. 2014-02-10 14:20:38 +01:00
210aa14ba3 MailEventWorker now marks mails as sent instead of deleting them. 2014-02-10 14:10:01 +01:00
fe42869d02 Added findUnsent() method to MailEventService. 2014-02-10 13:54:47 +01:00
bfe2f9f29a Turned off a bunch of log spam in DEV mode. 2014-02-10 13:35:44 +01:00
5d4cf97a79 Fixed warning. 2014-02-10 13:17:15 +01:00
fred-fri
d41985932c Merge remote-tracking branch 'origin/develop' into develop 2014-02-10 20:49:18 +09:00
fred-fri
0e67e03b08 fixed externallink showing and hiding 2014-02-10 20:48:58 +09:00
leosu
96d2bcd87e fixed paths in tests 2014-02-10 12:37:15 +01:00
fred-fri
776fcf1725 Merge branch 'showexternallink' into develop 2014-02-10 20:04:01 +09:00
fred-fri
68305a9b85 adding new statistics page 2014-02-10 20:02:59 +09:00
fred-fri
6b23ee785e adding new statistics page 2014-02-10 19:03:42 +09:00
6e7b09950a Merge remote-tracking branch 'origin/develop' into develop 2014-02-07 15:46:13 +01:00
566bd81b39 Made points float below stretch content as well. 2014-02-07 15:46:07 +01:00
20a705d47e Removed unused parameter. 2014-02-07 15:32:23 +01:00
7e5bbc0f24 Removed unused fields. 2014-02-07 15:32:00 +01:00
Richard
df4adf9fb3 Merge remote-tracking branch 'origin/develop' into develop 2014-02-07 15:19:41 +01:00
0d44a73d66 Reduced log level to prevent stupid mails. 2014-02-07 15:15:43 +01:00
Richard
724fe0d194 Merge remote-tracking branch 'origin/develop' into develop 2014-02-07 15:13:13 +01:00
b7b1ff1d54 Added some more margin to the PDF templates. 2014-02-07 14:43:55 +01:00
Richard
a25eb62488 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2014-02-07 14:26:14 +01:00
f5f737b2dc Ban case-insensitive operating systems from everywhere. 2014-02-07 14:22:58 +01:00
Richard
81da45ea1d Minor changes to the footer.
Content on the login pages are now left-aligned instead of centered.
2014-02-07 13:58:12 +01:00
leosu
5bbc239f7d fixed NPE 2014-02-07 13:30:30 +01:00
fred-fri
74f86be9b2 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2014-02-07 20:00:19 +09:00
leosu
b6d03008dd no final thesis exception fix 2014-02-07 11:38:21 +01:00
leosu
43eea6d895 fixed missing text of checklist 2014-02-07 11:01:04 +01:00
fred-fri
fa1beedb9b Merge branch 'almostfinishedapscheduletemplates' into develop 2014-02-07 13:07:47 +09:00
leosu
7310d0ad6c fixed feedback errors 2014-02-06 17:18:55 +01:00
leosu
52a7bb7221 Merge remote-tracking branch 'origin/develop' into develop 2014-02-06 16:53:21 +01:00
leosu
508a949cb4 date formatting 2014-02-06 16:53:16 +01:00
b33fdf5ba9 Merge remote-tracking branch 'origin/develop' into develop 2014-02-06 16:38:47 +01:00
leosu
1beb74d076 added range limit to title 2014-02-06 16:37:23 +01:00
3f5cbb6ad0 Made individual milestones link to the details page from the overview statistics page. 2014-02-06 16:24:52 +01:00
8f7fec6dc3 Removed useless code from PageTest. 2014-02-06 16:23:03 +01:00
leosu
0874f995cd replace with <> 2014-02-06 16:17:29 +01:00
98d3044eb1 Moved presentation stuff to properties file. 2014-02-06 16:16:35 +01:00
286e9e4863 Added page to show details for individual milestones. 2014-02-06 16:11:15 +01:00
96a40a8ab6 Renamed page. 2014-02-06 15:56:40 +01:00
22eaa5ccae Refactored out a base class. 2014-02-06 15:55:37 +01:00
leosu
80921f5f06 checklist comments are not visible by default 2014-02-06 15:49:24 +01:00
faf00e5179 Added landing page for milestones so that the milestone notification urls are correct. 2014-02-06 15:22:01 +01:00
5b85bf9fed Made description text stretch to fit all content. 2014-02-06 14:40:52 +01:00
leosu
23c01320c8 fixed error handling 2014-02-06 11:55:32 +01:00