6238 Commits

Author SHA1 Message Date
ab31720ae8 Fixed language display on supervisor idea submission. 2014-02-18 18:31:38 +01:00
21f2af1a22 Fixed language display on student idea submission. 2014-02-18 18:30:34 +01:00
109acdd91e You can NOT call getString(), ResourceModel#getObject or StringResourceModel#getObject in a Components constructor. 2014-02-18 18:28:12 +01:00
Richard
a8d951012b More CSS cleanup. 2014-02-18 18:10:32 +01:00
Richard
5bfeb57c82 Removed FilterStringPanel.html since it wasn't being used anymore. 2014-02-18 18:07:47 +01:00
Richard
7b8367786d Continued work with the css cleanup. 2014-02-18 18:03:44 +01:00
Golrokh Moattar
752807c0d9 One page and one panel added for updating of projects 2014-02-18 17:10:41 +01:00
Richard
52db967362 Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	view/src/main/webapp/css/scipro_m.css
2014-02-18 17:02:36 +01:00
Richard
a787cfdcad - Continued work with upgrading to bootstrap 3.1.1.
- Removed unused CSS-classes.
- Renamed a couple of CSS-classes.
- Added upgraded bootstrap JS-file.
2014-02-18 16:58:28 +01:00
Emil Siverhall
042720bd0a removed ( author ) from checklist comment info-box since only authors are answering checklists 2014-02-18 16:47:34 +01:00
Emil Siverhall
60d4735cbe Merge remote-tracking branch 'origin/develop' into develop 2014-02-18 16:20:30 +01:00
Emil Siverhall
b7086bdbb0 some changes to TrafficLightPanel 2014-02-18 16:19:58 +01:00
9b520d9716 Added ugly date filtering to mail log. 2014-02-18 16:19:42 +01:00
97bfc08bb4 Added constructor that accepts IModel<Date> instead of only Date. 2014-02-18 16:16:35 +01:00
858b27966d Made the deactivatable datepicker not abstract so you do not have to use ajax. 2014-02-18 16:15:01 +01:00
7c1bc7d163 Fixed faulty selector 2014-02-18 15:37:27 +01:00
cc47784b28 Merge remote-tracking branch 'origin/develop' into develop 2014-02-18 15:10:19 +01:00
6d57e9237a Removed targetLastModified attribute from FileDescription, now uses dateCreated instead. 2014-02-18 15:10:10 +01:00
leosu
2852a03197 radios 2014-02-18 14:55:15 +01:00
Emil Siverhall
c4cb37ec23 removed SupervisorCategoryInfoPanel 2014-02-18 14:50:50 +01:00
Emil Siverhall
02108f8f89 some refactoring in AnswerDialogPanel 2014-02-18 14:44:47 +01:00
leosu
d6528c61e5 SeminarOppositionPanel stuffs 2014-02-18 14:41:35 +01:00
4082b7a2e6 Removed content-type column from file page. 2014-02-18 14:22:51 +01:00
leosu
6c39614eed Merge remote-tracking branch 'origin/develop' into develop 2014-02-18 14:02:02 +01:00
leosu
55b14a2f2b confirmation link 2014-02-18 14:01:50 +01:00
Emil Siverhall
8be12f8c62 moved panel and removed unnecessary constructor parameter currentUser 2014-02-18 13:53:58 +01:00
839dac42ee Merge branch 'develop' into improvement/files 2014-02-18 13:49:28 +01:00
leosu
8271be3944 Merge remote-tracking branch 'origin/develop' into develop 2014-02-18 13:42:16 +01:00
leosu
d4a6898291 SeminarOppositionPanel first draft
FinalSeminarOppositionService.findAll() can now find by FinalSeminar
2014-02-18 13:41:31 +01:00
Emil Siverhall
14d0eda12d Merge remote-tracking branch 'origin/develop' into develop 2014-02-18 13:30:43 +01:00
Emil Siverhall
ad21ee8d25 ChecklistQuestionPanel simplified 2014-02-18 12:56:57 +01:00
1a0a98e940 Merge remote-tracking branch 'origin/develop' into improvement/files 2014-02-18 12:39:01 +01:00
leosu
eee542014c Merge remote-tracking branch 'origin/develop' into develop 2014-02-18 11:50:40 +01:00
leosu
64f7205ea8 SeminarActiveParticipantsPanel finished 2014-02-18 11:50:32 +01:00
1e371d850e Removed reference to repositoryContext.xml from web.xml 2014-02-18 11:06:25 +01:00
27b3fd1185 Added missing dependency. 2014-02-18 11:06:14 +01:00
leosu
7451471bda SeminarActiveParticipantsPanel stuff 2014-02-18 10:50:54 +01:00
748a23e8f6 Made file links disabled if no data is available (it might be missing now that data is no longer stored directly in the file description). 2014-02-18 10:17:12 +01:00
Emil Siverhall
1c4229834b removed redundant container and unnecessary ajaxification from ViewChecklistTemplatePanel 2014-02-18 10:10:11 +01:00
8b2a27ad4c Merge remote-tracking branch 'origin/develop' into improvement/files 2014-02-18 10:07:08 +01:00
247fa06efd Jackrabbit is no more! 2014-02-18 10:04:41 +01:00
leosu
80d9b847b9 SeminarActiveParticipantsPanel first draft 2014-02-18 09:46:37 +01:00
Emil Siverhall
a357289a1f moved checklist panels to checklists-package 2014-02-18 09:41:05 +01:00
8252ac2b7b Removed the final dependency on jackrabbit. 2014-02-18 09:38:44 +01:00
3b9e257d41 Fixed test 2014-02-18 09:37:47 +01:00
Emil Siverhall
d158b69ce1 some refactoring to add checklists panel 2014-02-18 09:24:22 +01:00
51111fac81 Removed a bunch dependencies to jackrabbit. 2014-02-18 09:20:52 +01:00
Emil Siverhall
eb6439f0a8 Merge remote-tracking branch 'origin/develop' into develop 2014-02-18 08:12:37 +01:00
fred-fri
6c6099a560 fixed test 2014-02-18 10:02:20 +09:00
Emil Siverhall
fa13118946 renamed ListChecklistTemplatePanel -> AddChecklistsPanel 2014-02-17 20:57:52 +01:00