3520 Commits

Author SHA1 Message Date
Dan Poltawski
f315d159c8 Merge branch 'wip-MDL-35770-master' of git://github.com/marinaglancy/moodle
Conflicts:
	course/format/lib.php
2012-11-15 10:59:17 +08:00
Dan Poltawski
e4a9cc642f Merge branch 'MDL-36417-master' of git://github.com/FMCorz/moodle 2012-11-15 10:39:08 +08:00
Dan Poltawski
0e35ba6ffc MDL-36357 cleanup - remove double semicolons 2012-11-15 09:51:26 +08:00
Dan Poltawski
532a704d95 Merge branch 'wip-MDL-36576-m24' of git://github.com/amygroshek/moodle 2012-11-15 08:56:43 +08:00
Amy Groshek
8ebb84e281 MDL-36576 - change generalbox classname to generaltable to fix rounded corners on the table background color 2012-11-14 12:49:41 -06:00
Marina Glancy
081c8f7fe0 MDL-36594 Add function format_base::is_section_current()
- added function format_base::is_section_current()
- overwritten in format_weeks::is_section_current()
- deprecated function format_section_renderer_base::is_section_current()
2012-11-14 15:54:13 +08:00
Marina Glancy
1b2581f430 MDL-35770 Moved format_weeks_get_section_dates() to format_weeks::get_section_dates() 2012-11-14 14:31:07 +08:00
Frederic Massart
fbb207c57a MDL-36323 usability: New icon names to assign and switch roles 2012-11-14 14:07:40 +08:00
Marina Glancy
0f070867b8 MDL-35770 Converted weeks format to new course formats API 2012-11-14 13:58:40 +08:00
Marina Glancy
222cd9c996 MDL-35770 Converted topics format to new course formats API 2012-11-14 13:58:35 +08:00
Marina Glancy
62a3f7ef46 MDL-35770 Created class format_weeks as copy of format_legacy 2012-11-14 13:58:34 +08:00
Marina Glancy
2fb8c9a2e9 MDL-35770 Created class format_topics as copy of format_legacy 2012-11-14 13:58:34 +08:00
Marina Glancy
bf1a9494a4 MDL-35770 Converted social format to new course formats API 2012-11-14 13:58:28 +08:00
Marina Glancy
cad5cba676 MDL-35770 Converted scorm format to new course formats API 2012-11-14 13:58:21 +08:00
Marina Glancy
5ef23705f6 MDL-36048 Allow course formats to add course headers and footers
- Added functions in class format_base
- Added global functions in course/lib.php
- Added calling of course header/footer functions to the base theme
- output renderer checks if theme calls the coures content header/footer functions, if not calls them explicitly and displays a development warning
2012-11-14 13:50:10 +08:00
Frederic Massart
10994f27a1 MDL-36449 usability: Improved renaming toolbox and alignment on course page 2012-11-14 11:38:11 +08:00
Frederic Massart
8a3b8918cb MDL-36449 usability: Course drag and drop field styling 2012-11-14 11:38:10 +08:00
Frederic Massart
bb128107e3 MDL-36449 usability: Normalising icons on course page 2012-11-14 11:38:06 +08:00
Frederic Massart
f7d6e65032 MDL-36417 course: Unit tests for section visibility 2012-11-14 11:22:20 +08:00
Dan Poltawski
2d0d36f219 Merge branch 'wip-MDL-36048-master' of git://github.com/marinaglancy/moodle 2012-11-14 09:58:27 +08:00
Frederic Massart
00a342341c MDL-36417 course: Toggling section visibility update module visibility 2012-11-14 09:32:38 +08:00
Michael Aherne
5035ed6376 MDL-34762 course Hide system archetypes from mod chooser 2012-11-14 09:06:10 +08:00
Adrian Greeve
2b9e957a27 MDL-31750 - course: Unit tests for the function can_move_courses_to_category(). 2012-11-13 09:43:43 +08:00
Adrian Greeve
fae51910bf MDL-31750 - course: Creating a consistent api for checking permissions for moving courses to different categories. 2012-11-13 09:42:45 +08:00
Marina Glancy
fdd4b9a50a MDL-36048 Allow course formats to add course headers and footers
- Added functions in class format_base
- Added global functions in course/lib.php
- Added calling of course header/footer functions to the base theme
- output renderer checks if theme calls the coures content header/footer functions, if not calls them explicitly and displays a development warning
2012-11-10 15:39:01 +08:00
Marina Glancy
3776335ce2 MDL-35260 Course formats may have settings, be enabled, disabled and uninstalled 2012-11-10 15:34:29 +08:00
Aparup Banerjee
6c4e886426 Merge branch 'WIP-MDL-35512' of git://github.com/nadavkav/moodle 2012-11-09 14:16:15 +08:00
Aparup Banerjee
4b1466d50c Merge branch 'MDL-27824' of git://github.com/rwijaya/moodle 2012-11-08 13:26:39 +08:00
Rossiani Wijaya
d9b87135cb MDL-27824 course categories: remove trailing whitespace 2012-11-08 12:29:42 +08:00
Rossiani Wijaya
929cdf06de MDL-27824 course categories: change isset() to empty() 2012-11-08 12:25:58 +08:00
Rossiani Wijaya
08af002921 MDL-27824 course categories: Added @todo comments to remove the temporary fix 2012-11-08 12:25:57 +08:00
Rossiani Wijaya
98068e1d8c MDL-27824 - course category: add check test for ->coursesperpage value. 2012-11-08 12:25:57 +08:00
sam marshall
333e499c4b MDL-34612 Grade condition range validation allows impossible conditions 2012-11-07 10:54:23 +00:00
Dan Poltawski
2ac705c41d Merge branch 'MDL-36092-master' of git://git.luns.net.uk/moodle 2012-11-07 16:56:11 +08:00
Dan Poltawski
4b5a6b1327 Merge branch 'wip-MDL-36317-master' of git://github.com/marinaglancy/moodle
Conflicts:
	course/format/lib.php
2012-11-07 16:41:53 +08:00
Dan Poltawski
53b6a75a99 Merge branch 'wip-MDL-35279-master' of git://github.com/marinaglancy/moodle 2012-11-07 14:44:26 +08:00
Frederic Massart
281d730ea6 MDL-36392 course: Adding a module to a section does not corrupt its sequence 2012-11-06 17:00:47 +08:00
Dan Poltawski
a353088f2c Merge branch 'wip-MDL-36342-master' of git://github.com/barbararamiro/moodle
Conflicts:
	theme/base/style/core.css
2012-11-06 14:48:22 +08:00
Barbara Ramiro
651f639ed0 MDL-36342 Usability: New icons for section in SVG and PNG formats 2012-11-05 23:43:02 +08:00
Dan Poltawski
918085d048 Revert "MDL-35260 Course formats may have settings, be enabled, disabled and uninstalled"
This reverts commit 45f93db912a17b778aca4b9ced16de79ff18abaa.
This reverts commit 3f798d4a3d11416c4c71df2038c1ec9422898e5e.
2012-11-05 15:20:22 +08:00
Dan Poltawski
1fc59b22de Merge branch 'wip-MDL-35260-master' of git://github.com/marinaglancy/moodle 2012-11-05 15:04:25 +08:00
Dan Poltawski
1872a0f26e MDL-35768 - fix trailing whitespace 2012-11-05 14:46:00 +08:00
Dan Poltawski
6b02cc4fc1 MDL-35768 - fix E_STRICT issue 2012-11-05 14:31:54 +08:00
Marina Glancy
45f93db912 MDL-35260 Course formats may have settings, be enabled, disabled and uninstalled 2012-11-05 11:46:34 +08:00
Marina Glancy
8d8d4da44d MDL-36017 renamed formatoptions to courseformatoptions in externallib 2012-11-05 11:40:03 +08:00
Marina Glancy
850acb3560 MDL-35768 MDL-36017 Avoid calling format_base::get_course() when not necessary
- If we want to check fields 'numsections' or 'hiddensections' call course_get_format()->get_format_options()
- We still use extended course object in course/edit.php, update_course(), create_course(), and inside course formats
2012-11-05 11:22:06 +08:00
Marina Glancy
92d38668ac MDL-35768 MDL-36017 code style corrections 2012-11-02 13:53:48 +08:00
Marina Glancy
695705f5d4 MDL-36317 Execute course format callback when course or module is set on page 2012-11-02 11:02:22 +08:00
Marina Glancy
e010b8503e MDL-35769 Give more flexibility for course formats to extend course navigation
global_navigation::load_course_sections() now has more parameters and ensures
that current section and activity is loaded. This will allow course formats
to display hierarchical sections in navigation and have one callback for
overwriting whole course navigation
2012-11-02 10:58:21 +08:00
Marina Glancy
0e984d9809 MDL-36017 Course now may have format-specific options, numsections and hiddensections are among them 2012-11-02 10:56:22 +08:00