12838 Commits

Author SHA1 Message Date
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
4d7b1c471d Added sent field to MailEvent. 2014-02-07 15:43:03 +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
leosu
29acb1d7f5 Merge remote-tracking branch 'origin/develop' into develop 2014-02-07 12:59:39 +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
2ec69da9ee formatting 2014-02-07 11:51:45 +01:00
leosu
cbc06a4590 magic number 2014-02-07 11:50:54 +01:00
leosu
314f2b1b47 magic number 2014-02-07 11:49:51 +01:00
leosu
b6d03008dd no final thesis exception fix 2014-02-07 11:38:21 +01:00
leosu
f25b0118b7 magic number 2014-02-07 11:22:08 +01:00
leosu
45e933f327 magic number 2014-02-07 11:19:33 +01:00
leosu
02258ae4ad magic number 2014-02-07 11:18:07 +01:00
leosu
4a1509ab18 formatting 2014-02-07 11:17:45 +01:00
leosu
430f71dacd magic number 2014-02-07 11:16:31 +01:00
leosu
3f3e0c6207 formatting 2014-02-07 11:14:49 +01:00
leosu
985edb8967 magic number 2014-02-07 11:13:48 +01:00
leosu
9c41e1cc35 magic number 2014-02-07 11:11:25 +01:00
leosu
280402e979 magic number 2014-02-07 11:09:14 +01:00
leosu
f598e6bd48 magic number 2014-02-07 11:06:40 +01:00
leosu
fe3624bd6e removed magic number 2014-02-07 11:05:41 +01:00
leosu
4dae143ed9 formatting 2014-02-07 11:04:13 +01:00
leosu
43eea6d895 fixed missing text of checklist 2014-02-07 11:01:04 +01:00
fred-fri
de80424afa renamed sql 2014-02-07 13:15:37 +09:00
fred-fri
fa1beedb9b Merge branch 'almostfinishedapscheduletemplates' into develop 2014-02-07 13:07:47 +09:00
fred-fri
5595d5380b fixed sql 2014-02-07 12:53:31 +09:00
leosu
545369de10 Merge remote-tracking branch 'origin/develop' into develop 2014-02-06 17:19:01 +01:00
leosu
7310d0ad6c fixed feedback errors 2014-02-06 17:18:55 +01:00
8853939609 Added new peer review completed events to the event table. 2014-02-06 17:14:04 +01:00
35bf4a57c2 Merge remote-tracking branch 'origin/develop' into develop 2014-02-06 17:13:53 +01:00
2036ff03c2 Milestone activator now activates peer-related milestones. 2014-02-06 17:13:12 +01:00
63a9501acc Removed PeerReviewMilestoneActivator. PeerPortal now posts event to the event bus instead. 2014-02-06 17:09:06 +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
ba7521f985 Connected MileStoneEvent and PeerEvent with project so it shows up in the notification table. 2014-02-06 16:38:39 +01:00