|
|
b1f37cbedf
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-01-29 14:02:40 +01:00 |
|
Emil Siverhall
|
e211ec73b4
|
Merge branch 'adminFixes' into develop
|
2013-01-29 12:25:09 +01:00 |
|
Emil Siverhall
|
9d4e4f8d66
|
status filter on admin-> new idea panel now only displays the statuses that are current supported instead of all idea statuses. status pending is added if partner confirmation system setting is turned on.
|
2013-01-29 12:14:01 +01:00 |
|
|
|
8b46ce8d3a
|
Merge branch 'improvement/date_formatting' into develop
Conflicts:
resources/db_update_scripts/current.sql
|
2013-01-29 12:00:00 +01:00 |
|
|
|
9e0084d0a7
|
SQL statements.
|
2013-01-29 11:57:32 +01:00 |
|
|
|
a5dd3dc087
|
Most classes that should be safe to use DateService have been changed to use it.
|
2013-01-29 11:52:23 +01:00 |
|
|
|
bb88eb06a8
|
Updated to new date service
|
2013-01-29 11:37:14 +01:00 |
|
|
|
f7f05c39d2
|
DateFormatter wicket utility class updated to use the DateService for formatting.
|
2013-01-29 11:34:51 +01:00 |
|
Emil Siverhall
|
958a31e801
|
cleanup..
|
2013-01-29 11:33:13 +01:00 |
|
Emil Siverhall
|
cc28e0c36e
|
admins may not manually match ideas to supervisors where targets numbers already are reached
|
2013-01-29 11:23:14 +01:00 |
|
|
|
358a52f12f
|
Link to replacement patterns now open in a new window
|
2013-01-29 11:22:51 +01:00 |
|
|
|
ad47d1486f
|
Date settings are now included in the admin settings menu
|
2013-01-29 11:21:17 +01:00 |
|
|
|
b0ca0a5583
|
Test to make sure the current format is displayed in the fields
|
2013-01-29 11:18:19 +01:00 |
|
Emil Siverhall
|
32e40754a8
|
added toString method to application period domain object that presents the name of the period..
|
2013-01-29 11:12:24 +01:00 |
|
Emil Siverhall
|
2654af20ef
|
prepared the admin-> new idea panel to use application period filtering. not sure if this should be visble since it gets pretty messy with all small periods created besides the regular ones
|
2013-01-29 11:11:39 +01:00 |
|
Emil Siverhall
|
36ed5ac407
|
new generic filter form panel with a dropdown choice component
|
2013-01-29 11:09:55 +01:00 |
|
|
|
bef77725a3
|
Convenience method in DateService
|
2013-01-29 11:09:13 +01:00 |
|
|
|
e87cac4f3a
|
Submit button and feedback messages
|
2013-01-29 11:04:12 +01:00 |
|
|
|
71ef26740d
|
Moved pages to better location
|
2013-01-29 10:52:19 +01:00 |
|
|
|
0366693c5f
|
Test to include the label for each field explaining what it is
|
2013-01-29 10:40:19 +01:00 |
|
|
|
aaa06895e5
|
Updated test to include the panel required bean in the context
|
2013-01-29 10:39:22 +01:00 |
|
|
|
2776ad09db
|
Annotation for the save method
|
2013-01-29 10:21:32 +01:00 |
|
|
|
e6d5ce73b2
|
Test checks that the filled out format is what gets saved.
|
2013-01-29 10:18:09 +01:00 |
|
|
|
8170845d30
|
Test checks for error messages if formats are not filled out
|
2013-01-29 10:07:53 +01:00 |
|
|
|
8511874b6b
|
Tests verifies all settings are saved when filled out
|
2013-01-29 09:52:16 +01:00 |
|
|
|
54e70984f9
|
Service supports updating format based on style
|
2013-01-29 09:23:02 +01:00 |
|
|
|
7ab3d90d8d
|
Tests the structure of date settings panel
|
2013-01-28 17:04:24 +01:00 |
|
|
|
da348ecb60
|
Refactoring to use constants for wicket:ids
|
2013-01-28 16:20:03 +01:00 |
|
|
|
4788d80743
|
Rendering test for date settings panel
|
2013-01-28 16:16:56 +01:00 |
|
|
|
a723594dd6
|
Date settings page contains settings panel.
|
2013-01-28 16:14:07 +01:00 |
|
|
|
2950434e6c
|
Page test render test checks for no error messages
|
2013-01-28 16:09:55 +01:00 |
|
|
|
7d0416cc01
|
Moved to different package
|
2013-01-28 16:08:48 +01:00 |
|
|
|
ea48c6e8e1
|
Admin date settings page
|
2013-01-28 16:05:38 +01:00 |
|
|
|
6cff41ec19
|
Implementation
|
2013-01-28 15:57:30 +01:00 |
|
|
|
588fa77616
|
Interface, repo and test for the new date service
|
2013-01-28 15:56:57 +01:00 |
|
|
|
e33b79f56d
|
Enum containing the different kind of dates.
|
2013-01-28 15:56:21 +01:00 |
|
|
|
1b69af7431
|
New bean containing date settings for a given style
|
2013-01-28 15:53:33 +01:00 |
|
Emil Siverhall
|
a7a833762a
|
Merge branch 'match35cleanup' into develop
|
2013-01-28 15:36:52 +01:00 |
|
Emil Siverhall
|
d9b8367b91
|
show supervisor name to students after match if the idea is submitted by a supervisor
|
2013-01-28 15:36:04 +01:00 |
|
Emil Siverhall
|
009c158d1f
|
removed watson reminder text that told the authors that the idea would be deselected if watson boxes wasn't filled in
|
2013-01-28 15:24:03 +01:00 |
|
Emil Siverhall
|
3166e29a59
|
Merge branch 'swedishMasters' into develop
|
2013-01-28 14:55:24 +01:00 |
|
Emil Siverhall
|
87e3c4b9a5
|
same with supervisors..
|
2013-01-28 14:54:57 +01:00 |
|
Emil Siverhall
|
e8451d303c
|
students may choose swedish when sending in a thesis idea on master level
|
2013-01-28 14:50:10 +01:00 |
|
Emil Siverhall
|
2267655d3c
|
Merge branch 'confirmations' into develop
|
2013-01-28 12:29:43 +01:00 |
|
Emil Siverhall
|
8884693208
|
added unit tests to check if matchPartnerConfirmation setting works
|
2013-01-28 12:27:04 +01:00 |
|
Emil Siverhall
|
8a7cb4f2e2
|
made new idea service tests aware of general system settings
|
2013-01-28 12:27:01 +01:00 |
|
Emil Siverhall
|
bb1aca2d15
|
added new system setting to sql file as well
|
2013-01-28 12:26:59 +01:00 |
|
Emil Siverhall
|
8c17574064
|
aligned radio choice and checkbox labels when submitting ideas. you may now click the label as well on keywords and publish/not publish (supervisor only)
|
2013-01-28 12:25:43 +01:00 |
|
Emil Siverhall
|
365fe0d4aa
|
added confirmation setting support to partner addition methods in the new idea service
|
2013-01-28 12:25:41 +01:00 |
|
Emil Siverhall
|
68313331ca
|
partner addition panel when submitting student ideas needs to show e-mail as well
|
2013-01-28 12:25:38 +01:00 |
|
