Tom Vahlman
7502e4a1e9
Test commit again
2012-01-25 17:34:39 +01:00
Tom Vahlman
1cd350e61f
Merge branch 'develop' of git.dsv.su.se:/git/scipro/scipro into develop
2012-01-25 17:04:18 +01:00
Tom Vahlman
e321ca2a76
Test commit
2012-01-25 16:06:58 +01:00
Tom Vahlman
7d3487e050
Test commit
2012-01-25 15:19:30 +01:00
Niklas Herder
94e3633588
Added Maven settings.xml for the DSV Maven repo.
2012-01-25 14:19:34 +01:00
Fredrik Friis
f079825399
creating test for making sure a project idea that has been rejected by some user in the past is not matched to that same user again
2012-01-25 18:21:38 +09:00
Fredrik Friis
6fe2965bbf
matching algoritm now knows not to match ideas to user who previously rejected it
2012-01-25 17:47:13 +09:00
Fredrik Friis
2a91adc72d
changed a commenting error
2012-01-25 16:23:56 +09:00
Fredrik Friis
7a7fb7aa86
fixade bugg
2012-01-25 16:05:50 +09:00
Fredrik Friis
f73dfa4fb0
lade in språkinfo på perform peer review sidan
2012-01-25 15:51:36 +09:00
Fredrik Friis
ac89805f71
lade in språkinfo på peer request page
2012-01-25 15:48:56 +09:00
FredrikNorberg
44c5b9971c
Merge branch 'provider_fix' into develop
2012-01-24 11:50:23 +01:00
FredrikNorberg
bdbddfa242
removed unecesary code from projectIdeaProvider and fixed so waiting ideas now come in correct order
2012-01-24 11:49:05 +01:00
Fredrik Friis
411eb6a484
refused idea that is rewritten is now treated just like any new idea
2012-01-24 11:47:38 +09:00
Fredrik Friis
0fad716a13
removed unused dao from project idea submission panel
2012-01-24 11:25:55 +09:00
Fredrik Friis
4eb57603aa
rejected ideas are no longer have supervisors and pre approved match type
2012-01-23 22:02:48 +09:00
Fredrik Friis
04c4af1526
author can now edit project idea if it is refused instead of rejected
2012-01-23 21:06:39 +09:00
FredrikNorberg
46bf290053
supervisors can now see confimed projectIdeas
2012-01-23 11:21:58 +01:00
Fredrik Friis
3b52d5217d
cleanup
2012-01-23 17:34:34 +09:00
Fredrik Friis
174a16c344
finishing touches on remove author from project idea functionality + no bug in hand in required label fixed
2012-01-23 17:32:19 +09:00
Fredrik Friis
fd5fe35d7d
adding panel for removing authors to project idea edit panel
2012-01-23 14:56:09 +09:00
Fredrik Friis
61c18714f9
cleanup
2012-01-23 14:02:21 +09:00
Fredrik Friis
6bc1ca0dfe
fixed some statuses and desciptions on admin edit projet idea panel
2012-01-23 13:44:54 +09:00
Fredrik Friis
d8fb6c5dec
Merge branch 'release20120123'
2012-01-23 12:36:09 +09:00
Fredrik Friis
f67a0ede55
new sql update file
2012-01-23 12:15:27 +09:00
Emil Siverhall
0ff5072841
Merge branch 'gui_improvements_match' into develop
...
* gui_improvements_match:
small menu fix
made dialog bigger on manage supervisor popup as well, to avoid horizontal scroll
code cleanup
more dialog size changes and other gui fixes to match administration
changes to dialog size in top waiting and rejected project ideas edit button
gui changes to edit dialog when managing project ideas from admin page. also some minor code cleanup
gui improvements on manage supervisor page
info box added to manage keyword page
gui changes to make tables look better and also some improvements on checkbox area on manage project ideas page
minor gui changes to manage supervisor panel
added info box to student exemption panel
added info box to automatic match panel
2012-01-22 20:48:02 +01:00
Emil Siverhall
dbda4ed9e9
small menu fix
2012-01-22 20:47:06 +01:00
Emil Siverhall
82eea65411
made dialog bigger on manage supervisor popup as well, to avoid horizontal scroll
2012-01-22 20:47:02 +01:00
Emil Siverhall
8a2d49369c
code cleanup
2012-01-22 20:46:58 +01:00
Emil Siverhall
1f5ceaf5a2
more dialog size changes and other gui fixes to match administration
2012-01-22 20:46:55 +01:00
Emil Siverhall
03c221f2ef
changes to dialog size in top waiting and rejected project ideas edit button
2012-01-22 20:46:51 +01:00
Emil Siverhall
3a0d42d924
gui changes to edit dialog when managing project ideas from admin page. also some minor code cleanup
2012-01-22 20:46:47 +01:00
Emil Siverhall
4e9da74ba3
gui improvements on manage supervisor page
2012-01-22 20:46:43 +01:00
Emil Siverhall
47d105408c
info box added to manage keyword page
2012-01-22 20:46:40 +01:00
Emil Siverhall
5d1225c5e8
gui changes to make tables look better and also some improvements on checkbox area on manage project ideas page
2012-01-22 20:46:36 +01:00
Emil Siverhall
eae1595ed9
minor gui changes to manage supervisor panel
2012-01-22 20:46:32 +01:00
Emil Siverhall
1f15fe0888
added info box to student exemption panel
2012-01-22 20:46:28 +01:00
Emil Siverhall
2a4451838b
added info box to automatic match panel
2012-01-22 20:46:25 +01:00
Tom Vahlman
8d2d8e6f3a
Fixed failed test changeStatus has been changed but the test was probably fault.
2012-01-20 10:42:29 +01:00
Fredrik Friis
3b896c7c55
fixed some bugs
2012-01-20 18:25:38 +09:00
Fredrik Friis
e94f2bd9fd
added add from template link and panel
2012-01-20 17:45:21 +09:00
Fredrik Friis
44e405d35e
view, edit and new works
2012-01-20 17:28:35 +09:00
Fredrik Friis
6cc490ee4c
added checklist chooser
2012-01-20 17:11:49 +09:00
Fredrik Friis
b6e9576e16
added more stuff to edit panel
2012-01-20 16:31:42 +09:00
Fredrik Friis
e8bf4e9154
added functioning date
2012-01-20 14:29:34 +09:00
Fredrik Friis
26db39d3c4
added button that closes dialog
2012-01-20 14:20:10 +09:00
Fredrik Friis
e8912d81b6
added namefield to form
2012-01-20 14:14:49 +09:00
Fredrik Friis
7f72b95c16
begun implementing new dialogs
2012-01-20 14:10:40 +09:00
Fredrik Friis
44271db333
commented out all old dialogs
2012-01-20 13:44:21 +09:00
Fredrik Friis
5be9c74f75
added panel for editing events
2012-01-20 13:37:27 +09:00
