DMC/scipro
7
0
Fork 0
Code Issues 31 Pull Requests 3 Actions Projects 1 Wiki Activity
5,273 Commits 7 Branches 413 Tags
Commit Graph

5273 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fredrik Friis
059c2e9471 css seems to work too 2012-03-07 13:14:48 +09:00
Fredrik Friis
fa0ba29516 fighting with cssssss 2012-03-07 13:04:10 +09:00
Fredrik Friis
1b36140350 beginning to add the panel to projectideasubmissionpage 2012-03-07 12:20:31 +09:00
Fredrik Friis
173af7763b new panel implemented and in use at supervisor profile panel 2012-03-07 11:58:14 +09:00
Fredrik Friis
9c2e9c11af panel works but so far only regular keywords and no abstract methods for getting the collections yet 2012-03-07 11:18:54 +09:00
Fredrik Friis
1f1145cba7 added panel that can use a container to select keywords 2012-03-07 11:02:45 +09:00
Fredrik Friis
3e67655c89 added container for keywords 2012-03-07 10:23:50 +09:00
Tom Vahlman
587fe066b2 Added a test. 2012-03-06 21:09:43 +01:00
Tom Vahlman
5766c5782d Merge branch 'create_popup_120306' into develop 2012-03-06 19:52:23 +01:00
Tom Vahlman
de68fe82ad Added new panel for publishing p-ideas in the Match module. 2012-03-06 19:44:24 +01:00
Tom Vahlman
b09e6fa3f5 Improper wicket id. 2012-03-06 19:10:57 +01:00
Tom Vahlman
9721e456fb Merge remote-tracking branch 'origin/develop' into develop 2012-03-06 16:50:37 +01:00
Tom Vahlman
d2947acc78 Added back the button Suggest manually to the Match-module. 2012-03-06 16:50:15 +01:00
Emil Siverhall
0a0d67bc09 Merge branch 'keywordNotNull' into develop 2012-03-06 15:48:54 +01:00
Emil Siverhall
b747ab3300 refactoring of keyword edit dialog to be able to use the same dialog for edit and create instead of almost identical panels. deleted old CreateKeywordPanel 2012-03-06 15:46:34 +01:00
Emil Siverhall
6c6f9affd4 Keyword without name is now longer possible to create. Feedback panel added to dialogs to make it easier to understand for the user 2012-03-06 15:23:02 +01:00
Tom Vahlman
4610d57f01 Revert wrong type of object was set to the matchModel. 2012-03-06 15:01:34 +01:00
Tom Vahlman
6249ce5154 Wrong type of object was set to the matchModel. 2012-03-06 14:43:32 +01:00
Emil Siverhall
715adc20e2 Merge branch 'keywordCreationFix' into develop 2012-03-06 13:18:51 +01:00
Emil Siverhall
07a0d5027e changed the order on the Manage keyword-page. Regular keywords are now at the top, since they are the only to be edited or created 2012-03-06 13:17:31 +01:00
Emil Siverhall
0e5eff46f5 added boolean that decides if a keyword panel should include ability to create and edit keywords. Units and research areas are now not editable in Scipro 2012-03-06 12:56:50 +01:00
Emil Siverhall
c77aa0c8fe Merge branch 'watsonCharFix' into develop 2012-03-06 11:01:29 +01:00
Emil Siverhall
75f03fe031 changed limit of watson fields to 4000. db changes needed and is included in current.sql 2012-03-06 11:00:38 +01:00
Emil Siverhall
0e0e56a9b8 Merge branch 'supervisorMyProjectIdeas' into develop 2012-03-06 10:26:24 +01:00
Emil Siverhall
9e8ce1f676 removed unused imports 2012-03-06 10:26:09 +01:00
Emil Siverhall
86cad73d55 Merge branch 'supervisorMyProjectIdeas' into develop 2012-03-06 10:22:13 +01:00
Emil Siverhall
8aad7e4056 small alignment fixes for panels 2012-03-06 10:19:27 +01:00
Emil Siverhall
8c45b5ec13 added menu option for new My Project Ideas tab in supervisor view and moved the project idea panel from supervisor start page 2012-03-06 10:19:25 +01:00
Tom Vahlman
2c2e9e3968 Changed size of icon to ImageObject.SIXTEEN. 2012-03-06 10:11:44 +01:00
Fredrik Friis
1287005baa new db update file 20120306 2012-03-06 13:08:55 +09:00
Fredrik Friis
0a5b8ea97e added suggested reviewer info to supervisor project idea popup 2012-03-06 12:45:48 +09:00
Fredrik Friis
f7599b6714 fixed mixup and made GUI clearer 2012-03-06 12:31:29 +09:00
Fredrik Friis
430d04ec7b Merge branch 'myBranch' into develop 2012-03-06 11:19:44 +09:00
Fredrik Friis
09f2e6b69e fixed the links a little 2012-03-06 11:19:06 +09:00
Tom Vahlman
9dbe6b9297 Simplified setup to tests. 2012-03-05 20:23:13 +01:00
Tom Vahlman
3a92cb08f5 Reverted to have @Transactional on method level instead of class level in tests. 2012-03-05 18:03:53 +01:00
Tom Vahlman
6d16b27062 Changed size of Icons to ImageObject.SIXTEEN. 2012-03-05 16:45:30 +01:00
Tom Vahlman
b1b1738277 Replaced deprecated FormFeedbackPanel with a FeedbackPanel + Changed size of Icons to ImageObject.SIXTEEN. 2012-03-05 16:43:47 +01:00
Emil Siverhall
fef14a1679 Merge branch 'supervisorFiltering' into develop 2012-03-05 15:43:37 +01:00
Emil Siverhall
3be38c0b3d added info box to keyword statistics page 2012-03-05 15:19:06 +01:00
Emil Siverhall
376f073364 added sorting link to supervisor keywords statistics page. 2012-03-05 15:06:22 +01:00
Emil Siverhall
f9dfc55d93 Merge branch 'watsonFix' into develop 2012-03-05 14:31:20 +01:00
Emil Siverhall
15c0db6664 minor changes to watson field counters. using custom validation instead of static StringValidator, to be able to show when user is writing to long inputs 2012-03-05 14:30:59 +01:00
Emil Siverhall
f4cd83843c added maximum limit of chars for watson boxes and counter with remaining chars 2012-03-05 14:30:56 +01:00
Emil Siverhall
a920500eb2 minor text changes for admin statistics front page 2012-03-05 14:30:54 +01:00
Tom Vahlman
3ede0870a8 Added a Transactional annotation on the test class. 2012-03-05 11:37:33 +01:00
Tom Vahlman
a82385ca46 Added the file test-applicationContext.xml, which replaces all the context files for tests. + Added property default-lazy-init, which is set to true, this means that only the beans that is used in the test are loaded. 2012-03-05 11:29:40 +01:00
Tom Vahlman
9e8b25a1aa Added the file test-applicationContext.xml, which replaces all the context files for tests. 2012-03-04 22:39:23 +01:00
Tom Vahlman
f092001a60 Merge remote-tracking branch 'origin/develop' into develop 2012-03-04 22:25:18 +01:00
Tom Vahlman
aee07067bf Added the file test-applicationContext.xml, which replaces all the context files for tests. 2012-03-04 22:24:53 +01:00