17140 Commits

Author SHA1 Message Date
6008e37600 now uses the existing DomainLDM instead of its own 2012-12-03 18:26:18 +01:00
Jona Ekenberg
0f92231421 now sorting researchAreas by title when filtering 2012-12-03 17:52:14 +01:00
122257241b project notification - file upload 2012-12-03 17:47:45 +01:00
83e6184126 project notification - forum post 2012-12-03 17:25:35 +01:00
dc9fcf7b8d common information for project notifications is now presented as a list 2012-12-03 17:09:51 +01:00
08346976d3 project notifications - state change 2012-12-03 17:00:36 +01:00
5da89cc652 project notifications - changed reviewers.
changed grammar of some project notification type enums
2012-12-03 16:47:14 +01:00
d7061b37a3 unread column is now sortable again 2012-12-03 16:39:48 +01:00
f58b0a5f69 project notification - co-supervisors changed 2012-12-03 16:35:18 +01:00
4d9fd15aaf project notification - authors changed 2012-12-03 16:03:38 +01:00
Emil Siverhall
8626815186 Merge branch 'match35_addNewPartner' into develop 2012-12-03 14:42:27 +01:00
Emil Siverhall
0904b73b76 hiding create and select buttons for students if no application period is open 2012-12-03 14:41:55 +01:00
Emil Siverhall
62389f0901 made sure that authors may not add a new partner to a pending idea if application period has ended. 2012-12-03 14:17:18 +01:00
0b41088c4a project notification - head supervisor change 2012-12-03 14:14:58 +01:00
Emil Siverhall
cf08f194ce added link to add new author to an idea where the current authors project partner declined to be a part of the idea 2012-12-03 14:04:02 +01:00
5f530e2c6a notification controller now works with models instead to support LDMs if necessary 2012-12-03 14:00:10 +01:00
5fabb35f65 using e-mail source/name from system settings 2012-12-03 13:55:45 +01:00
f7addd38cd project notification - created 2012-12-03 13:53:06 +01:00
f4e5497118 changed title column header to title from subject to be more consistent 2012-12-03 13:44:39 +01:00
09d6f5e3c5 reworked how notifications are formatted, no need for a separate class 2012-12-03 13:35:52 +01:00
Jona Ekenberg
7dbab7bd0c reactivated the edit on (old) projectideas 2012-12-03 12:11:42 +01:00
90c03293f3 reworked stringutil to make it useful 2012-12-03 11:10:06 +01:00
1676bb64a1 added more helper functions 2012-12-03 10:49:55 +01:00
4836fe2804 added utility class notificationutils to help populate a notificationrecipients object 2012-12-03 10:47:08 +01:00
9e76aede44 removed old and no longer needed data from notificationdata 2012-12-03 09:45:00 +01:00
604ab34c01 notificationdata inheritance strategy changed to single from joined 2012-12-03 09:35:25 +01:00
69b3b89439 notification type enum moved from notificationdata to notification 2012-12-03 09:31:26 +01:00
Jona Ekenberg
e583aa2ce5 changed the width of selectkeywordpanel 2012-12-02 21:47:32 +01:00
Jona Ekenberg
4211164914 can't change language to swedish when selecting master now 2012-12-02 18:18:39 +01:00
Jona Ekenberg
0c32e57daf Merge branch 'newIdeaFixes' into develop 2012-12-02 18:10:20 +01:00
Jona Ekenberg
2c5e4a7284 now the partner is set to null and disabled when pressing master, also the language is set to english 2012-12-02 17:55:30 +01:00
Jona Ekenberg
2434e36348 now partner is hidden when clicking bachelour or master, next step is master only 2012-12-02 16:33:38 +01:00
Emil Siverhall
a5be04075d Merge branch 'removeEdit' into develop 2012-11-30 10:03:12 +01:00
Emil Siverhall
83f859a971 removed edit feature of student project ideas for now, since we have problems editing master ideas 2012-11-30 10:02:56 +01:00
fred-fri
453335c8aa Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2012-11-30 15:17:15 +09:00
fred-fri
1bd77c59bf added authors to newideadialog 2012-11-30 15:14:21 +09:00
Emil Siverhall
ba82d5a856 Merge branch 'partnerFix' into develop 2012-11-29 23:44:16 +01:00
Emil Siverhall
ab3633fd43 add remove students panel only had delete icon visible for sysadmins. since we use the same component when supervisors add student to their ideas, we make delete available for other roles as well. 2012-11-29 23:43:12 +01:00
Jona Ekenberg
1f319ab3f0 trying to make it print when changing selection... 2012-11-29 23:32:54 +01:00
Jona Ekenberg
f4532fc9c3 changed width to span-6 but had to add style='float: none; margin-bottom: 0px;' for it to look good 2012-11-29 22:11:28 +01:00
Jona Ekenberg
dcf357c125 changed width to 100% 2012-11-29 21:45:00 +01:00
Arian Jafari
4e83620ff9 Merge branch 'master' of ssh://git.dsv.su.se/git/scipro/personal/aj into externallogin 2012-11-29 14:57:25 +01:00
Arian Jafari
2d3e87b80d Merge branch 'develop' of git.dsv.su.se:/git/scipro/scipro into externallogin 2012-11-29 14:55:21 +01:00
Arian Jafari
0f52b65dfe Adding PasswordHandler, to be used for encryption of external user passwords. 2012-11-29 14:22:09 +01:00
Arian Jafari
ee76b876f1 First commit. 2012-11-29 12:47:57 +01:00
fred-fri
4d77f0c61c changed back to project ideas for demo purposes 2012-11-29 19:04:19 +09:00
fred-fri
e1782f6b3c added first meeting details to newideapanel 2012-11-29 15:56:36 +09:00
fred-fri
2f0477fa57 added watsons box header above watson boxes 2012-11-29 14:35:05 +09:00
fred-fri
9b24449e95 changed from link to button 2012-11-29 14:25:50 +09:00
fred-fri
eba12783ef added or between the two options 2012-11-29 14:21:42 +09:00