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
fred-fri
b015807f75
using new method to add columns
2013-03-05 09:57:56 +09:00
fred-fri
a1039932d7
merged improve branch into develop
2013-03-05 09:49:17 +09:00
Jona Ekenberg
0863c71d23
Merge branch 'dubbelMEGAMOCKUP' into develop
2013-03-04 15:14:56 +01:00
Jona Ekenberg
3c767de920
uppdaterat forummockups
2013-03-04 15:14:07 +01:00
fred-fri
bf02604dca
fixed unruly test which wanted stuff in order
2013-03-04 16:25:59 +09:00
fred-fri
7b47e588be
made new menu list component and added only notifications to it, moved it more to the right
2013-03-04 16:15:27 +09:00
fred-fri
2f1c3843a2
removed unused panel
2013-03-04 16:08:57 +09:00
fred-fri
7563bbc189
removed redundant, buggy and troublemaking edit and delete columns from project management panel
2013-03-04 15:35:54 +09:00
fred-fri
ee68762eb9
changed feature description
2013-03-04 10:42:18 +09:00
fred-fri
b3341f0481
Merge branch 'release20130301'
2013-03-01 12:39:13 +09:00
fred-fri
1e1b391496
new db file
2013-03-01 12:39:05 +09:00
fred-fri
cb2acb9e12
level fix on idea submission page
2013-03-01 12:12:56 +09:00
fred-fri
62b9435786
fixed conflicts
2013-03-01 11:29:03 +09:00
fred-fri
663cafa532
removed a bunch of more stuff
2013-03-01 10:56:03 +09:00
fred-fri
43eb77287f
removed a bunch of more stuff
2013-03-01 10:43:36 +09:00
b47dc11271
Updated misbehaving test to use the new assertSameContent method instead of relying on some implicit ordering
2013-02-28 21:39:25 +01:00
1210c5f3cb
Assert utility class for checking collection contents
2013-02-28 21:06:23 +01:00
68c3b56e39
Test ignored that relies on implicit ordering.
...
Needs to be rewritten to not expect a specific order when ordering is not specified in the query.
The order returned differs from jenkins and local machine.
2013-02-28 17:36:15 +01:00
49c19b08ba
Fixed name/email filtering.
2013-02-28 14:19:20 +01:00
e3234486ff
UserService now uses JPA features to filter based on entity class.
2013-02-28 14:19:20 +01:00
