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
eca125bf48
Users do not appear multiple times in a threads members.
2014-08-25 10:59:50 +02:00
5072589cc8
Added missing @Transactional
2014-08-25 10:58:40 +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
4afd9021e9
making forummail come from account
2014-08-22 08:12:25 +09:00
fred-fri
7c222cfddc
removed column
2014-08-21 15:34:14 +09:00
fred-fri
ddea3f3422
fixed target bug
2014-08-21 15:27:19 +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
cd73a09355
Fixed some missing dependencies in the ForumMailModuleTest
2014-08-20 15:24:56 +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
24dd87bff0
Fixed unchecked warning.
2014-08-20 14:50:39 +02:00
86cc6aaf25
Made forum mail a plugin.
2014-08-20 14:44:26 +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
0e49677b73
Scheduling a worker now returns a Job that can be used to cancel the worker.
2014-08-20 12:35:53 +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
e7b0ebc53b
Changed unknown content type to foo/bar since multipart/* is not unknown in the test case.
2014-08-19 13:48:12 +02:00
torgny
464578e38d
Författare kan inte spara Activity Plan template.
2014-08-19 13:37:45 +02:00
4f4597019d
Changed content parser to handle any multipart content correctly instead of only multipart/alternative
2014-08-19 13:23: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
f2707baa6c
Now that firstName, lastName and emailAddress are non-null (or should be... JPA...) the compareTo method can be simplified.
2014-08-19 10:58:13 +02:00
b8179745ab
Fixed warning.
2014-08-19 10:52:40 +02:00
9dfca93a4c
Name conflict.
2014-08-19 10:46:35 +02:00
72568b9a76
Made firstName, lastName, emailAddress not null in User.
...
I hate whoever invented null.
I hate JPA for enforcing default constructors.
I hate Wicket for promoting the use of standard java beans from persistence to presentation.
2014-08-19 10:46:01 +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
