|
|
245975c242
|
Fixed display of schedule template names in drop down and made it work with a detachable model.
|
2014-02-19 16:31:51 +01:00 |
|
Emil Siverhall
|
2e58d2f953
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-19 16:29:02 +01:00 |
|
Emil Siverhall
|
839ed709dd
|
keyword toString issues
|
2014-02-19 16:28:45 +01:00 |
|
|
|
5773eb520d
|
Made ListAdapterModel work with any Iterable<E>
|
2014-02-19 16:24:13 +01:00 |
|
leosu
|
47350bfedf
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-19 15:50:28 +01:00 |
|
leosu
|
d74839fc00
|
fixed deleting oppositions with reports
|
2014-02-19 15:50:20 +01:00 |
|
Emil Siverhall
|
cab1baf9fc
|
changes to recipient of idea export fail mail
|
2014-02-19 15:32:50 +01:00 |
|
Emil Siverhall
|
d7733b3f79
|
removed redundant feedback panel
|
2014-02-19 15:23:53 +01:00 |
|
Emil Siverhall
|
a8573955c2
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-19 15:22:26 +01:00 |
|
|
|
43707b2879
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-19 15:22:24 +01:00 |
|
|
|
9a9ee54b11
|
Fixed errors.
|
2014-02-19 15:22:19 +01:00 |
|
leosu
|
d7867cc0a7
|
download stuff
|
2014-02-19 14:55:32 +01:00 |
|
Golrokh Moattar
|
8449a8f9ec
|
Added more fields to SupervisorEditProjectPanel
|
2014-02-19 14:55:26 +01:00 |
|
leosu
|
355530924d
|
upload stuff
|
2014-02-19 14:45:11 +01:00 |
|
leosu
|
b705f1e1f9
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-19 14:22:43 +01:00 |
|
leosu
|
f25ea317b6
|
SeminarOppositionpanel stuffs
|
2014-02-19 14:22:18 +01:00 |
|
Richard
|
ae870ba9d0
|
Fixed row, column and well on mail log page.
|
2014-02-19 14:09:29 +01:00 |
|
|
|
f6f8473811
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-19 13:58:03 +01:00 |
|
|
|
402ad5648c
|
Switched out all dialogs to Bootstrap dialogs.
|
2014-02-19 13:57:54 +01:00 |
|
Golrokh Moattar
|
af32b7f91e
|
Updating CoSupervisors and Title of a Project by Supervisor implemented but not completed
|
2014-02-19 13:55:25 +01:00 |
|
leosu
|
7bda56bd5c
|
SeminarOppositionPanel stuffs
|
2014-02-19 13:37:01 +01:00 |
|
Richard
|
03a3900f38
|
Removed fluid-container from scipro_m.
Added bootstraps container-fluid to BasePage.html.
|
2014-02-19 13:34:50 +01:00 |
|
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 |
|
