6440 Commits

Author SHA1 Message Date
fred-fri
3b3d6145a0 cant get querydsl queries to work no matter what, sticking with this in the meantime 2014-08-26 12:23:19 +09:00
fred-fri
e57d30d2ff Merge remote-tracking branch 'origin/develop' into develop 2014-08-26 12:21:47 +09:00
21cbfc672a Ops. 2014-08-25 16:09:02 +02:00
4e8bceb4e1 Model.of() is forbidden, stop using it. The only thing it is good at is generating LazyInitializationExceptions. 2014-08-25 14:55:06 +02:00
6e23791b2a Merge remote-tracking branch 'origin/develop' into develop 2014-08-25 14:27:58 +02:00
a314e8a8a1 Fixed header on the public log in pages. 2014-08-25 14:27:46 +02:00
d3c6ef9e50 Fixed Wicket XML namespace declaration. 2014-08-25 14:25:53 +02:00
07ab0675a6 When logging in to SciPro you are first presented with an identity selection (if SSO is enabled). 2014-08-25 14:24:21 +02:00
torgny
bd9089ab96 Enklare skapande av nya projekt. 2014-08-25 13:30:32 +02:00
fred-fri
bc2e787809 improved queries 2014-08-25 13:24:17 +09:00
fred-fri
c0d8e31044 adding adminpeoplestatisticspage 2014-08-22 16:44:14 +09:00
fred-fri
0130966322 edited admin info 2014-08-22 11:05:57 +09:00
fred-fri
7c222cfddc removed column 2014-08-21 15:34:14 +09:00
fred-fri
72e1abd8b6 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2014-08-21 13:16:24 +09:00
fred-fri
f91e97ae53 this is so beautiful 2014-08-21 13:15:43 +09:00
a09b6b84db Fixed unchecked warning. 2014-08-20 17:06:39 +02:00
3fe4ad5d9f Extended the duplicated code block :) 2014-08-20 16:03:51 +02:00
122f2c4eb6 Sonar 2014-08-20 15:50:42 +02:00
ae7472722b Moved MailEvent, MailEventService(Impl) to the mail package. 2014-08-20 15:39:33 +02:00
3488a0fbfe Added an alt attribute to the Gravatar <img>-tag containing the users full name. 2014-08-20 14:58:12 +02:00
574f086a4a Made plugin toggling a nice and switch-like. 2014-08-20 14:56:36 +02:00
86e6e7d370 Basic plugin system. 2014-08-20 14:42:27 +02:00
af5f5c08e6 Fixed unchecked warning. 2014-08-20 13:56:56 +02:00
fred-fri
fb0ffbeaa1 added send to forum button 2014-08-20 16:37:59 +09:00
4fa266af2f Fixed name sorting in the admin role management. 2014-08-20 08:48:12 +02:00
28d174dd77 Fixed name sorting in the admin role management. 2014-08-20 08:44:30 +02:00
fred-fri
a1590b8a9d notes 2014-08-20 13:16:38 +09:00
6cafb216fb Added ToString implementation to CurrentUserImpl 2014-08-19 16:48:26 +02:00
10a6b78eec Fixed some faulty texts. 2014-08-19 16:46:54 +02:00
torgny
464578e38d Författare kan inte spara Activity Plan template. 2014-08-19 13:37:45 +02:00
8e0e4ea042 Re-ordered the settings a bit. 2014-08-19 11:23:39 +02:00
897f23dad7 Separated reply e-mail and account name. 2014-08-19 11:21:17 +02:00
e43f2d20d6 Fixed label markup. 2014-08-19 11:15:06 +02:00
09a370fce1 Renamed some forum mail settings. 2014-08-19 11:13:56 +02:00
b8179745ab Fixed warning. 2014-08-19 10:52:40 +02:00
fred-fri
7079762c2d removed import 2014-08-19 15:39:35 +09:00
fred-fri
3614e6694f admin can now cancel final seminars 2014-08-19 15:27:17 +09:00
fred-fri
85a939c7aa final seminar now has activity in activity plan 2014-08-19 12:34:33 +09:00
82f2ee2fa5 Merge remote-tracking branch 'origin/develop' into develop 2014-08-18 17:26:34 +02:00
e2f2865284 Export av edit targets till excel 2014-08-18 17:25:54 +02:00
ec1c279751 I hate whoever invented null.
I hate JPA for enforcing default constructors.
I hate Java for not having Option.
2014-08-18 16:48:20 +02:00
f4f9e908ab Tests now use a properly populated user with an e-mail address. 2014-08-18 16:10:48 +02:00
e2644f1be7 Tests now use a properly populated user with an e-mail address. 2014-08-18 16:09:30 +02:00
847f20b484 User link panel now uses gravatar images instead of default anonymous icon. 2014-08-18 15:55:57 +02:00
9ab5bdc1eb Removed hard-coded normal font-weight for label and made the font-weight fix run after ajax completions in addition to page load. 2014-08-18 15:46:22 +02:00
f412558654 Fixed proper Bootstrap markup. 2014-08-18 15:45:18 +02:00
514c8708e6 Users can now choose to hide their Gravatar image. 2014-08-18 15:36:21 +02:00
491a3a916e Moved the md5 utility function out of TurnItInComponent.
Added Gravatar images to user profiles.
2014-08-18 15:23:13 +02:00
8666f0594f Rewrote the md5 function so you can actually understand what is going on.
There is a test verifying with 1000 random 4096 byte arrays that the results are still the same.
2014-08-18 14:53:23 +02:00
384f2356da Merge remote-tracking branch 'origin/develop' into develop 2014-08-18 14:25:51 +02:00