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
622521f5c6
Hibernate and HSQLDB updated to latest versions.
...
TestQuerySet ignored due to problems with lazy execution (only tests should be deprecated DAO classes anyway)
Some other DAO tests changed since they relied on an implicit ordering and failed since new version returned in different order.
Stupid backport package gone and imports removed and now uses java.util instead of edu.emory.mathcs.backpart.java.util.
2013-02-28 14:19:20 +01:00
0ad88a1225
Temporarily ignored tests due to final seminar cancellation issues
2013-02-28 14:05:07 +01:00
c3b6329d0e
Hid some html elements which are not relevant till we solve cancellation issues.
2013-02-28 14:01:26 +01:00
d954da518e
More half-merges. Landing page and property.
2013-02-28 13:58:55 +01:00
3840978f67
Merged delete notifications from thesis upload days ahead branch.
2013-02-28 13:51:05 +01:00
Emil Siverhall
aef140c484
Merge branch 'supervisorNameBug' into develop
2013-02-28 11:51:35 +01:00
Emil Siverhall
ac2fe22aef
hooked up hasPassed method to appropriate columns
2013-02-28 11:48:38 +01:00
Emil Siverhall
3f490edc01
new app period service method to check if course start date has passed
2013-02-28 10:35:01 +01:00
Emil Siverhall
7d35d3cf68
renamed courseStartIsReached method to courseStartIsThisDay since that's what the method actually checks for
2013-02-28 10:07:57 +01:00
Emil Siverhall
77d7808578
Merge branch 'levelSpecificSettings' into develop
2013-02-28 09:46:15 +01:00
Emil Siverhall
6b8901b0bc
text change on system settings page
2013-02-28 09:46:05 +01:00
Emil Siverhall
d5eff38ed2
changed to only count days on finalSeminarCreateDaysAhead setting. a seminar may now be created x no of days from now even if selected time is before current time of day
2013-02-28 09:46:03 +01:00
