fred-fri
|
88061f9e2a
|
Merge branch 'release20121102b'
20121102b
|
2012-11-02 12:05:57 +09:00 |
|
fred-fri
|
7ebccf14e7
|
removed old page and settings
|
2012-11-02 12:03:58 +09:00 |
|
fred-fri
|
7e73210c01
|
Merge branch 'release20121102'
20121102
|
2012-11-02 11:35:15 +09:00 |
|
fred-fri
|
3cccc6b68b
|
added new db update file
|
2012-11-02 11:26:50 +09:00 |
|
fred-fri
|
8819c7d8dd
|
added admin settings for at least x max opponents and participants and hooked them up
|
2012-11-02 10:27:17 +09:00 |
|
fred-fri
|
f2d29c0a78
|
hooked up the maxes to the oppose and participate links
|
2012-11-01 19:15:39 +09:00 |
|
fred-fri
|
9d09111ec5
|
added artifacts to gui
|
2012-11-01 18:32:12 +09:00 |
|
fred-fri
|
c8b57918a0
|
added attributes for no of opponents and participants to finalseminar entity
|
2012-11-01 15:42:41 +09:00 |
|
fred-fri
|
b0a53b55b0
|
added info about student accept to supervisor idea form
|
2012-11-01 13:44:55 +09:00 |
|
fred-fri
|
35ca485cc3
|
fixed markup bug
|
2012-11-01 13:31:18 +09:00 |
|
jona
|
103235c0bc
|
Merge branch 'Fredrik' into develop
|
2012-10-31 10:15:17 +01:00 |
|
fred-fri
|
3524dafabc
|
made the new class spring bean
|
2012-10-31 15:22:23 +09:00 |
|
fred-fri
|
4bad8c665a
|
added classes and methods for checking what profile is active and disabled mail if prod is not on
|
2012-10-31 14:34:22 +09:00 |
|
fred-fri
|
10e13bb8b9
|
added mail enabled check
|
2012-10-31 12:03:27 +09:00 |
|
fred-fri
|
8e539b5502
|
added mail notification to thesissupport when turnitin upload returns error code
|
2012-10-31 11:56:41 +09:00 |
|
jona
|
cf4efd7eeb
|
Fixade konflikterna vid mergen. Testerna kör fint, och det jag la till (xshow) fungerar. Dock svårt för mig att säkerställa att Emils(?) ändringar fungerar felfritt.
|
2012-10-29 14:05:03 +01:00 |
|
Emil Siverhall
|
a07482ab61
|
Merge branch 'finalSeminarSave' into develop
|
2012-10-29 12:48:46 +01:00 |
|
Emil Siverhall
|
0671cfaab6
|
dialog now closes and save changes when admins modifies final seminar room details
|
2012-10-29 12:48:30 +01:00 |
|
jona
|
0f07448262
|
Revert "Tog bort kommentarer."
This reverts commit 8ae263fd2ad0dcf7f0441112eb1b34361c1b91a8.
|
2012-10-29 11:02:21 +01:00 |
|
Emil Siverhall
|
bad6bd99c7
|
Merge branch 'finalSeminarColumns' into develop
|
2012-10-29 09:03:04 +01:00 |
|
Emil Siverhall
|
d12ec296a0
|
removed details column from final seminar datatables and made project title clickable with details dialog opening
|
2012-10-29 09:02:41 +01:00 |
|
Jona Ekenberg
|
4245086c2c
|
Keywordfilter working in the popup under Student project ideas.
|
2012-10-26 19:21:57 +02:00 |
|
Jona Ekenberg
|
fbc6bae7e7
|
Now the keywordfilter works on 'Match->Student project ideas'
|
2012-10-26 19:08:31 +02:00 |
|
Jona Ekenberg
|
8ae263fd2a
|
Tog bort kommentarer.
|
2012-10-26 17:37:22 +02:00 |
|
U-Kinapuff\Sai
|
a6abfba744
|
Made it not crash when entering keywords then removing them.
|
2012-10-26 17:35:41 +02:00 |
|
Emil Siverhall
|
b7ab6808af
|
Merge branch 'emailFix' into develop
|
2012-10-26 13:48:45 +02:00 |
|
Emil Siverhall
|
71a9329a4a
|
added supervisor email address to final seminar panel
|
2012-10-26 13:48:31 +02:00 |
|
Emil Siverhall
|
1e87ee3ebf
|
Merge branch 'currentFix' into develop
|
2012-10-26 09:32:01 +02:00 |
|
Emil Siverhall
|
9c516ac2ee
|
added exemption info to current sql
|
2012-10-26 09:31:48 +02:00 |
|
Emil Siverhall
|
daf05a8b74
|
Merge branch 'exemptionDates' into develop
|
2012-10-26 09:14:57 +02:00 |
|
Emil Siverhall
|
6eb75d745f
|
added manual updates of expirationDates to exemptions already existing in db
|
2012-10-26 09:12:58 +02:00 |
|
Emil Siverhall
|
3cf6695b44
|
changed to old unit tests involving student exemptions. added expiration date
|
2012-10-26 09:12:21 +02:00 |
|
Emil Siverhall
|
1f4fe9ef8a
|
removed old exemption panel and some clean up in service method
|
2012-10-26 09:12:19 +02:00 |
|
Emil Siverhall
|
fe13879dfc
|
made sure we check for active exemptions when submitting student ideas
|
2012-10-26 09:12:17 +02:00 |
|
Emil Siverhall
|
43dfab93f9
|
added unit tests for exemption service methods
|
2012-10-26 09:12:14 +02:00 |
|
Emil Siverhall
|
f347c81cf1
|
changes to isExemptionGranted boolean to check if expiration date has passed or not
|
2012-10-26 09:12:12 +02:00 |
|
Emil Siverhall
|
91e7443ae0
|
updated current.sql with ned column to exemptions
|
2012-10-26 09:12:10 +02:00 |
|
Emil Siverhall
|
91c62c5d89
|
refactoring of exemption page is done. also added filtering on level and student (auto complete). changes to data object as well and added expiration date for the exemptions. default is 6 months from today
|
2012-10-26 09:11:32 +02:00 |
|
Emil Siverhall
|
8cf80ca902
|
started refactoring of exemption page. we not use service and datatable as on other pages
|
2012-10-26 09:11:30 +02:00 |
|
fred-fri
|
a1a487014c
|
Merge branch 'release20121026'
20121026
|
2012-10-26 10:15:30 +09:00 |
|
fred-fri
|
dbf50f6730
|
addedd new sql file
|
2012-10-26 10:14:04 +09:00 |
|
Emil Siverhall
|
1c2d39eef5
|
Merge branch 'deactiveAreaImport' into develop
|
2012-10-25 10:30:39 +02:00 |
|
Emil Siverhall
|
9b8f0d48f4
|
removed possibility to manually import all research areas from daisy, since we then get areas without supervisors attached as well
|
2012-10-25 10:30:15 +02:00 |
|
fred-fri
|
34b5d6b234
|
added first meetin column to popup page
|
2012-10-25 14:44:02 +09:00 |
|
fred-fri
|
8b91fd9aa4
|
added first meeting column to ordinary crud page
|
2012-10-25 14:37:23 +09:00 |
|
fred-fri
|
eb1e2a34dc
|
added info
|
2012-10-25 13:43:22 +09:00 |
|
fred-fri
|
e701ce4aad
|
removed nullpointerbug
|
2012-10-25 13:40:07 +09:00 |
|
fred-fri
|
02b22cc35d
|
hooked up the page to use the new methods
|
2012-10-25 12:36:14 +09:00 |
|
fred-fri
|
f88a17f38f
|
added boolean builder and implemented the methods to point to it
|
2012-10-25 12:29:27 +09:00 |
|
fred-fri
|
4db4637ae4
|
added cout and findall methods
|
2012-10-25 12:24:55 +09:00 |
|