Richard
|
483e019d7a
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-19 13:21:29 +01:00 |
|
Richard
|
26d307d039
|
Added !important to .dateTimeInput to overwrite bootstraps form-control.
Added time on StylableDateTimeField.
|
2014-02-19 13:21:17 +01:00 |
|
leosu
|
2403432e7b
|
visibility logic for opposition label
|
2014-02-19 12:58:55 +01:00 |
|
Emil Siverhall
|
fa0b5708f5
|
fixed display for checklist categories
|
2014-02-19 12:39:36 +01:00 |
|
Richard
|
3808c227b8
|
Added bootstrap buttons to AbstractCRUDPanel
|
2014-02-19 11:55:16 +01:00 |
|
fred-fri
|
e3a23c40dc
|
fixing fitnesse+selenium
|
2014-02-19 19:52:37 +09:00 |
|
fred-fri
|
7a8f3ba754
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-19 19:36:46 +09:00 |
|
fred-fri
|
56a53cd1eb
|
fixing fitnesse+selenium
|
2014-02-19 19:36:31 +09:00 |
|
Richard
|
db5c8d6ae5
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-19 11:27:46 +01:00 |
|
Richard
|
6eeca9b5a7
|
Replaced bootstrap edit-icon with our own on ThesisLinkPanel.
|
2014-02-19 11:27:21 +01:00 |
|
Emil Siverhall
|
40e01eb958
|
removed some supervisor checklist specific methods
|
2014-02-19 11:20:57 +01:00 |
|
leosu
|
de4093e939
|
added grading feedback and styling
|
2014-02-19 11:20:51 +01:00 |
|
leosu
|
77367e4f47
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-19 10:58:13 +01:00 |
|
leosu
|
3e994a53a2
|
updated paths in tests
|
2014-02-19 10:57:54 +01:00 |
|
leosu
|
0b400a64a5
|
grading functionality for SeminarOppositionPanel
|
2014-02-19 10:55:43 +01:00 |
|
Emil Siverhall
|
fe7e22d7d8
|
oops
|
2014-02-19 10:45:54 +01:00 |
|
Emil Siverhall
|
996f8cfd8e
|
removed unnecessary service
|
2014-02-19 10:32:59 +01:00 |
|
Emil Siverhall
|
bafee3a83e
|
removed unnecessary services
|
2014-02-19 10:27:41 +01:00 |
|
Emil Siverhall
|
cd601dd05c
|
fixed language display
|
2014-02-19 09:40:39 +01:00 |
|
Golrokh Moattar
|
63ac37c454
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-19 09:16:35 +01:00 |
|
|
|
ae035926f2
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-19 08:47:59 +01:00 |
|
|
|
bfe04835f3
|
Removed unused service.
|
2014-02-19 08:47:53 +01:00 |
|
fred-fri
|
49c5d2bd34
|
phd stuff
|
2014-02-19 16:44:59 +09:00 |
|
Richard
|
5dd461991d
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-18 18:56:13 +01:00 |
|
Richard
|
aec148495e
|
Moved manual changes in bootstrap css into SciPro css.
|
2014-02-18 18:56:03 +01:00 |
|
|
|
b3c8836ce3
|
Fixed test.
|
2014-02-18 18:52:54 +01:00 |
|
|
|
710127dccc
|
Fixed language display.
|
2014-02-18 18:36:01 +01:00 |
|
|
|
8a15107e7f
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-18 18:34:05 +01:00 |
|
|
|
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 |
|
