17275 Commits

Author SHA1 Message Date
d4a4097d7c Seminar notification - turnitin error 2012-12-10 16:20:17 +01:00
d4b16ded26 Seminar notification - turnitin error 2012-12-10 16:19:57 +01:00
Arian Jafari
a961077973 ExternalUserLoginModule closer to functional; LoginContext still throws LoginException. 2012-12-10 16:11:50 +01:00
608727ac08 Seminar notifications thesis, opposition, participant, opposition report done 2012-12-10 16:05:39 +01:00
8d2a6c6e1c Moved SeminarCRUDPanel to the proper place 2012-12-10 15:18:20 +01:00
fe5bd289ec Added missing turnitin link 2012-12-10 15:17:59 +01:00
2e627ebc20 New seminar panel complete 2012-12-10 15:15:52 +01:00
Emil Siverhall
9dee5d1f20 Merge branch 'refactorSomeMOre' into develop 2012-12-10 14:10:41 +01:00
Emil Siverhall
2d2844d359 removed old updateWatsons method since we do this easier now 2012-12-10 14:01:00 +01:00
Emil Siverhall
c8bb6673c9 added new sql to make watsons optional 2012-12-10 13:59:57 +01:00
Emil Siverhall
1f2933f99a changed watson logic on admin panel as well 2012-12-10 13:58:24 +01:00
Emil Siverhall
e15ca4dae7 some changes to the panels using watson info and watson completion, to use new logic 2012-12-10 13:58:07 +01:00
Emil Siverhall
1248570601 made watson fields nullable (for supervisor ideas) 2012-12-10 13:56:15 +01:00
08ce2b4bc8 project opposition page now sends notifications for signed up oppositions/participants 2012-12-10 13:47:21 +01:00
b37f2dff38 SeminarCRUDPanel now only does what it needs 2012-12-10 13:38:07 +01:00
13818bbbc8 Helper method to populate with oppositions/participants from a FinalSeminar entity 2012-12-10 13:17:47 +01:00
c8a6d87c01 Seminar panel no longer works directly against the database when removing participants/oppositions. 2012-12-10 13:17:01 +01:00
9eb813e020 CRUDPanel no longer handles notifications and only CRUD operations. Has parameter to specify the service should send them out if it implements them. 2012-12-10 13:14:10 +01:00
a88f68568b FinalSeminarService now implements notifications and will remove participants/oppositions from the database if they are removed from the entities list when persisted 2012-12-10 13:09:00 +01:00
bd97dcbef1 new seminar panel using the abstract crud panel 2012-12-07 16:25:35 +01:00
cea5a4c8c6 refactoring notification logic to service layer and associated test 2012-12-07 16:24:50 +01:00
4781853c3b removed dead code 2012-12-07 16:23:21 +01:00
2b34e1df02 changed crud panel to not require a backing detachable model 2012-12-07 16:22:40 +01:00
Emil Siverhall
3c131090e3 renamed watson completion panel as well 2012-12-07 12:29:46 +01:00
Emil Siverhall
59ab04e263 renamed watson info panel 2012-12-07 12:28:24 +01:00
Emil Siverhall
993436fe77 Merge branch 'dialogRefactor' into develop 2012-12-07 12:04:02 +01:00
Emil Siverhall
faf92e146a some more changes to first meeting to make it easier to deal with 2012-12-07 12:01:46 +01:00
Maryam Ammouri
ab986073cf infor code review 2012-12-07 11:50:30 +01:00
Emil Siverhall
47275d117a added waiting for label when an ideas authors are unconfirmed 2012-12-07 11:37:56 +01:00
Emil Siverhall
7bc8cc953e some refactoring of first meeting form submission and watson info now uses its own panel 2012-12-07 11:14:16 +01:00
Jona Ekenberg
dcefa2048e now a message is being shown if a table is empty 2012-12-06 19:38:20 +01:00
Niklas
fbade0ee61 Merge branch 'feature' of ssh://git.dsv.su.se/git/scipro/personal/ne into feature 2012-12-06 16:46:49 +01:00
Niklas
47e8cdbddc Adding functionality for saving password to persistent class Password. 2012-12-06 16:45:03 +01:00
Arian Jafari
5f9019b82d Added generateRandomPassword() 2012-12-06 16:39:13 +01:00
Niklas
9e28521c39 Removed unused method. 2012-12-06 16:14:20 +01:00
Niklas
f65ab021a2 Merge branch 'externallogin' of ssh://git.dsv.su.se/git/scipro/personal/ne into feature
Conflicts:
	src/main/java/se/su/dsv/scipro/data/dataobjects/User.java
2012-12-06 16:06:37 +01:00
Niklas
2c82dec9f8 Adding LoginPanel. 2012-12-06 14:41:44 +01:00
Niklas
82781928e4 Adding options for kerberos and external login to LoginPanel. 2012-12-06 14:41:44 +01:00
Niklas
8d72881fcd asdf 2012-12-06 14:41:44 +01:00
Niklas
51c408f4ff test commit 2012-12-06 14:41:44 +01:00
Niklas
4d244b76c4 RegistrationPanel 2012-12-06 14:41:44 +01:00
Niklas
38be6203f8 Registration form. 2012-12-06 14:41:44 +01:00
Niklas
f28dc4ce3a Registration form. 2012-12-06 14:41:44 +01:00
5d469f56b3 generic abstract crud panel class 2012-12-06 14:40:40 +01:00
Arian Jafari
e9f0b1914e Local authentication now functional. I think. 2012-12-06 14:33:48 +01:00
Jona Ekenberg
e62b993bd1 Merge branch 'popupResearchAreaInfo' into develop 2012-12-06 13:55:53 +01:00
Jona Ekenberg
9fabcbd3b0 trying to get the infobox to show when clicking researcharea when adding idea 2012-12-06 13:39:48 +01:00
Emil Siverhall
d3b671d8d8 Merge branch 'match35_supervisor_create_idea' into develop 2012-12-06 11:38:19 +01:00
Emil Siverhall
b6df4b51eb added required stars and changed text on save button for supervisors creating ideas 2012-12-06 11:38:08 +01:00
ce1b2c96cb fixes to notification details to allow html tags while still displaying e-mails nicely 2012-12-06 09:27:42 +01:00