moodle.git
7 years agoMDL-42882 upgrade: improved SQL query
Dan Poltawski [Mon, 3 Feb 2014 04:42:35 +0000 (12:42 +0800)]
MDL-42882 upgrade: improved SQL query

Kudos to Tim Hunt who came up with this, on mysql with 4 milion
records (and a fast SSD) the performance difference is:

Original: 36.83 sec
New query: 8.63 sec

7 years agoMDL-42882 upgrade: unit tests for root folders upgrade
Dan Poltawski [Mon, 3 Feb 2014 04:30:23 +0000 (12:30 +0800)]
MDL-42882 upgrade: unit tests for root folders upgrade

Just verifying the original behaviour

7 years agoweekly release 2.7dev
Marina Glancy [Fri, 31 Jan 2014 06:11:12 +0000 (14:11 +0800)]
weekly release 2.7dev

7 years agoMerge branch 'install_master' of git://git.moodle.org/moodle-install
Marina Glancy [Fri, 31 Jan 2014 06:11:11 +0000 (14:11 +0800)]
Merge branch 'install_master' of git://git.moodle.org/moodle-install

7 years agoMDL-42928 Filepicker: Disable behat tests run by phantom
Andrew Nicols [Thu, 30 Jan 2014 08:53:54 +0000 (16:53 +0800)]
MDL-42928 Filepicker: Disable behat tests run by phantom

There seems to be a bug relating to overflow: hidden on the body tag in
some cases which is only showing for dialogues which belong to the
filepicker.

Disabling these for the moment as this issue may be related to MDL-43712
which is a work in progress.

7 years agoMDL-43450 behat: Checking the ->behat_* vars contents before showing the steps list
David Monllao [Wed, 29 Jan 2014 06:28:37 +0000 (14:28 +0800)]
MDL-43450 behat: Checking the ->behat_* vars contents before showing the steps list

7 years agoMerge branch 'MDL-25500-master-fix1' of git://github.com/damyon/moodle
Marina Glancy [Wed, 29 Jan 2014 04:01:33 +0000 (12:01 +0800)]
Merge branch 'MDL-25500-master-fix1' of git://github.com/damyon/moodle

7 years agoMDL-25500 Lock: Unit tests have found that MySQL locks are broken
Damyon Wiese [Wed, 29 Jan 2014 03:52:51 +0000 (11:52 +0800)]
MDL-25500 Lock: Unit tests have found that MySQL locks are broken

Removing the MySQL lock factory, the only safe way to use this MySQL API
would be to open a new DB connection for every lock. Record locking is a decent
fallback.

7 years agoMDL-43736 Events: Updated unit test to test context not used in event
Rajesh Taneja [Tue, 21 Jan 2014 09:04:37 +0000 (17:04 +0800)]
MDL-43736 Events: Updated unit test to test context not used in event

7 years agoMDL-43736 Events: event->contextinstanceid should be used where possible
Rajesh Taneja [Fri, 17 Jan 2014 04:52:34 +0000 (12:52 +0800)]
MDL-43736 Events: event->contextinstanceid should be used where possible

While restoring event context might not be present (deleted)
So before using context api's check context or use event properties

7 years agoMerge branch 'MDL-43040'
Eloy Lafuente (stronk7) [Wed, 29 Jan 2014 00:52:49 +0000 (01:52 +0100)]
Merge branch 'MDL-43040'

7 years agoMDL-43040 Note the deprecation and add some TODOs
Eloy Lafuente (stronk7) [Wed, 29 Jan 2014 00:40:30 +0000 (01:40 +0100)]
MDL-43040 Note the deprecation and add some TODOs

7 years agoMDL-25500 lock: post integration trivial cleanup
Sam Hemelryk [Wed, 29 Jan 2014 00:21:52 +0000 (13:21 +1300)]
MDL-25500 lock: post integration trivial cleanup

* A couple of misc comment typo's
* Added missing $CFG required global in file_lock_factory::is_available
* Removed unused $CFG global from file_lock_factory::get_lock
* A couple of trivial phpdoc tweaks
* Removed unused $DB global from postgres_lock_factory::get_index_from_key
* Added global namespace \ to exceptions in get_index_from_key (tested and found they didn't resolve)

7 years agoMerge branch 'MDL-25500-master-squashed' of git://github.com/damyon/moodle
Sam Hemelryk [Wed, 29 Jan 2014 00:21:00 +0000 (13:21 +1300)]
Merge branch 'MDL-25500-master-squashed' of git://github.com/damyon/moodle

7 years agoMDL-43040 Replace $module with $plugin in all mod/*/version.php
Tomasz Muras [Sun, 24 Nov 2013 13:24:51 +0000 (14:24 +0100)]
MDL-43040 Replace $module with $plugin in all mod/*/version.php

Conflicts:
mod/quiz/version.php

7 years agoMerge branch 'MDL-40909_master' of https://github.com/markn86/moodle
Sam Hemelryk [Tue, 28 Jan 2014 19:23:51 +0000 (08:23 +1300)]
Merge branch 'MDL-40909_master' of https://github.com/markn86/moodle

7 years agoMDL-25500 Lock: Do not use file locking if $CFG->preventfilelocking is set
Damyon Wiese [Tue, 28 Jan 2014 12:14:05 +0000 (20:14 +0800)]
MDL-25500 Lock: Do not use file locking if $CFG->preventfilelocking is set

(And file_lock_dir is not prefixed with the dataroot).

7 years agoMerge branch 'MDL-42928-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 28 Jan 2014 11:22:23 +0000 (12:22 +0100)]
Merge branch 'MDL-42928-master' of git://github.com/andrewnicols/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

7 years agoMerge branch 'w04_MDL-34055_m27_insertrecords' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 28 Jan 2014 09:43:51 +0000 (10:43 +0100)]
Merge branch 'w04_MDL-34055_m27_insertrecords' of https://github.com/skodak/moodle

7 years agoMDL-40909 enrol_imsenterprise: removed 'new' add_to_log call
Mark Nelson [Tue, 14 Jan 2014 01:00:56 +0000 (17:00 -0800)]
MDL-40909 enrol_imsenterprise: removed 'new' add_to_log call

Here we are replacing the unnecessary code used to create a course with
a call to create_course(), which triggers the event 'course_created'.
Nothing more is needed.

7 years agoMDL-40909 core_enrol: removed 'enrol' add_to_log calls
Mark Nelson [Tue, 14 Jan 2014 00:31:55 +0000 (16:31 -0800)]
MDL-40909 core_enrol: removed 'enrol' add_to_log calls

Before each of these calls a call to enrol_user() is made, which
triggers the event 'user_enrolment_created'. Nothing more is needed.

7 years agoMDL-40909 core_enrol: removed 'unenrol' add_to_log calls
Mark Nelson [Mon, 13 Jan 2014 23:46:34 +0000 (15:46 -0800)]
MDL-40909 core_enrol: removed 'unenrol' add_to_log calls

Before each of these calls a call to unenrol_user() is made, which
triggers the event 'user_enrolment_deleted'. Nothing more is needed.

7 years agoMDL-40909 mod_forum: removed duplicated test (duplicated in enrol/meta/tests/plugin_t...
Mark Nelson [Tue, 14 Jan 2014 00:16:22 +0000 (16:16 -0800)]
MDL-40909 mod_forum: removed duplicated test (duplicated in enrol/meta/tests/plugin_test.php)

7 years agoMDL-34055 add bulk DB->insert_records() method
Petr Škoda [Sat, 18 Jan 2014 08:03:31 +0000 (16:03 +0800)]
MDL-34055 add bulk DB->insert_records() method

This patch was inspired by patch by Simon Coggins from Totara.

7 years agoMDL-42928 JavaScript: Disable lockScroll for small chooserdialogues
Andrew Nicols [Sat, 16 Nov 2013 01:01:16 +0000 (09:01 +0800)]
MDL-42928 JavaScript: Disable lockScroll for small chooserdialogues

7 years agoMDL-42928 JavaScript: Add LockScroll to all modal dialogues
Andrew Nicols [Sat, 16 Nov 2013 00:59:37 +0000 (08:59 +0800)]
MDL-42928 JavaScript: Add LockScroll to all modal dialogues

7 years agoMDL-42928 JavaScript: Create a module to handle page scroll locking
Andrew Nicols [Sat, 16 Nov 2013 00:54:22 +0000 (08:54 +0800)]
MDL-42928 JavaScript: Create a module to handle page scroll locking

7 years agoMerge branch 'master_MDL-43797' of https://github.com/totara/moodle
Eloy Lafuente (stronk7) [Mon, 27 Jan 2014 23:43:16 +0000 (00:43 +0100)]
Merge branch 'master_MDL-43797' of https://github.com/totara/moodle

7 years agoMDL-43797 lib/db/upgrade.php: Optimise sql for my_pages deletion
David Curry [Mon, 27 Jan 2014 22:56:37 +0000 (11:56 +1300)]
MDL-43797 lib/db/upgrade.php: Optimise sql for my_pages deletion

Change-Id: Idf300ab07afda3bcefea80e617549f40c710e529

7 years agoMerge branch 'MDL-43246' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 27 Jan 2014 23:16:20 +0000 (12:16 +1300)]
Merge branch 'MDL-43246' of git://github.com/timhunt/moodle

7 years agoMerge branch 'MDL-43450_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Mon, 27 Jan 2014 23:07:57 +0000 (00:07 +0100)]
Merge branch 'MDL-43450_master' of git://github.com/dmonllao/moodle

7 years agoMerge branch '43688-27' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Mon, 27 Jan 2014 22:58:18 +0000 (23:58 +0100)]
Merge branch '43688-27' of git://github.com/samhemelryk/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

7 years agoMDL-43797 lib/db/upgrade.php: Remove custom pages for deleted users
David Curry [Wed, 22 Jan 2014 21:56:47 +0000 (10:56 +1300)]
MDL-43797 lib/db/upgrade.php: Remove custom pages for deleted users

Change-Id: Ifef563431682a2a5524927f85ca9eba9cbe520ff

7 years agoMerge branch 'MDL-43874' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 27 Jan 2014 22:52:07 +0000 (23:52 +0100)]
Merge branch 'MDL-43874' of git://github.com/timhunt/moodle

7 years agoMDL-43797 lib/moodlelib.php: Remove custom homepages on user deletion
David Curry [Wed, 22 Jan 2014 02:37:23 +0000 (15:37 +1300)]
MDL-43797 lib/moodlelib.php: Remove custom homepages on user deletion

Change-Id: Ibaf6f0a9dc29d00b97a32111d1cf5063ebed1888

7 years agoMerge branch 'MDL-43757_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Mon, 27 Jan 2014 20:11:03 +0000 (21:11 +0100)]
Merge branch 'MDL-43757_master' of git://github.com/dmonllao/moodle

7 years agoMerge branch 'wip-MDL-43643-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Mon, 27 Jan 2014 19:40:45 +0000 (08:40 +1300)]
Merge branch 'wip-MDL-43643-master' of git://github.com/marinaglancy/moodle

7 years agoMerge branch 'wip-mdl-43765' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Mon, 27 Jan 2014 18:23:09 +0000 (19:23 +0100)]
Merge branch 'wip-mdl-43765' of https://github.com/rajeshtaneja/moodle

7 years agoMerge branch 'wip-mdl-43766' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Mon, 27 Jan 2014 18:19:31 +0000 (19:19 +0100)]
Merge branch 'wip-mdl-43766' of https://github.com/rajeshtaneja/moodle

7 years agoMerge branch 'MDL-43773-master' of https://github.com/lucisgit/moodle
Eloy Lafuente (stronk7) [Mon, 27 Jan 2014 16:18:56 +0000 (17:18 +0100)]
Merge branch 'MDL-43773-master' of https://github.com/lucisgit/moodle

7 years agoMerge branch 'MDL-43581' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 27 Jan 2014 16:03:25 +0000 (17:03 +0100)]
Merge branch 'MDL-43581' of git://github.com/timhunt/moodle

7 years agoMDL-43874 quiz, teacher comments should respect display options.
Tim Hunt [Mon, 27 Jan 2014 11:57:55 +0000 (11:57 +0000)]
MDL-43874 quiz, teacher comments should respect display options.

Whether the comments on manually graded questions were visible to
students should have been controlled by the 'Specific feedback' Review
option in the quiz settings. However, the quiz was not setting
$displayoptions->manualcomment, so it did not work.

7 years agoMerge branch 'wip-MDL-43800-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Mon, 27 Jan 2014 11:02:28 +0000 (12:02 +0100)]
Merge branch 'wip-MDL-43800-master' of git://github.com/marinaglancy/moodle

7 years agoMDL-43581 additionalhtmlfooter should be added to every page
Tim Hunt [Thu, 23 Jan 2014 15:35:53 +0000 (15:35 +0000)]
MDL-43581 additionalhtmlfooter should be added to every page

Not just pages with a visible footer.

7 years agoMerge branch 'MDL-43809' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 27 Jan 2014 09:59:37 +0000 (10:59 +0100)]
Merge branch 'MDL-43809' of git://github.com/timhunt/moodle

7 years agoMerge branch 'MDL-33839c' of git://github.com/mkassaei/moodle
Sam Hemelryk [Mon, 27 Jan 2014 02:28:47 +0000 (15:28 +1300)]
Merge branch 'MDL-33839c' of git://github.com/mkassaei/moodle

7 years agoMDL-25500 lock: New locking framework.
Damyon Wiese [Tue, 17 Dec 2013 08:00:29 +0000 (16:00 +0800)]
MDL-25500 lock: New locking framework.

This locking system is designed to be used everywhere requiring
locking in Moodle. Each use of the locking system can be configured
to use a different type of locking (or the same type with a different
configuration).

The first supported lock types are memcache, memcached, file (flock),
db (specific handlers for pg, mysql and mariadb).

7 years agoMerge branch 'w04_MDL-43761_m27_sqlinstall' of https://github.com/skodak/moodle
Sam Hemelryk [Mon, 27 Jan 2014 01:30:57 +0000 (14:30 +1300)]
Merge branch 'w04_MDL-43761_m27_sqlinstall' of https://github.com/skodak/moodle

7 years agoAutomatically generated installer lang files
AMOS bot [Mon, 27 Jan 2014 00:42:35 +0000 (00:42 +0000)]
Automatically generated installer lang files

7 years agoMerge branch 'MDL-43758_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Mon, 27 Jan 2014 00:18:05 +0000 (01:18 +0100)]
Merge branch 'MDL-43758_master' of git://github.com/dmonllao/moodle

7 years agoMerge branch 'MDL-43734_purgeUserSession' of https://github.com/moodlerooms/moodle
Eloy Lafuente (stronk7) [Sun, 26 Jan 2014 23:26:44 +0000 (00:26 +0100)]
Merge branch 'MDL-43734_purgeUserSession' of https://github.com/moodlerooms/moodle

7 years agoMerge branch 'w04_MDL-43746_m27_courselogin' of https://github.com/skodak/moodle
Sam Hemelryk [Sun, 26 Jan 2014 22:32:08 +0000 (11:32 +1300)]
Merge branch 'w04_MDL-43746_m27_courselogin' of https://github.com/skodak/moodle

7 years agoMerge branch 'MDL-43794' of https://github.com/merrill-oakland/moodle
Sam Hemelryk [Sun, 26 Jan 2014 22:16:11 +0000 (11:16 +1300)]
Merge branch 'MDL-43794' of https://github.com/merrill-oakland/moodle

7 years agoMDL-33839d, Remove the move icon from the question bank
M Kassaei [Fri, 24 Jan 2014 14:08:19 +0000 (14:08 +0000)]
MDL-33839d, Remove the move icon from the question bank

7 years agoMDL-43773 mod_choice: Swap order of name column headings in text export
Tony Butler [Mon, 20 Jan 2014 15:42:00 +0000 (15:42 +0000)]
MDL-43773 mod_choice: Swap order of name column headings in text export

7 years agoMDL-43450 behat: Improving error messages
David Monllao [Fri, 10 Jan 2014 08:44:23 +0000 (16:44 +0800)]
MDL-43450 behat: Improving error messages

7 years agoMDL-43758 performance: New metric, time spent by the database
David Monllao [Mon, 20 Jan 2014 05:34:26 +0000 (13:34 +0800)]
MDL-43758 performance: New metric, time spent by the database

This patch adds a new performance metric to the performance
info shown by MDL_PERF* vars, the time spent by the database,
it was one of the wonderful @poltawski ideas. To be more specific
the value displayed is the sum of the time elapsed between query_start()
and query_end().

7 years agoMDL-43757 behat: Allowing the form field guesser to detect TinyMCE
David Monllao [Mon, 20 Jan 2014 07:58:23 +0000 (15:58 +0800)]
MDL-43757 behat: Allowing the form field guesser to detect TinyMCE

It includes 2 more minor fixes:
- Escapes values sent to TinyMCE as it was breaking
  when values contained double quotes.
- Adding seconds to the screenshots directory to
  avoid using the same folder for multiple runs.

7 years agoMDL-43757 messaging: Behat feature to test participants messaging
David Monllao [Mon, 20 Jan 2014 07:54:29 +0000 (15:54 +0800)]
MDL-43757 messaging: Behat feature to test participants messaging

The new test checks that messages can be sent from
the participants block and they can be read when
accesing user's recent conversations.

7 years agoMDL-43746 fix require_course_login regression caused by MDL-25981
Petr Skoda [Tue, 21 Jan 2014 09:41:29 +0000 (17:41 +0800)]
MDL-43746 fix require_course_login regression caused by MDL-25981

7 years agoMDL-43761 execute bulk sql when modifying db structure
Petr Škoda [Fri, 24 Jan 2014 05:47:22 +0000 (13:47 +0800)]
MDL-43761 execute bulk sql when modifying db structure

In case of postgresql this uses transactions to allow easier recovery from broken installs.

7 years agoMDL-43761 use single query in mysql when crating tables
Petr Škoda [Fri, 24 Jan 2014 05:46:30 +0000 (13:46 +0800)]
MDL-43761 use single query in mysql when crating tables

7 years agoMDL-43761 refactor db manager code to send arrays of SQL to the dml driver
Petr Skoda [Mon, 20 Jan 2014 06:06:44 +0000 (14:06 +0800)]
MDL-43761 refactor db manager code to send arrays of SQL to the dml driver

7 years agoMDL-40786 User profile: Fixing narrow screen RTL collapse
Jason Fowler [Tue, 21 Jan 2014 00:10:15 +0000 (08:10 +0800)]
MDL-40786 User profile: Fixing narrow screen RTL collapse

7 years agoMDL-40786 User Profile: Right align profile fields in RTL mode (theme/bootstrapbase...
Nadav Kavalerchik [Sat, 17 Aug 2013 21:17:11 +0000 (00:17 +0300)]
MDL-40786 User Profile: Right align profile fields in RTL mode (theme/bootstrapbase, theme/clean)

7 years agoMDL-43688 dndupload: fixed positioning across themes
Sam Hemelryk [Thu, 16 Jan 2014 22:43:26 +0000 (11:43 +1300)]
MDL-43688 dndupload: fixed positioning across themes

7 years agoMDL-43809 qformat_xml messes up $s in multianswer questions.
Tim Hunt [Wed, 22 Jan 2014 12:45:08 +0000 (12:45 +0000)]
MDL-43809 qformat_xml messes up $s in multianswer questions.

7 years agoMDL-43246 question engine: avoid order-by id.
Tim Hunt [Wed, 8 Jan 2014 18:22:20 +0000 (18:22 +0000)]
MDL-43246 question engine: avoid order-by id.

This was breaking with oracle master/master replication. Fortunately all
the places that needed to be changed were private to datalib.php. There
is still some ordering by id there, but only places where we want a
consitent, rather than meaningful, order, so that is OK.

The queries changed by this patch all have subqueries in aggregate
queries that pull out the latest step for a question_attempt. Those
queries used to look for MAX(id) but now they look for
MAX(sequencenumber). This is equivalent (for databases where ids always
increase with time, except for auto-saved steps. In the past,  an
auto-saved step might have been considered latest. Now the latest step
will always be one that has been properly processed. You can aruge that
this change is an improvement. Anyway, it is a moot point. All these
queries are only used in reports which are run on completed attempts,
where there will not be any autosaved data.

7 years agoMDL-43246 some question data mapper unit tests
Tim Hunt [Fri, 17 Jan 2014 15:36:19 +0000 (15:36 +0000)]
MDL-43246 some question data mapper unit tests

With fixes for the issues unearthed by these tests.

7 years agoMDL-43246 give unit tests class a better name.
Tim Hunt [Fri, 17 Jan 2014 11:56:55 +0000 (11:56 +0000)]
MDL-43246 give unit tests class a better name.

7 years agoweekly release 2.7dev
Eloy Lafuente (stronk7) [Thu, 23 Jan 2014 11:38:19 +0000 (12:38 +0100)]
weekly release 2.7dev

7 years agoMerge branch 'install_master' of git://git.moodle.org/moodle-install
Eloy Lafuente (stronk7) [Thu, 23 Jan 2014 11:38:06 +0000 (12:38 +0100)]
Merge branch 'install_master' of git://git.moodle.org/moodle-install

7 years agoRevert "MDL-43247 SCORM: improve pop-up handling and redirect to homepage on close."
Damyon Wiese [Thu, 23 Jan 2014 09:13:18 +0000 (17:13 +0800)]
Revert "MDL-43247 SCORM: improve pop-up handling and redirect to homepage on close."

This reverts commit ed3d1ee60d1e48ade21438fd98fef2deb63ecb5f.
This reverts commit ed8eebeecefa98e17c96084b72fe2cd923cc051d.
This reverts commit f664a9387818b5b359df4696040da0aea07b926a.
This reverts commit 9d2276572372f5d249cde8c61d0976e25f0fa4a8.

7 years agoMDL-43247 SCORM: use window.closed property instead of window.opener for IE
Dan Marsden [Thu, 23 Jan 2014 07:38:01 +0000 (20:38 +1300)]
MDL-43247 SCORM: use window.closed property instead of window.opener for IE

7 years agoMDL-43643 chat: do not assign to nonexisting cm_info properties
Marina Glancy [Thu, 23 Jan 2014 02:59:33 +0000 (10:59 +0800)]
MDL-43643 chat: do not assign to nonexisting cm_info properties

7 years agoMDL-43247 Scorm: Fix for undefined js variable when popup is blocked.
Damyon Wiese [Thu, 23 Jan 2014 02:49:56 +0000 (10:49 +0800)]
MDL-43247 Scorm: Fix for undefined js variable when popup is blocked.

7 years agoMerge branch 'master_MDL-43247' of git://github.com/danmarsden/moodle
Damyon Wiese [Thu, 23 Jan 2014 02:27:18 +0000 (10:27 +0800)]
Merge branch 'master_MDL-43247' of git://github.com/danmarsden/moodle

7 years agoMerge branch 'MDL-43670' of git://github.com/timhunt/moodle
Dan Poltawski [Thu, 23 Jan 2014 01:32:36 +0000 (09:32 +0800)]
Merge branch 'MDL-43670' of git://github.com/timhunt/moodle

7 years agoMDL-43794 Files API Set the mtime of files to extraction time.
Eric Merrill [Wed, 22 Jan 2014 13:57:53 +0000 (08:57 -0500)]
MDL-43794 Files API Set the mtime of files to extraction time.

The restore cleanup code expects the mtime to be the time of extraction
not the mtime before archiving. If set to the old mtime, the restore
files may be cleaned up before the restore is complete.

This behaviour also matches the behaviour of the zip unpacker.

7 years agoMDL-43247 SCORM: convert some js to YUI
Dan Marsden [Wed, 22 Jan 2014 08:53:26 +0000 (21:53 +1300)]
MDL-43247 SCORM: convert some js to YUI

7 years agoMDL-43670 fix quiz backup.
Tim Hunt [Wed, 22 Jan 2014 08:32:10 +0000 (08:32 +0000)]
MDL-43670 fix quiz backup.

7 years agoMDL-43800 course: groupings are sorted alphabetically
Marina Glancy [Wed, 22 Jan 2014 04:16:26 +0000 (12:16 +0800)]
MDL-43800 course: groupings are sorted alphabetically

7 years agoMDL-26680: Reset my moodle page - add sesskey check.
Damyon Wiese [Wed, 22 Jan 2014 02:00:43 +0000 (10:00 +0800)]
MDL-26680: Reset my moodle page - add sesskey check.

7 years agoMerge branch 'MDL-26680-master' of git://github.com/micaherne/moodle
Damyon Wiese [Wed, 22 Jan 2014 01:52:38 +0000 (09:52 +0800)]
Merge branch 'MDL-26680-master' of git://github.com/micaherne/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

7 years agoMerge branch 'w03_MDL-43661_m27_edulevel' of https://github.com/skodak/moodle
Dan Poltawski [Wed, 22 Jan 2014 01:15:52 +0000 (09:15 +0800)]
Merge branch 'w03_MDL-43661_m27_edulevel' of https://github.com/skodak/moodle

7 years agoMDL-26680 my page My Moodle "reset to default" button
Michael Aherne [Wed, 25 Jul 2012 12:33:29 +0000 (13:33 +0100)]
MDL-26680 my page My Moodle "reset to default" button

7 years agoMerge branch 'MDL-41506-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 21 Jan 2014 15:29:20 +0000 (23:29 +0800)]
Merge branch 'MDL-41506-master' of git://github.com/FMCorz/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

7 years agoMDL-43661 use new edulevel in all existing events
Petr Škoda [Mon, 13 Jan 2014 01:44:35 +0000 (09:44 +0800)]
MDL-43661 use new edulevel in all existing events

7 years agoMDL-43661 change event property level to edulevel
Petr Škoda [Mon, 13 Jan 2014 01:15:52 +0000 (09:15 +0800)]
MDL-43661 change event property level to edulevel

Level is a reserved word in sql, sorry.

7 years agoMerge branch 'mdl34020-master' of https://github.com/tlock/moodle
Dan Poltawski [Tue, 21 Jan 2014 07:21:17 +0000 (15:21 +0800)]
Merge branch 'mdl34020-master' of https://github.com/tlock/moodle

7 years agoMerge branch '43714-27' of git://github.com/samhemelryk/moodle
Dan Poltawski [Tue, 21 Jan 2014 06:49:26 +0000 (14:49 +0800)]
Merge branch '43714-27' of git://github.com/samhemelryk/moodle

7 years agoMerge branch 'MDL-43760-master' of git://github.com/damyon/moodle
Dan Poltawski [Tue, 21 Jan 2014 06:28:50 +0000 (14:28 +0800)]
Merge branch 'MDL-43760-master' of git://github.com/damyon/moodle

7 years agoMerge branch 'MDL-43725-master' of git://github.com/ankitagarwal/moodle
Damyon Wiese [Tue, 21 Jan 2014 05:47:39 +0000 (13:47 +0800)]
Merge branch 'MDL-43725-master' of git://github.com/ankitagarwal/moodle

7 years agoMerge branch 'wip-MDL-43294-master' of git://github.com/abgreeve/moodle
Damyon Wiese [Tue, 21 Jan 2014 05:17:05 +0000 (13:17 +0800)]
Merge branch 'wip-MDL-43294-master' of git://github.com/abgreeve/moodle

7 years agoMerge branch 'MDL-41810_master' of https://github.com/totara/openbadges
Damyon Wiese [Tue, 21 Jan 2014 05:06:30 +0000 (13:06 +0800)]
Merge branch 'MDL-41810_master' of https://github.com/totara/openbadges

Conflicts:
badges/upgrade.txt

7 years agoMerge branch 'master_MDL-43247' of git://github.com/danmarsden/moodle
Damyon Wiese [Tue, 21 Jan 2014 04:57:05 +0000 (12:57 +0800)]
Merge branch 'master_MDL-43247' of git://github.com/danmarsden/moodle

7 years agoMerge branch 'wip-MDL-43700-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Tue, 21 Jan 2014 04:24:38 +0000 (12:24 +0800)]
Merge branch 'wip-MDL-43700-master' of git://github.com/abgreeve/moodle

7 years agoMerge branch 'MDL-43717_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Tue, 21 Jan 2014 04:19:34 +0000 (12:19 +0800)]
Merge branch 'MDL-43717_master' of git://github.com/dmonllao/moodle

7 years agoMDL-43670 quiz: improve code comments a little
Dan Poltawski [Tue, 21 Jan 2014 03:58:40 +0000 (11:58 +0800)]
MDL-43670 quiz: improve code comments a little

7 years agoMerge branch 'MDL-43670' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 21 Jan 2014 03:25:38 +0000 (11:25 +0800)]
Merge branch 'MDL-43670' of git://github.com/timhunt/moodle