Fredrik Norberg
999bb1d304
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
...
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
Added possibility to set availability
Added feedback messages
changed peer menu according to request
sort and edit bug fixed
Injected the real algorithm and renamed it greedy to indicate algorithm type
Added number of unmatched ideas to match form
Match algorithm
Updated sql-script for the next deploy cycle.
Updated current sql with match sql
adding dummy thing
working on edit panel
2011-12-09 11:21:01 +01:00
Daniel Hasselrot
5eaac62dbb
Added possibility to set availability
2011-12-09 10:45:41 +01:00
Daniel Hasselrot
5591af0c3f
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2011-12-09 10:33:17 +01:00
Daniel Hasselrot
51925a631e
Added feedback messages
2011-12-09 10:32:22 +01:00
Fredrik Friis
88c05aee38
changed peer menu according to request
2011-12-09 14:30:12 +09:00
Fredrik Friis
e7e0f2b45e
Merge branch 'checklisttemplatefiltereditbugfix' into develop
2011-12-09 12:21:21 +09:00
Fredrik Friis
9e9ea44481
sort and edit bug fixed
2011-12-09 12:14:46 +09:00
Emil Siverhall
4d2fbded21
disabled the possibility to edit project ideas if a match object exists. may need some changes to handle ideas that's been sent back to authors.
2011-12-08 21:12:39 +01:00
Emil Siverhall
e3e20a39e3
Added current match status to the table with my project ideas in student view
2011-12-08 20:21:40 +01:00
Daniel Hasselrot
3f4d9d8c01
Injected the real algorithm and renamed it greedy to indicate algorithm type
2011-12-08 18:16:20 +01:00
Daniel Hasselrot
1811f3100b
Added number of unmatched ideas to match form
2011-12-08 17:33:36 +01:00
Alex Robsahm
a1a2b4e6b4
Merge branch 'match' into develop
2011-12-08 17:28:22 +01:00
Alex Robsahm
e8169c1868
Match algorithm
2011-12-08 17:27:42 +01:00
Robin Eklund
9887b2ed98
Updated sql-script for the next deploy cycle.
2011-12-08 17:22:50 +01:00
Fredrik Norberg
9e001aa2f0
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
...
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro: (55 commits)
Injecting strategy using spring
Matches are now saved after matching
Storing matches
Save matches
Ajax run matcher on submit
Config's for tests massaged (sigh)
added alter scripts
Refactored keyword-type creation and access to a (very slightly) more safe variant based on named konstants.
removed the details again =) this wwhole panel must be refactored
added details to a panel
fixed another bug
fixed bug
found a bug in the new checklisttemplatepanel, when results are filtered clicking to edit a checklisttemplate sometimes brings up the wrong template for editing. removing the panel until bug is fixed.
Removed comments
Enable/Disable DatePicker button
Minor ui-fixes, this will need the eyes of a css-guru at some point.
Slight refactoring to support easier extensability of new user-details.
Added editing of user and supervisor profiles, will need some cleaning up.
Removed Author and used Student instead
Remove local persistence parameters
...
2011-12-08 16:13:15 +01:00
Daniel Hasselrot
206ed3f095
Updated current sql with match sql
2011-12-08 16:10:28 +01:00
Daniel Hasselrot
495903ad00
Injecting strategy using spring
2011-12-08 13:27:09 +01:00
Daniel Hasselrot
2b26da19fe
Matches are now saved after matching
2011-12-08 13:27:09 +01:00
Daniel Hasselrot
ededb1ebd2
Storing matches
2011-12-08 13:27:07 +01:00
Daniel Hasselrot
c9501f7644
Save matches
2011-12-08 13:27:07 +01:00
Daniel Hasselrot
b9123caeee
Ajax run matcher on submit
2011-12-08 13:27:07 +01:00
Fredrik Friis
c9d6738c9d
removed script from current
2011-12-08 20:39:31 +09:00
Fredrik Friis
073360ddd5
removed script from current
2011-12-08 20:39:18 +09:00
Fredrik Friis
5bfba04d60
Merge branch 'master' of ssh://git.dsv.su.se/git/scipro/scipro into hotfixcheck
2011-12-08 20:21:15 +09:00
Fredrik Friis
c25260a0f1
fixade dependency xml
2011-12-08 20:17:31 +09:00
Robin Eklund
9906e1ffe0
Config's for tests massaged (sigh)
2011-12-08 12:07:33 +01:00
Fredrik Friis
60ed0fcb29
conflicts resolved
2011-12-08 19:31:58 +09:00
Fredrik Friis
710dc2a989
added alter scripts
2011-12-08 19:21:32 +09:00
Fredrik Friis
e0397ed795
adding dummy thing
2011-12-08 19:08:15 +09:00
Robin Eklund
dbb2c6c0ef
Refactored keyword-type creation and access to a (very slightly) more safe variant based on named konstants.
2011-12-08 11:05:30 +01:00
Fredrik Friis
165ed30935
working on edit panel
2011-12-08 18:54:07 +09:00
Fredrik Friis
a228e4f5e8
removed the details again =) this wwhole panel must be refactored
2011-12-08 15:13:41 +09:00
Fredrik Friis
75f8cf41b7
added details to a panel
2011-12-08 15:00:20 +09:00
Fredrik Friis
b5ef603f11
fixed another bug
2011-12-08 14:28:30 +09:00
Fredrik Friis
b914773437
fixed bug
2011-12-08 14:13:07 +09:00
Fredrik Friis
d778dcc220
found a bug in the new checklisttemplatepanel, when results are filtered clicking to edit a checklisttemplate sometimes brings up the wrong template for editing. removing the panel until bug is fixed.
2011-12-08 11:34:17 +09:00
Alex Robsahm
0c2c7a7bd1
Removed comments
2011-12-07 19:46:29 +01:00
Alex Robsahm
a11badbf4f
Enable/Disable DatePicker button
2011-12-07 18:32:19 +01:00
Robin Eklund
75e5d1dda1
Minor ui-fixes, this will need the eyes of a css-guru at some point.
2011-12-07 18:19:50 +01:00
Robin Eklund
f0cdc60526
Slight refactoring to support easier extensability of new user-details.
...
Merging to develop for visibility/testing, but this will need more attention.
2011-12-07 18:10:51 +01:00
Robin Eklund
479e615deb
Merge branch 'develop' into supervisorProfile
2011-12-07 17:26:38 +01:00
Robin Eklund
100711e7fb
Added editing of user and supervisor profiles, will need some cleaning up.
2011-12-07 17:25:20 +01:00
Daniel Hasselrot
1f9569dd20
Merge branch 'rolerefactor' into develop
2011-12-07 16:58:29 +01:00
Daniel Hasselrot
e317b143c6
Removed Author and used Student instead
2011-12-07 16:44:43 +01:00
Daniel Hasselrot
870b08fe87
Remove local persistence parameters
2011-12-07 16:18:28 +01:00
Daniel Hasselrot
0b89ffeff1
Removed supervisor and changed to use employee instead
2011-12-07 16:02:44 +01:00
Daniel Hasselrot
a4f2609704
Pushed up supervisor functionality to supervisor
2011-12-07 15:30:37 +01:00
Daniel Hasselrot
d4b458b87f
Fixed compilation and test error
2011-12-07 14:52:08 +01:00
Daniel Hasselrot
a043058ec1
Fixed merge error
2011-12-07 14:43:14 +01:00
Alex Robsahm
cf4ba0b1b2
Changes for Supervisor and Admin
2011-12-07 14:26:13 +01:00
