Niklas Herder
1b57c31778
Added CharacterEncodingFilter to force all requests to use utf-8.
2012-03-12 11:23:12 +01:00
Fredrik Friis
9aae5b6ed1
fixed some markup
2012-03-12 18:48:57 +09:00
Fredrik Friis
023d8dd089
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2012-03-12 16:23:37 +09:00
Fredrik Friis
5721b60698
added confirmation popup for force accepting project ideas
2012-03-12 16:23:21 +09:00
Emil Siverhall
5ac11fe1f5
Merge branch 'projectIdeaSorting' into develop
...
* projectIdeaSorting:
minor code cleanup
added dropdown choice to select number of ideas per page from the data provider. also added sort links for level, title, status and matched to
2012-03-11 21:46:22 +01:00
Emil Siverhall
caa005f95d
minor code cleanup
2012-03-11 21:41:05 +01:00
Emil Siverhall
c7c9c8614c
added dropdown choice to select number of ideas per page from the data provider. also added sort links for level, title, status and matched to
2012-03-11 21:27:24 +01:00
Tom Vahlman
49c8782157
Removed a dependency which was commented out.
2012-03-10 13:08:28 +01:00
Tom Vahlman
3410ece02f
Removed dependencys to resolve Jenkins build
2012-03-10 13:00:50 +01:00
Tom Vahlman
be57812f6a
Merge branch 'develop' of git.dsv.su.se:/git/scipro/scipro into develop
...
Conflicts:
src/main/java/se/su/dsv/scipro/match/panel/AdminManageProjectIdeaPanel.java
2012-03-10 12:50:01 +01:00
Tom Vahlman
5713076f36
Added feedback panels which can be used to add information messages to the GUI-user.
2012-03-10 11:48:46 +01:00
Tom Vahlman
13db9ee7f3
Changed toString to make the AC-component work.
2012-03-10 11:46:45 +01:00
Tom Vahlman
86148973f9
Added visural framework containing many wicket componentes + added framework for using query expressions, eg. BooleanExpresseion
2012-03-10 11:45:46 +01:00
Fredrik Friis
ffdc94a3ae
Merge branch 'alexander' into develop
2012-03-10 13:05:52 +09:00
Fredrik Friis
d2efff8c6b
small markup change
2012-03-10 13:05:37 +09:00
Fredrik Friis
63c9dd4b4e
added a magical button for force accepting all suggested ideas
2012-03-09 19:14:19 +09:00
Fredrik Friis
7234378897
added setting for whether supervisors can accept or reject project ideas themselves
2012-03-09 17:46:09 +09:00
Fredrik Friis
4af195cf9d
no checklist option added to activities in activity plan panel
2012-03-09 15:43:50 +09:00
Fredrik Friis
a1df9cf7a8
removed redundant headers
2012-03-09 15:20:36 +09:00
Fredrik Friis
06dcf9a528
added new db update file
2012-03-08 16:21:33 +09:00
Fredrik Friis
9b7c708a06
removed already executed sql from current.sql
2012-03-08 16:12:46 +09:00
Fredrik Friis
f3cabbe41e
added current sql, reset the persistence autoupdate to commented
2012-03-08 14:45:48 +09:00
Fredrik Friis
c71680376c
added savebutton for match points
2012-03-08 13:45:30 +09:00
Fredrik Friis
756133729c
added savebutton for match points
2012-03-08 13:44:52 +09:00
Fredrik Friis
3e01afc66a
added weights to db, edited panel to load the single weights object in db
2012-03-08 12:51:59 +09:00
Fredrik Friis
06eec58f12
changed match point settings
2012-03-08 11:58:31 +09:00
Fredrik Friis
20139048ea
fixed some bugs in activity plan template editing. that whole panel need major refactoring.
2012-03-08 11:25:04 +09:00
Alexander Kozynchenko
f10e00bcff
dates for student exemptions are shown
2012-03-07 11:37:51 +01:00
Fredrik Friis
751c6bf5b9
fixed nullpointer at project deletion
2012-03-07 17:14:20 +09:00
Fredrik Friis
930420d162
added level to project idea popup
2012-03-07 16:53:11 +09:00
Fredrik Friis
804bdfe1af
some cleanup
2012-03-07 15:19:26 +09:00
Fredrik Friis
e9305812a3
changed panel a bit
2012-03-07 14:15:10 +09:00
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
