Commit graph

14499 commits

Author SHA1 Message Date
Dan Poltawski
e830d6f98e Merge branch 'wip-MDL-30921-m24' of git://github.com/samhemelryk/moodle 2012-11-07 10:51:06 +08:00
Dan Poltawski
1191881888 Merge branch 'wip-MDL-36120-m24' of git://github.com/samhemelryk/moodle 2012-11-07 10:49:28 +08:00
Dan Poltawski
a8ccdd28e0 Merge branch 'wip-MDL-36386-m24' of git://github.com/samhemelryk/moodle
Conflicts:
	version.php
2012-11-07 09:33:47 +08:00
Sam Hemelryk
75af47ee1e MDL-36386 cache: upgrades now trigger definitions to be updated 2012-11-07 10:42:20 +13:00
Sam Hemelryk
47834bcd41 MDL-36120 cache: now uses sha1 and has an option for simple keys 2012-11-07 10:03:32 +13:00
Eloy Lafuente (stronk7)
086f5f9ea8 MDL-35762 whitespace fix 2012-11-06 17:03:57 +01:00
Eloy Lafuente (stronk7)
278714a012 MDL-35762 fix deprecated use of get_fast_modinfo() reset. 2012-11-06 16:37:43 +01:00
Eloy Lafuente (stronk7)
cd59310d1b Merge branch 'MDL-35762_fix' of git://github.com/andyjdavis/moodle 2012-11-06 16:13:47 +01:00
Dan Poltawski
87b210d98f Merge branch 'w43_MDL-34915_m24_simpleyui' of git://github.com/skodak/moodle 2012-11-06 16:03:40 +08:00
Sam Hemelryk
468cc57297 MDL-34342 cache: Added missing include and fixed old lang manager setting 2012-11-06 17:24:20 +13:00
Dan Poltawski
cdf9b0c86f Merge branch 'MDL-36266-notification-subject' of git://github.com/mudrd8mz/moodle 2012-11-06 11:59:24 +08:00
Dan Poltawski
61d49846a1 Merge branch 'wip-MDL-34342-m24' of git://github.com/samhemelryk/moodle 2012-11-06 11:26:45 +08:00
Dan Poltawski
653c89bcf3 Merge branch 'w43_MDL-36199_m24_pluginsingletons' of git://github.com/skodak/moodle 2012-11-06 10:32:47 +08:00
Dan Poltawski
2c36da50bc Merge branch 'wip-MDL-36362-m24' of git://github.com/samhemelryk/moodle
Conflicts:
	version.php
2012-11-06 10:03:23 +08:00
Dan Poltawski
980140e7cf Merge branch 'MDL-36023-master' of git://git.luns.net.uk/moodle 2012-11-06 09:35:31 +08:00
Sam Hemelryk
db19da5612 MDL-35998 admin: Fixed whitespace 2012-11-06 14:32:18 +13:00
Sam Hemelryk
5252ec82a2 Merge branch 'MDL-35998' of git://github.com/mouneyrac/moodle
Conflicts:
	version.php
2012-11-06 11:00:16 +13:00
Dan Poltawski
918085d048 Revert "MDL-35260 Course formats may have settings, be enabled, disabled and uninstalled"
This reverts commit 45f93db912.
This reverts commit 3f798d4a3d.
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
825876620b MDL-35768 - increment redirect_if_major_upgrade_required 2012-11-05 14:25:24 +08:00
Dan Poltawski
f041dc5ff7 Merge branch 'wip-MDL-35768-master' of git://github.com/marinaglancy/moodle 2012-11-05 14:08:28 +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
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
Dan Poltawski
96846c2a9e Merge branch 'MDL-33621' of git://github.com/rwijaya/moodle 2012-11-05 11:12:32 +08:00
Andrew Davis
69632d42f0 MDL-35762 core_grade: adding unit tests for modinfolib.php 2012-11-05 09:35:10 +08:00
Andrew Davis
5e76227126 MDL-35762 core_grade: altered the code that determines whether an activity is visible on the user report 2012-11-05 09:35:10 +08:00
Sam Hemelryk
2e1e266c9a MDL-36362 cache: added simpledata definition option 2012-11-05 10:28:07 +13:00
Dan Poltawski
3bd6e74afd Merge branch 'w42_MDL-35469_m24_geckover' of git://github.com/skodak/moodle 2012-11-02 12:07:11 +08:00
Marina Glancy
b5cf83f080 MDL-36017 Fields numsections, hiddensections and coursedisplay are now format-specific options
- Fields added to format_legacy as default course format options;
- Upgrade script copies fields values from table course to course_format_options;
- Fields removed from table course;
- Fields removed from edit course form;
- Since front-page course has a 'numsections' setting, format_site defines it as it's option;
- Removed accessing those fields in core code unless we know that format supports them and in this
  case instead of $course = $DB->get_record('course'); we use:
  $course = course_get_format($courseorid)->get_course(); This way all format-specific options
  are added to the $course object
2012-11-02 10:56:19 +08:00
Marina Glancy
aea2e3c30d MDL-35768 Allow caching of section format options in course.sectioncache 2012-11-02 10:55:24 +08:00
Marina Glancy
fc79ede5a1 MDL-35768 Added format-specific options to edit course and section forms
- Course format may define additional fields (format options) to store for course and each section
- Edit course form allows to edit format-specific options and refreshes their list on format change
- Course format may provide it's own form for editing a section
- Default form for editing section allows to edit all format-specific fields
- Class section_info refactored, it defines magic methods such as __get() to access basic section
  information and format-specific options (retrieved only on the first request)
- format_base::update_course_format_options() allows to watch pre-update state of the course,
  format_legacy automatically copies the options with the same names between formats
2012-11-02 10:55:23 +08:00
Marina Glancy
29ac9fc1f8 MDL-35768 create table course_format_options, increase length of course.format field 2012-11-02 10:55:21 +08:00
Steve Bader
27e3057838 MDL-30921 navigation: Added aria-role to the navbar content 2012-11-02 10:58:23 +13:00
Sam Hemelryk
537ba512e5 MDL-30921 output: Added the main role to the main content area 2012-11-02 10:58:23 +13:00
Sam Hemelryk
91d941c34c MDL-30921 blocks: Added aria-labelledby and aria-label for blocks 2012-11-02 10:58:23 +13:00
Andrew Robert Nicols
21b678dbca MDL-36023 AJAX Move the instantiation of the dialogue to display time 2012-11-01 07:54:58 +00:00
Dan Poltawski
fc43eaa133 Fix incorrect permissions 2012-11-01 14:51:29 +08:00
Dan Poltawski
926f51436b Revert "MDL-34332 completion: timeenrolled not always set correctly"
This reverts commit 154a72b002.
2012-11-01 12:02:49 +08:00
Dan Poltawski
92c99211af MDL-25290 MUC - add dbname to settings hash 2012-11-01 10:41:18 +08:00
Dan Poltawski
cedf976367 MDL-35964 - blocks: add missing global $CFG
Thanks Rosie!
2012-10-31 14:28:24 +08:00
Jerome Mouneyrac
33af788210 MDL-35998 New mobile menu: with CSS url + existing enable mobile web services 2012-10-31 14:25:30 +08:00
Dan Poltawski
c9e835e69b Merge branch 'MDL-28235-master' of git://github.com/FMCorz/moodle 2012-10-31 13:42:14 +08:00
Frederic Massart
fdfff54f96 MDL-28235 form: Removed reference to unexisting close button in help popup 2012-10-31 12:59:07 +08:00
Frederic Massart
bd102921e7 MDL-28235 form: Removed close icon of help icon popups 2012-10-31 12:55:26 +08:00
Frederic Massart
b218e3ca84 MDL-28235 form: Help button popup close accessibility improved
AMOS BEGIN
 CPY [close,editor],[close,form]
AMOS END
2012-10-31 12:55:26 +08:00
Sam Hemelryk
8458274845 Merge branch 'w43_MDL-36145_m24_yui373' of git://github.com/skodak/moodle 2012-10-31 17:35:18 +13:00
David Mudrák
2399585f7f MDL-36266 Improve update notification message subject 2012-10-30 12:00:03 +01:00
Dan Poltawski
639a2868c3 Merge branch 'MDL-34332c' of git://github.com/srynot4sale/moodle 2012-10-30 16:20:39 +08:00
Dan Poltawski
81bfb046af Merge branch 'MDL-34965_master' of git://github.com/dmonllao/moodle 2012-10-30 16:05:43 +08:00
Dan Poltawski
d618dcf3c9 MDL-16660 - upgrade: split steps up into two
Be extra safe for potential debugging purposes
2012-10-30 14:33:30 +08:00