Commit Graph

5105 Commits

Author SHA1 Message Date
Fredrik Friis
8e876b86c5 made delete student and follower icons visible only to sysadmins 2012-03-20 13:57:09 +09:00
Fredrik Friis
5d23572f87 added delete icons 2012-03-20 13:53:37 +09:00
Fredrik Friis
6638ee86c6 cleaned up ac components 2012-03-20 13:42:04 +09:00
Fredrik Friis
bef1b5ee29 save button refreshes the page 2012-03-20 13:27:44 +09:00
Fredrik Friis
546d5fcc79 saving works, even for new projects 2012-03-20 12:42:51 +09:00
Fredrik Friis
1ee43eab73 added emptylabel to markup 2012-03-20 12:20:17 +09:00
Fredrik Friis
bf77d8eff3 Merge branch 'develop' into project 2012-03-20 11:59:49 +09:00
Fredrik Friis
878c8eafaf fixed add bug 2012-03-20 11:59:09 +09:00
Fredrik Friis
95cd0ca189 Merge branch 'develop' into project 2012-03-20 11:06:51 +09:00
Tom Vahlman
23240210c1 Added list view for rendering the selecte key words + added a clear button. 2012-03-19 21:50:17 +01:00
Tom Vahlman
05dbe02006 Added list view for rendering the selecte key words + added a clear button. 2012-03-19 21:48:56 +01:00
FredrikNorberg
9e8c4fb29a Merge branch 'matchAdminMenu' into develop 2012-03-19 16:50:42 +01:00
FredrikNorberg
c942f966c1 Changed the match admin menu from vertical to horizontal 2012-03-19 16:50:00 +01:00
Emil Siverhall
a1d9292994 added new tab for match history for each project idea 2012-03-19 16:13:49 +01:00
FredrikNorberg
e5c2805125 Merge branch 'matchStatus' into develop 2012-03-19 16:08:49 +01:00
FredrikNorberg
af56e86c5b changed the printed text of Match.Status enums 2012-03-19 16:08:10 +01:00
Tom Vahlman
08e9923071 Added "flow" to place out components in the new interface. 2012-03-19 15:48:50 +01:00
Tom Vahlman
68942c6af5 Merge remote-tracking branch 'origin/develop' into develop 2012-03-19 15:45:07 +01:00
Tom Vahlman
98b6b0eae2 Added "flow" to place out components in the new interface. 2012-03-19 15:44:50 +01:00
FredrikNorberg
5748b0abac updated testcases for application periods to match new changes 2012-03-19 14:39:11 +01:00
FredrikNorberg
0681596e68 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2012-03-19 14:30:46 +01:00
FredrikNorberg
f5cd36522f added statistics for all application periods 2012-03-19 14:30:10 +01:00
Emil Siverhall
50ccee4951 Merge branch 'markup_cleanup' into develop 2012-03-19 13:45:43 +01:00
Emil Siverhall
b6a85e5f9c removed components that was added in java but not html markup. this only gave page rendering error when running wicket in development mode, and not deployment, which have been standard before. 2012-03-19 13:44:48 +01:00
FredrikNorberg
fe5841c01d added pages and panels for projectIdea statistics 2012-03-19 12:06:51 +01:00
Niklas Herder
04cfaf7d0c Merge branch 'feature/maven_profiles_jndi' into develop
Conflicts:
	src/main/webapp/WEB-INF/web.xml
2012-03-19 08:56:50 +01:00
Niklas Herder
72fdef0fdc Merge branch 'feature/cleanuplisteners' into develop 2012-03-19 08:53:15 +01:00
Fredrik Friis
82ab4a1c36 added saving 2012-03-19 14:47:44 +09:00
Fredrik Friis
7c5815e597 added validation 2012-03-19 14:16:19 +09:00
Fredrik Friis
4d74af5e81 added feedbackpanel and improved savebutton 2012-03-19 13:05:22 +09:00
Fredrik Friis
bf98fbba12 some markup cleanup 2012-03-19 12:46:12 +09:00
Fredrik Friis
05f83a95a3 no more nullpointers when autocompletecomponents are empty on submit 2012-03-19 12:37:58 +09:00
Fredrik Friis
0ec9aec4c5 Merge branch 'develop' into project 2012-03-19 12:13:22 +09:00
Fredrik Friis
901d9a6fc7 added mailaddress to watsonboxpanel 2012-03-19 12:03:23 +09:00
Tom Vahlman
3c2803b1e0 Added auto complete components to the new interface. 2012-03-18 13:57:08 +01:00
Tom Vahlman
4aecd5fa18 Adapted toString to the auto complete component. 2012-03-18 13:56:11 +01:00
Tom Vahlman
f05e676acb The supervisors should see a sortable list showing unmatched project ideas. 2012-03-17 21:23:42 +01:00
Tom Vahlman
83b8ee6855 The supervisors should see a sortable list showing unmatched project ideas. 2012-03-17 19:02:58 +01:00
Tom Vahlman
e54c6f485c The supervisors should see a sortable list showing unmatched project ideas. 2012-03-17 19:02:14 +01:00
Tom Vahlman
8b8253679f The supervisors should see a sortable list showing unmatched project ideas. 2012-03-17 19:01:27 +01:00
Tom Vahlman
b55f2777a3 The supervisors shall see a list with unmatched project ideas, first version. 2012-03-16 22:27:55 +01:00
Tom Vahlman
5aa2d73595 NPE:s when filling in incorrect name in the AC components in some of the Match actions. 2012-03-16 14:09:14 +01:00
Fredrik Friis
cb1e6fff5b some experimenting 2012-03-16 18:21:15 +09:00
Niklas Herder
11b51ff1fd Added cleanup listeners. 2012-03-16 09:31:08 +01:00
Fredrik Friis
7a503f72eb cleanup 2012-03-16 15:43:09 +09:00
Fredrik Friis
f84e21833c followerthingie works 2012-03-16 15:38:23 +09:00
Fredrik Friis
ddafd92e54 cleanup 2012-03-16 15:22:20 +09:00
Fredrik Friis
1f02988b83 added new panel for adding and removing project followers 2012-03-16 15:16:42 +09:00
Fredrik Friis
a7f8d770ba head supervisor thingie works but it needs to be set to the same head supervisor as the one in the project 2012-03-16 14:21:50 +09:00
Fredrik Friis
809d7aaa66 students thingie now works, time for head supervisor 2012-03-16 13:57:25 +09:00