|
|
91f3786429
|
Removed unique constraint, cant use a subclass defined column
|
2013-03-08 09:19:30 +01:00 |
|
|
|
466380a078
|
Base entity for receiver configuration
|
2013-03-08 09:19:29 +01:00 |
|
Emil Siverhall
|
aa6b2ac7df
|
Merge branch 'thesisReviewAdminSetting' into develop
|
2013-03-07 14:05:52 +01:00 |
|
Emil Siverhall
|
15b23dc1c4
|
hiding settings for now until implemented properly
|
2013-03-07 14:04:05 +01:00 |
|
Emil Siverhall
|
ecc02e9289
|
updated current.sql with new settings
|
2013-03-07 13:37:41 +01:00 |
|
Emil Siverhall
|
c911122b45
|
added setting to final seminar settings page
|
2013-03-07 13:37:01 +01:00 |
|
Emil Siverhall
|
7797aab245
|
added general system settings for thesis review upload days ahead
|
2013-03-07 13:36:39 +01:00 |
|
Emil Siverhall
|
8afe55c9e8
|
Merge branch 'labelFix' into develop
|
2013-03-07 10:24:34 +01:00 |
|
Emil Siverhall
|
a1c1527828
|
minor html fix to make project status radios align properly on author - my projects
|
2013-03-07 10:24:26 +01:00 |
|
fred-fri
|
64ee105942
|
refactored hook feature
|
2013-03-07 16:25:23 +09:00 |
|
fred-fri
|
fd81261349
|
some refactoring for hook
|
2013-03-07 16:09:40 +09:00 |
|
fred-fri
|
9cc80c1bd5
|
ran optimize imports on whole project
|
2013-03-07 15:25:56 +09:00 |
|
fred-fri
|
6052416801
|
removed unused panel
|
2013-03-07 15:21:46 +09:00 |
|
fred-fri
|
5ac15d1e1f
|
removed unused panel
|
2013-03-07 15:05:55 +09:00 |
|
fred-fri
|
ea80a881c7
|
fixed bug 268
|
2013-03-07 10:09:47 +09:00 |
|
|
|
e9f944a5c4
|
Notification compilation displays the correct messageformat argument in the list.
|
2013-03-06 15:32:38 +01:00 |
|
Emil Siverhall
|
b330d038b0
|
Merge branch 'stateChangeMail' into develop
|
2013-03-06 14:22:24 +01:00 |
|
Emil Siverhall
|
57682d901e
|
added project state color to mail notification regarding state change
|
2013-03-06 14:22:10 +01:00 |
|
Emil Siverhall
|
78daad1a1a
|
added seminar room info to final seminar mail notifications
|
2013-03-06 14:22:07 +01:00 |
|
Emil Siverhall
|
1564e5e61b
|
some changes to mail formatters to check for type property instead of event name. mailformatter.properties couldn't find DO info
|
2013-03-06 14:22:05 +01:00 |
|
Emil Siverhall
|
a0128083f6
|
mail footer to supervisor change mail
|
2013-03-06 14:22:02 +01:00 |
|
Emil Siverhall
|
f8891fd98f
|
added info about which state a project have after state_changed notification. also fixed small bug that prevented student ideas to be unmatched in the admin gui
|
2013-03-06 14:21:59 +01:00 |
|
Emil Siverhall
|
3ecefa7c72
|
Merge branch 'excelExportBug' into develop
|
2013-03-06 14:05:17 +01:00 |
|
Emil Siverhall
|
1478d4e127
|
made close dialog and display feedback work properly on popup page as well
|
2013-03-06 14:01:36 +01:00 |
|
Emil Siverhall
|
14052b2a30
|
minor cleanup
|
2013-03-06 13:55:15 +01:00 |
|
Emil Siverhall
|
3bc423b125
|
fixed bug with two feedback panels when unmatching ideas in admin gui
|
2013-03-06 13:53:57 +01:00 |
|
Emil Siverhall
|
95b24c9a33
|
fixed lazy loading bug on application period exemptions that happened when student with exemption tried to submit an idea.
|
2013-03-06 11:31:16 +01:00 |
|
Emil Siverhall
|
9f636b4e5d
|
fixed npe bug when exporting excel on admin match popup panel
|
2013-03-06 10:22:10 +01:00 |
|
fred-fri
|
e300732f9c
|
removed unused if statement
|
2013-03-06 17:07:27 +09:00 |
|
fred-fri
|
de420ffd04
|
dealt with nullpointer
|
2013-03-06 14:05:54 +09:00 |
|
fred-fri
|
e6583d37db
|
this needs to be added to an upstream component in the dsv wicket components project
|
2013-03-06 12:25:22 +09:00 |
|
fred-fri
|
2fdb790b7f
|
fixed encoding issue, should rearrange this code to make it more DRY
|
2013-03-06 12:19:56 +09:00 |
|
fred-fri
|
4bd0c2dc96
|
fixed bug 256
|
2013-03-06 11:51:52 +09:00 |
|
fred-fri
|
4dac129595
|
fixed bug 256
|
2013-03-06 11:38:14 +09:00 |
|
fred-fri
|
db2685d11c
|
resolved pull conflict
|
2013-03-06 11:12:32 +09:00 |
|
fred-fri
|
9fd168b3aa
|
merged and resolved conflicts
|
2013-03-06 11:09:05 +09:00 |
|
fred-fri
|
3fd4b02200
|
removed some more unused panels
|
2013-03-06 10:40:21 +09:00 |
|
Emil Siverhall
|
8dbe890e8a
|
Merge branch 'oldSupervisorFix' into develop
|
2013-03-05 09:35:10 +01:00 |
|
Emil Siverhall
|
2fbfdd88da
|
added info about old supervisor to supervisor change mail
|
2013-03-05 09:31:59 +01:00 |
|
Emil Siverhall
|
b6aac7811b
|
Merge branch 'supervisorChangeNotification' into develop
|
2013-03-05 08:26:40 +01:00 |
|
Emil Siverhall
|
c3842b24db
|
added janne as default recipient to supervisor change mail in current.sql
|
2013-03-05 08:04:36 +01:00 |
|
Emil Siverhall
|
b8fae764dd
|
changes to supervisor change notifications when changes have been made in daisy. some restructuring and added info about all members of the project.
|
2013-03-05 08:04:34 +01:00 |
|
Emil Siverhall
|
daf9ef4c87
|
convenience method to get username + email from a user object
|
2013-03-05 08:04:32 +01:00 |
|
Emil Siverhall
|
a2cb4bf15c
|
added system settings to specify which mail addresses that should receive mail about supervisor changes in daisy
|
2013-03-05 08:04:29 +01:00 |
|
fred-fri
|
57dace3730
|
made changes to projectexternalstatistics page according to feedback from stakeholders
|
2013-03-05 15:37:02 +09:00 |
|
fred-fri
|
eecb1084ef
|
fixed the last couple of panels to use the new method to add columns
|
2013-03-05 10:50:40 +09:00 |
|
fred-fri
|
e732876504
|
using new method to add columns in a bunch of more files
|
2013-03-05 10:21:45 +09:00 |
|
fred-fri
|
b6d6fcd1e9
|
using new method to add columns in a bunch of more files
|
2013-03-05 10:17:36 +09:00 |
|
fred-fri
|
a40ce2145c
|
using new method to add columns in a bunch of more files
|
2013-03-05 10:14:20 +09:00 |
|
fred-fri
|
43af157cab
|
using new method to add columns in a bunch of more files
|
2013-03-05 10:07:53 +09:00 |
|
