Emil Siverhall
|
daa8877ac0
|
Merge branch 'unit_import' into develop
|
2012-01-17 11:10:35 +01:00 |
|
Emil Siverhall
|
17d72fb6cc
|
added new unit test for retrieving keyword by name and type from dao
|
2012-01-17 11:06:58 +01:00 |
|
Fredrik Friis
|
9b5b05b15f
|
author limits commented out, not implemented yet
|
2012-01-17 18:49:41 +09:00 |
|
Fredrik Friis
|
57acfb43bc
|
better comments in filterstringpanel
|
2012-01-17 12:35:54 +09:00 |
|
Fredrik Friis
|
46559f8925
|
added new completedprojectstatuspanel to supervisorprojectdetailspage
|
2012-01-17 11:09:40 +09:00 |
|
Emil Siverhall
|
4f80730689
|
added unit import to existing supervisor bulk import worker thread
|
2012-01-16 15:05:32 +01:00 |
|
Emil Siverhall
|
bcea12324b
|
manual unit import for supervisors is now working. if a supervisor is already attached to a unit, this is being overwritten with the data from daisy. if a supervisor is attached to more than one unit, the first added will be overwritten by the next one.
|
2012-01-16 14:22:26 +01:00 |
|
Fredrik Friis
|
40f8a1889e
|
added new completedprojectstatuspanel to projectstartpage
|
2012-01-16 16:28:18 +09:00 |
|
Fredrik Friis
|
ea25fa95fd
|
new panel for completed projects project state
|
2012-01-16 16:03:15 +09:00 |
|
Fredrik Friis
|
1a38569a5a
|
added project facade method
|
2012-01-16 15:30:24 +09:00 |
|
Fredrik Friis
|
cc6e453646
|
added 5 character requirement to project idea watson boxes
|
2012-01-16 13:28:42 +09:00 |
|
Emil Siverhall
|
8a58a74cc3
|
minor gui changes to admin match menus
|
2012-01-15 22:34:38 +01:00 |
|
Emil Siverhall
|
977f123914
|
merge conflict fix
|
2012-01-15 22:32:32 +01:00 |
|
Emil Siverhall
|
3f0635e616
|
merge conflict
|
2012-01-15 20:50:31 +01:00 |
|
Tom Vahlman
|
88b449116e
|
Implemented the edit-button, because it didnt worked....
|
2012-01-13 17:47:08 +01:00 |
|
Tom Vahlman
|
35cd5999f7
|
Added null check on supervisor name.
|
2012-01-13 14:41:00 +01:00 |
|
Fredrik Friis
|
dcb0afb493
|
Merge branch 'release20120113'
|
2012-01-13 18:24:55 +09:00 |
|
Fredrik Friis
|
0ca5383355
|
fixed markup mailto bug
|
2012-01-11 22:00:58 +09:00 |
|
Fredrik Friis
|
694f98da22
|
fixed markup bug
|
2012-01-11 21:52:56 +09:00 |
|
Fredrik Friis
|
dfb3cf7d57
|
some cleanup
|
2012-01-11 20:13:37 +09:00 |
|
Fredrik Friis
|
0d261aa731
|
some cleanup
|
2012-01-11 20:11:11 +09:00 |
|
Fredrik Friis
|
4570b1f86a
|
removing unnecessary stuff
|
2012-01-11 20:09:01 +09:00 |
|
Fredrik Friis
|
2db8b14c97
|
putting details on rows of their own
|
2012-01-11 20:02:55 +09:00 |
|
Fredrik Friis
|
914f57f491
|
moved projectdetailspanel to top left for supervisor
|
2012-01-11 19:37:43 +09:00 |
|
Fredrik Friis
|
96ca57dc74
|
removed GUI bug
|
2012-01-11 17:21:28 +09:00 |
|
Fredrik Friis
|
cc8913d6d1
|
fixed buttons instead of links for actions
|
2012-01-11 17:01:08 +09:00 |
|
Fredrik Friis
|
b3fbe143e5
|
removing notes for now
|
2012-01-11 16:52:54 +09:00 |
|
Fredrik Friis
|
b3fd3517e5
|
removed number of events info
|
2012-01-11 16:41:06 +09:00 |
|
Fredrik Friis
|
d17d6e53d3
|
added some instructions
|
2012-01-11 16:35:59 +09:00 |
|
Fredrik Friis
|
c9697bdafd
|
removed delete icon from checklisttemplates that are connected to activities in activity plan templates
|
2012-01-11 16:21:29 +09:00 |
|
Fredrik Friis
|
22e706c811
|
removed char limit from projectscheduleevent entity- this must go with a database change as well!
|
2012-01-11 15:48:25 +09:00 |
|
Fredrik Friis
|
1ad96aaf7e
|
added refresh for suggest matches button
|
2012-01-11 13:56:45 +09:00 |
|
FredrikNorberg
|
cfe63fff1b
|
quick fix for projectpartnerautocomplete, i just replace the strangely encoded chars for å,ä and ö.
|
2012-01-10 19:03:49 +01:00 |
|
Emil Siverhall
|
ee37623ffe
|
some gui changes at admin - match - manage keywords
|
2012-01-10 16:00:04 +01:00 |
|
Emil Siverhall
|
c2ed8d66e0
|
minor cleanup, todo
|
2012-01-10 15:42:40 +01:00 |
|
Emil Siverhall
|
f9f9e188e0
|
Units are now being retrieved from external Daisy API. The units that not exists is being added as keywords.
|
2012-01-10 14:10:47 +01:00 |
|
Fredrik Norberg
|
9932dc8c4b
|
fixed testviewchecklistbyrespondant test, it now removes special whitespaces aswell
|
2012-01-10 13:37:28 +01:00 |
|
Emil Siverhall
|
92b45db6ac
|
started working with unit import for supervisors. still a lot to be done
|
2012-01-09 16:33:14 +01:00 |
|
Tom Vahlman
|
cfd4f39a69
|
"Rejected ideas" list should have an edit button and should only render rejected ideas. + "Search among all project ideas" list should not render any rejected ideas.
|
2012-01-09 15:49:11 +01:00 |
|
Tom Vahlman
|
4431a88c25
|
The "Send back to author"-button etc. should save the changed status (Status.REFUSED) in the Match table.
|
2012-01-09 12:12:53 +01:00 |
|
Emil Siverhall
|
f5be0fcce0
|
gui changes to admin - match - project ideas
|
2012-01-09 11:06:36 +01:00 |
|
Fredrik Friis
|
e9294097a8
|
made some alterations to a bad test and commented out another one that makes no sense
|
2012-01-09 12:33:00 +09:00 |
|
Fredrik Friis
|
3d185c1af0
|
Merge branch 'openprojectideafix' into develop
|
2012-01-09 12:15:23 +09:00 |
|
Fredrik Friis
|
d768cf3ad6
|
fixed weird implementation of project idea filter method for status unmatched project ideas
|
2012-01-09 12:12:27 +09:00 |
|
Fredrik Friis
|
1007a53c54
|
Merge branch 'release20120109'
|
2012-01-09 10:35:13 +09:00 |
|
Fredrik Friis
|
2b77fc19cc
|
fixed checklist files bug for supervisor
|
2012-01-09 10:18:20 +09:00 |
|
Fredrik Friis
|
8df8876a57
|
fixed max width for file select tag
|
2012-01-09 09:43:59 +09:00 |
|
Fredrik Friis
|
259f6b9221
|
Merge branch 'openprojectideafix' into develop
|
2012-01-05 16:13:48 +09:00 |
|
Fredrik Friis
|
8b3f49fc74
|
added some urls
|
2012-01-05 15:38:14 +09:00 |
|
Fredrik Friis
|
9d22ee9892
|
tests wont work with springbean so i removed it and instantiate the factory as usual instead
|
2012-01-05 12:55:08 +09:00 |
|