moodle.git
6 years agoMDL-32547 unit tests: Make tests match file_temp_cleanup_task impl.
Eloy Lafuente (stronk7) [Mon, 30 Mar 2015 23:53:56 +0000 (01:53 +0200)]
MDL-32547 unit tests: Make tests match file_temp_cleanup_task impl.

While default value did not change from 7 days... there are subtle
differences between strtotime('-1 week') used in tests and
-(7*24**3600) used in implementation.

This just makes the unit test to follow the implementation by
using the new config setting.

6 years agoMDL-47572 unit tests: make cronlib_testcase DST immune
Eloy Lafuente (stronk7) [Mon, 30 Mar 2015 23:21:18 +0000 (01:21 +0200)]
MDL-47572 unit tests: make cronlib_testcase DST immune

Disclaimer: I've assigned this commit to MDL-47572 because it's
the issue where I've seen related changes.

Since a couple of days ago, both CI servers were failing. A couple
of days ago it was DST change in Europe/Madrid (that is the PHP
default TZ used by them).

Tests pass perfectly if the TZ is set to any other place not affected
by DST (Australia/Perth, for example).

Really the issue is a wrong mix of functions supporting DST and
functions not supporting them.

But, with current implementation (checking +-60 seconds around a time)
and with a DST change in the middle... this unit tests was going to be
failing for an entire week. And that's not acceptable for CIs.

So, I've changed the intervals, to be bigger than 1h (exactly 1h1s), so
they will be immune to the DST change/partial support.

Ideally all operations should be working in the same way (with or
without DST considered), but that's out from the scope of getting this
test stable enough and passing.

6 years agoMDL-49203 webservices: Increment subsystems count in unit tests.
Eloy Lafuente (stronk7) [Mon, 30 Mar 2015 22:42:27 +0000 (00:42 +0200)]
MDL-49203 webservices: Increment subsystems count in unit tests.

6 years agoMerge branch 'MDL-49203-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Mon, 30 Mar 2015 18:01:10 +0000 (20:01 +0200)]
Merge branch 'MDL-49203-master' of git://github.com/jleyva/moodle

6 years agoMerge branch 'MDL-49528-master' of git://github.com/xow/moodle
Dan Poltawski [Mon, 30 Mar 2015 14:04:45 +0000 (15:04 +0100)]
Merge branch 'MDL-49528-master' of git://github.com/xow/moodle

6 years agoMerge branch 'MDL-18966' of git://github.com/jmvedrine/moodle
Dan Poltawski [Mon, 30 Mar 2015 14:03:10 +0000 (15:03 +0100)]
Merge branch 'MDL-18966' of git://github.com/jmvedrine/moodle

6 years agoMerge branch 'master_MDL-48096' of git://github.com/danmarsden/moodle
Dan Poltawski [Mon, 30 Mar 2015 12:48:35 +0000 (13:48 +0100)]
Merge branch 'master_MDL-48096' of git://github.com/danmarsden/moodle

6 years agoMerge branch 'wip-mdl-49708' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Mon, 30 Mar 2015 11:16:17 +0000 (13:16 +0200)]
Merge branch 'wip-mdl-49708' of https://github.com/rajeshtaneja/moodle

6 years agoMerge branch 'wip-MDL-49522-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Mon, 30 Mar 2015 11:18:41 +0000 (12:18 +0100)]
Merge branch 'wip-MDL-49522-master' of git://github.com/abgreeve/moodle

6 years agoMDL-18966 mod_lesson: Save attempts of practice lessons
Jean-Michel Vedrine [Mon, 12 Jan 2015 09:56:04 +0000 (10:56 +0100)]
MDL-18966 mod_lesson: Save attempts of practice lessons

6 years agoMerge branch 'wip-MDL-47337-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 30 Mar 2015 10:05:12 +0000 (11:05 +0100)]
Merge branch 'wip-MDL-47337-master' of git://github.com/marinaglancy/moodle

6 years agoMerge branch 'MDL-25721_master' of git://github.com/markn86/moodle
Dan Poltawski [Mon, 30 Mar 2015 09:50:44 +0000 (10:50 +0100)]
Merge branch 'MDL-25721_master' of git://github.com/markn86/moodle

6 years agoMDL-49708 behat: Resize window back to default
Rajesh Taneja [Mon, 30 Mar 2015 09:17:05 +0000 (17:17 +0800)]
MDL-49708 behat: Resize window back to default

Leaving window size to large fails in chrome
Reset it to default size works to ensure stamp
is visible by selenium driver

6 years agoMDL-49708 behat: Fix chromedriver failure
Rajesh Taneja [Mon, 30 Mar 2015 04:33:21 +0000 (12:33 +0800)]
MDL-49708 behat: Fix chromedriver failure

Chromedriver tries to click in center of link
As these links wrap on next line it fails to
click on links on small screen

6 years agoMDL-49528 libraries: Upgrade Markdown to 1.5.0
John Okely [Fri, 20 Mar 2015 03:58:13 +0000 (11:58 +0800)]
MDL-49528 libraries: Upgrade Markdown to 1.5.0

6 years agoMDL-49528 libraries: Update thirdpartylib entry for Markdown to 1.5.0
John Okely [Wed, 25 Mar 2015 05:41:02 +0000 (13:41 +0800)]
MDL-49528 libraries: Update thirdpartylib entry for Markdown to 1.5.0

6 years agoMerge branch 'mdl36506-master' of git://github.com/tlock/moodle
David Monllao [Mon, 30 Mar 2015 02:31:44 +0000 (10:31 +0800)]
Merge branch 'mdl36506-master' of git://github.com/tlock/moodle

6 years agoMDL-47337 course: merge section options during restore
Marina Glancy [Thu, 15 Jan 2015 07:11:22 +0000 (15:11 +0800)]
MDL-47337 course: merge section options during restore

6 years agoMDL-25721 core_question: added ability to order questions by dates
Mark Nelson [Wed, 25 Mar 2015 22:48:38 +0000 (15:48 -0700)]
MDL-25721 core_question: added ability to order questions by dates

6 years agoMDL-49203 webservices: Unit tests for the new external function
Juan Leyva [Mon, 16 Mar 2015 12:14:54 +0000 (13:14 +0100)]
MDL-49203 webservices: Unit tests for the new external function

6 years agoMDL-49203 webservices: Add missing component testsuite declaration
Juan Leyva [Mon, 16 Mar 2015 11:31:05 +0000 (12:31 +0100)]
MDL-49203 webservices: Add missing component testsuite declaration

6 years agoMDL-49203 webservices: Coding style fixes, ws added to the app service
Juan Leyva [Mon, 16 Mar 2015 11:31:53 +0000 (12:31 +0100)]
MDL-49203 webservices: Coding style fixes, ws added to the app service

6 years agoMDL-49203 webservices: New WS core_comment_get_comments
Costantino Cito [Fri, 27 Feb 2015 16:06:27 +0000 (17:06 +0100)]
MDL-49203 webservices: New WS core_comment_get_comments

6 years agoweekly release 2.9dev
Eloy Lafuente (stronk7) [Thu, 26 Mar 2015 09:47:44 +0000 (10:47 +0100)]
weekly release 2.9dev

6 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Eloy Lafuente (stronk7) [Thu, 26 Mar 2015 09:47:34 +0000 (10:47 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

6 years agoMDL-47002 editor_atto: Remove all after html when pasting
David Monllao [Thu, 26 Mar 2015 08:15:29 +0000 (16:15 +0800)]
MDL-47002 editor_atto: Remove all after html when pasting

6 years agoMDL-47002 editor_atto: Clean the comments separately
David Monllao [Thu, 26 Mar 2015 06:37:55 +0000 (14:37 +0800)]
MDL-47002 editor_atto: Clean the comments separately

6 years agoMerge branch 'MDL-49543' of https://github.com/totara/openbadges
Eloy Lafuente (stronk7) [Wed, 25 Mar 2015 23:51:01 +0000 (00:51 +0100)]
Merge branch 'MDL-49543' of https://github.com/totara/openbadges

6 years agoMDL-49543 badges: Add URL params to criteria settings page
Yuliya Bozhko [Wed, 25 Mar 2015 19:48:02 +0000 (08:48 +1300)]
MDL-49543 badges: Add URL params to criteria settings page

Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
6 years agoMerge branch 'MDL-47002-int-master' of git://github.com/merrill-oakland/moodle
Eloy Lafuente (stronk7) [Wed, 25 Mar 2015 17:17:17 +0000 (18:17 +0100)]
Merge branch 'MDL-47002-int-master' of git://github.com/merrill-oakland/moodle

6 years agoMDL-47002 atto: Prevent removal of Rangy spans
Eric Merrill [Wed, 25 Mar 2015 13:59:16 +0000 (09:59 -0400)]
MDL-47002 atto: Prevent removal of Rangy spans

6 years agoMerge branch 'MDL-49558-28-master-table-fix' of https://github.com/dmonllao/moodle
Dan Poltawski [Wed, 25 Mar 2015 08:40:54 +0000 (08:40 +0000)]
Merge branch 'MDL-49558-28-master-table-fix' of https://github.com/dmonllao/moodle

6 years agoMDL-48969 block_quiz_results: correct upgrade logic check
Dan Poltawski [Wed, 25 Mar 2015 08:12:10 +0000 (08:12 +0000)]
MDL-48969 block_quiz_results: correct upgrade logic check

6 years agoMerge branch 'MDL-49470_master-fix-number-events' of git://github.com/dmonllao/moodle
Dan Poltawski [Wed, 25 Mar 2015 07:35:58 +0000 (07:35 +0000)]
Merge branch 'MDL-49470_master-fix-number-events' of git://github.com/dmonllao/moodle

6 years agoMDL-49470 mod_lesson: Triggering just 1 event
David Monllao [Wed, 25 Mar 2015 07:32:54 +0000 (15:32 +0800)]
MDL-49470 mod_lesson: Triggering just 1 event

6 years agoMDL-49558 gradereport_user: Fixing table border
David Monllao [Wed, 25 Mar 2015 05:54:37 +0000 (13:54 +0800)]
MDL-49558 gradereport_user: Fixing table border

6 years agoMDL-49262 bootstrapbase: Add log to bootstrapbase init
Andrew Nicols [Wed, 25 Mar 2015 05:41:34 +0000 (13:41 +0800)]
MDL-49262 bootstrapbase: Add log to bootstrapbase init

6 years agoMDL-13831 course: validate gradepass only if needed
Marina Glancy [Wed, 25 Mar 2015 02:55:39 +0000 (10:55 +0800)]
MDL-13831 course: validate gradepass only if needed

6 years agoMDL-49425 webservices: Fix unit test dependent of php.ini
Eloy Lafuente (stronk7) [Wed, 25 Mar 2015 02:09:24 +0000 (03:09 +0100)]
MDL-49425 webservices: Fix unit test dependent of php.ini

6 years agoMDL-45619 repository: Don't allow repository_recent to be uninstalled
David Monllao [Wed, 25 Mar 2015 01:36:55 +0000 (09:36 +0800)]
MDL-45619 repository: Don't allow repository_recent to be uninstalled

We have tests that depends on it and it
is a simple repo that can just be disabled.

6 years agoMerge branch 'MDL_45619_m29v5' of git://github.com/sbourget/moodle
David Monllao [Wed, 25 Mar 2015 01:38:24 +0000 (09:38 +0800)]
Merge branch 'MDL_45619_m29v5' of git://github.com/sbourget/moodle

6 years agoMDL-49543 badges: minor tweaks
Eloy Lafuente (stronk7) [Wed, 25 Mar 2015 00:37:33 +0000 (01:37 +0100)]
MDL-49543 badges: minor tweaks

Fix restore to support old criteria not having descriptions.
Plus delete not-needed cast (now $params is always already array).

6 years agoMerge branch 'MDL-49543' of https://github.com/totara/openbadges
Eloy Lafuente (stronk7) [Wed, 25 Mar 2015 00:32:34 +0000 (01:32 +0100)]
Merge branch 'MDL-49543' of https://github.com/totara/openbadges

6 years agoMerge branch 'MDL-49425-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Tue, 24 Mar 2015 23:39:39 +0000 (00:39 +0100)]
Merge branch 'MDL-49425-master' of git://github.com/jleyva/moodle

6 years agoMerge branch 'MDL-48499' of https://github.com/danielneis/moodle
Eloy Lafuente (stronk7) [Tue, 24 Mar 2015 21:00:07 +0000 (22:00 +0100)]
Merge branch 'MDL-48499' of https://github.com/danielneis/moodle

6 years agoMDL-48499 messages: Show which users have not received bulk messages
Daniel Neis Araujo [Thu, 4 Dec 2014 13:37:09 +0000 (11:37 -0200)]
MDL-48499 messages: Show which users have not received bulk messages

6 years agoMerge branch 'MDL-49262-master' of git://github.com/damyon/moodle
Dan Poltawski [Tue, 24 Mar 2015 15:29:59 +0000 (15:29 +0000)]
Merge branch 'MDL-49262-master' of git://github.com/damyon/moodle

6 years agoMerge branch 'MDL-49622' of https://github.com/stronk7/moodle
Dan Poltawski [Tue, 24 Mar 2015 15:15:44 +0000 (15:15 +0000)]
Merge branch 'MDL-49622' of https://github.com/stronk7/moodle

6 years agoMerge branch 'MDL-49354-master' of https://github.com/mtavella-netspot/moodle
Dan Poltawski [Tue, 24 Mar 2015 15:14:08 +0000 (15:14 +0000)]
Merge branch 'MDL-49354-master' of https://github.com/mtavella-netspot/moodle

6 years agoMerge branch 'master_MDL-49054' of git://github.com/danmarsden/moodle
Dan Poltawski [Tue, 24 Mar 2015 15:12:24 +0000 (15:12 +0000)]
Merge branch 'master_MDL-49054' of git://github.com/danmarsden/moodle

6 years agoMerge branch 'MDL-48918-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 24 Mar 2015 15:06:34 +0000 (15:06 +0000)]
Merge branch 'MDL-48918-master' of git://github.com/andrewnicols/moodle

6 years agoMerge branch 'MDL-48795' of https://github.com/apsdehal/moodle
Eloy Lafuente (stronk7) [Tue, 24 Mar 2015 14:44:37 +0000 (15:44 +0100)]
Merge branch 'MDL-48795' of https://github.com/apsdehal/moodle

6 years agoMerge branch 'wip-mdl-49374' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 24 Mar 2015 13:36:59 +0000 (13:36 +0000)]
Merge branch 'wip-mdl-49374' of https://github.com/rajeshtaneja/moodle

6 years agoMerge branch 'MDL-49070_scheduled' of https://github.com/andyjdavis/moodle
Dan Poltawski [Tue, 24 Mar 2015 13:33:38 +0000 (13:33 +0000)]
Merge branch 'MDL-49070_scheduled' of https://github.com/andyjdavis/moodle

6 years agoMDL-48969 block_quiz_results: disable on install
Dan Poltawski [Tue, 24 Mar 2015 12:15:11 +0000 (12:15 +0000)]
MDL-48969 block_quiz_results: disable on install

6 years agoMerge branch 'MDL-48969_m29v9' of https://github.com/sbourget/moodle
Dan Poltawski [Tue, 24 Mar 2015 11:48:44 +0000 (11:48 +0000)]
Merge branch 'MDL-48969_m29v9' of https://github.com/sbourget/moodle

6 years agoMerge branch 'wip_MDL-49631_29_utfregex' of https://github.com/skodak/moodle
Dan Poltawski [Tue, 24 Mar 2015 11:10:19 +0000 (11:10 +0000)]
Merge branch 'wip_MDL-49631_29_utfregex' of https://github.com/skodak/moodle

6 years agoMerge branch 'MDL-46746-master' of git://github.com/merrill-oakland/moodle
Dan Poltawski [Tue, 24 Mar 2015 11:04:04 +0000 (11:04 +0000)]
Merge branch 'MDL-46746-master' of git://github.com/merrill-oakland/moodle

Conflicts:
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js

6 years agoMDL-49444 phpunit: add missing suite definition
Dan Poltawski [Tue, 24 Mar 2015 11:00:27 +0000 (11:00 +0000)]
MDL-49444 phpunit: add missing suite definition

6 years agoMerge branch 'MDL-49565-master' of git://github.com/merrill-oakland/moodle
Dan Poltawski [Tue, 24 Mar 2015 09:57:12 +0000 (09:57 +0000)]
Merge branch 'MDL-49565-master' of git://github.com/merrill-oakland/moodle

6 years agoMerge branch 'MDL-49337-master' of git://github.com/jleyva/moodle
David Monllao [Tue, 24 Mar 2015 09:55:42 +0000 (17:55 +0800)]
Merge branch 'MDL-49337-master' of git://github.com/jleyva/moodle

Conflicts:
lib/db/services.php

6 years agoMDL-49337 webservices: Unit tests for mod_data_get_databases_by_courses
Juan Leyva [Thu, 5 Mar 2015 20:47:32 +0000 (21:47 +0100)]
MDL-49337 webservices: Unit tests for mod_data_get_databases_by_courses

6 years agoMDL-49337 webservices: Include the new WS in the mobile app service
Juan Leyva [Thu, 5 Mar 2015 15:52:08 +0000 (16:52 +0100)]
MDL-49337 webservices: Include the new WS in the mobile app service

6 years agoMDL-49337 webservices: mod_data services file definition
Juan Leyva [Thu, 5 Mar 2015 15:47:34 +0000 (16:47 +0100)]
MDL-49337 webservices: mod_data services file definition

6 years agoMDL-49337 webservices: New WS mod_data_get_databases_by_courses
Juan Leyva [Thu, 5 Mar 2015 15:25:50 +0000 (16:25 +0100)]
MDL-49337 webservices: New WS mod_data_get_databases_by_courses

6 years agoMerge branch 'MDL-49444-master' of git://github.com/jleyva/moodle
David Monllao [Tue, 24 Mar 2015 09:43:29 +0000 (17:43 +0800)]
Merge branch 'MDL-49444-master' of git://github.com/jleyva/moodle

6 years agoMerge branch 'wip_MDL-49327_2.9_guide_getinstance' of https://github.com/nixorv/moodle
Dan Poltawski [Tue, 24 Mar 2015 09:29:06 +0000 (09:29 +0000)]
Merge branch 'wip_MDL-49327_2.9_guide_getinstance' of https://github.com/nixorv/moodle

Conflicts:
grade/grading/form/guide/tests/guide_test.php

6 years agoMDL-49444 webservices: Added new function to the mobile service
Juan Leyva [Mon, 9 Mar 2015 12:15:15 +0000 (13:15 +0100)]
MDL-49444 webservices: Added new function to the mobile service

6 years agoMDL-49444 webservices: Tests for update_activity_completion_status
Juan Leyva [Mon, 9 Mar 2015 12:14:48 +0000 (13:14 +0100)]
MDL-49444 webservices: Tests for update_activity_completion_status

6 years agoMDL-49444 webservices: New WS update_activity_completion_status
Juan Leyva [Mon, 9 Mar 2015 12:14:25 +0000 (13:14 +0100)]
MDL-49444 webservices: New WS update_activity_completion_status

6 years agoMerge branch 'MDL-49558_master' of git://github.com/nadavkav/moodle
David Monllao [Tue, 24 Mar 2015 06:51:07 +0000 (14:51 +0800)]
Merge branch 'MDL-49558_master' of git://github.com/nadavkav/moodle

6 years agoMerge branch 'MDL-49430_m29v4' of git://github.com/sbourget/moodle
David Monllao [Tue, 24 Mar 2015 05:25:26 +0000 (13:25 +0800)]
Merge branch 'MDL-49430_m29v4' of git://github.com/sbourget/moodle

Conflicts:
mod/lesson/version.php

6 years agoMerge branch 'MDL-49470_master-refine' of git://github.com/dmonllao/moodle
David Monllao [Tue, 24 Mar 2015 04:02:33 +0000 (12:02 +0800)]
Merge branch 'MDL-49470_master-refine' of git://github.com/dmonllao/moodle

6 years agoMDL-49470 mod_lesson: Adding text space + unit test refinement
David Monllao [Tue, 24 Mar 2015 03:59:05 +0000 (11:59 +0800)]
MDL-49470 mod_lesson: Adding text space + unit test refinement

6 years agoMDL-49470 Lesson: Add page moved event
Stephen Bourget [Wed, 18 Mar 2015 18:40:14 +0000 (14:40 -0400)]
MDL-49470 Lesson: Add page moved event

Conflicts:
mod/lesson/version.php

6 years agoMerge branch 'MDL-49555-master' of git://github.com/FMCorz/moodle
David Monllao [Tue, 24 Mar 2015 03:00:15 +0000 (11:00 +0800)]
Merge branch 'MDL-49555-master' of git://github.com/FMCorz/moodle

6 years agoMerge branch 'MDL-47003-master' of git://github.com/merrill-oakland/moodle
David Monllao [Tue, 24 Mar 2015 02:17:28 +0000 (10:17 +0800)]
Merge branch 'MDL-47003-master' of git://github.com/merrill-oakland/moodle

6 years agoMDL-36506 mod_book: Skip legacy files migration if missing a CM record
Tim Lock [Wed, 8 Jan 2014 23:38:41 +0000 (10:08 +1030)]
MDL-36506 mod_book: Skip legacy files migration if missing a CM record

6 years agoMerge branch 'MDL-48718-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Tue, 24 Mar 2015 00:51:44 +0000 (01:51 +0100)]
Merge branch 'MDL-48718-master' of git://github.com/jleyva/moodle

6 years agoMerge branch 'MDL-43770-master' of https://github.com/lucisgit/moodle
Eloy Lafuente (stronk7) [Tue, 24 Mar 2015 00:38:15 +0000 (01:38 +0100)]
Merge branch 'MDL-43770-master' of https://github.com/lucisgit/moodle

6 years agoMerge branch 'wip-MDL-35482-master' of git://github.com/satrun77/moodle
Eloy Lafuente (stronk7) [Mon, 23 Mar 2015 23:39:12 +0000 (00:39 +0100)]
Merge branch 'wip-MDL-35482-master' of git://github.com/satrun77/moodle

6 years agoMerge branch 'MDL-32285_master' of https://github.com/nadavkav/moodle
Eloy Lafuente (stronk7) [Mon, 23 Mar 2015 23:30:16 +0000 (00:30 +0100)]
Merge branch 'MDL-32285_master' of https://github.com/nadavkav/moodle

6 years agoMDL-48096 scorm: Make exit activity link return to correct section
Dan Marsden [Wed, 18 Mar 2015 09:29:02 +0000 (22:29 +1300)]
MDL-48096 scorm: Make exit activity link return to correct section

6 years agoMDL-49327 marking guide: Added condition on definitionid.
Nikita Kalinin [Mon, 2 Mar 2015 18:35:48 +0000 (21:35 +0300)]
MDL-49327 marking guide: Added condition on definitionid.

6 years agoMDL-49543 badges: Add decription format and backup/restore
Yuliya Bozhko [Mon, 23 Mar 2015 20:22:47 +0000 (09:22 +1300)]
MDL-49543 badges: Add decription format and backup/restore

Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
6 years agoAutomatically generated installer lang files
AMOS bot [Mon, 23 Mar 2015 16:06:30 +0000 (00:06 +0800)]
Automatically generated installer lang files

6 years agoMerge branch 'wip_MDL-49327_2.9_guide_getinstance' of https://github.com/nixorv/moodle
Dan Poltawski [Mon, 23 Mar 2015 15:49:03 +0000 (15:49 +0000)]
Merge branch 'wip_MDL-49327_2.9_guide_getinstance' of https://github.com/nixorv/moodle

6 years agoMerge branch 'MDL-48443-master' of git://github.com/jleyva/moodle
Dan Poltawski [Mon, 23 Mar 2015 15:03:56 +0000 (15:03 +0000)]
Merge branch 'MDL-48443-master' of git://github.com/jleyva/moodle

6 years agoMerge branch 'wip-mdl-49432' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 23 Mar 2015 12:37:05 +0000 (12:37 +0000)]
Merge branch 'wip-mdl-49432' of https://github.com/rajeshtaneja/moodle

6 years agoMerge branch 'MDL-35280_m29v2' of https://github.com/sbourget/moodle
Dan Poltawski [Mon, 23 Mar 2015 11:25:55 +0000 (11:25 +0000)]
Merge branch 'MDL-35280_m29v2' of https://github.com/sbourget/moodle

6 years agoMerge branch 'master_MDL-48419' of https://github.com/danmarsden/moodle
Dan Poltawski [Mon, 23 Mar 2015 11:15:55 +0000 (11:15 +0000)]
Merge branch 'master_MDL-48419' of https://github.com/danmarsden/moodle

6 years agoMerge branch 'MDL-21201-master-feedback_anon' of https://github.com/DSI-Universite...
Dan Poltawski [Mon, 23 Mar 2015 11:03:28 +0000 (11:03 +0000)]
Merge branch 'MDL-21201-master-feedback_anon' of https://github.com/DSI-Universite-Rennes2/moodle

6 years agoMDL-13831 workshop: process gradepass only if set
Marina Glancy [Mon, 23 Mar 2015 08:52:20 +0000 (16:52 +0800)]
MDL-13831 workshop: process gradepass only if set

6 years agoMDL-48456 course: Using default max int value
David Monllao [Mon, 23 Mar 2015 07:16:18 +0000 (15:16 +0800)]
MDL-48456 course: Using default max int value

6 years agoMerge branch 'MDL-48456-master' of git://github.com/dkns/moodle
David Monllao [Mon, 23 Mar 2015 07:14:58 +0000 (15:14 +0800)]
Merge branch 'MDL-48456-master' of git://github.com/dkns/moodle

6 years agoMerge branch 'MDL-47002-master' of git://github.com/merrill-oakland/moodle
David Monllao [Mon, 23 Mar 2015 06:59:05 +0000 (14:59 +0800)]
Merge branch 'MDL-47002-master' of git://github.com/merrill-oakland/moodle

6 years agoMerge branch 'wip-MDL-27074-master' of git://github.com/marinaglancy/moodle
David Monllao [Mon, 23 Mar 2015 06:54:37 +0000 (14:54 +0800)]
Merge branch 'wip-MDL-27074-master' of git://github.com/marinaglancy/moodle

6 years agoMDL-49262 bootstrapbase: Lets use the standard jquery libraries
Damyon Wiese [Sun, 22 Feb 2015 07:27:32 +0000 (15:27 +0800)]
MDL-49262 bootstrapbase: Lets use the standard jquery libraries

We have jquery+amd support. Lets use it to bring back the standard bootstrap jquery plugins.

6 years agoMDL-49631 fix incorrect whitespace remplacements
Petr Skoda [Mon, 23 Mar 2015 04:28:10 +0000 (17:28 +1300)]
MDL-49631 fix incorrect whitespace remplacements

6 years agoMerge branch 'wip-MDL-13831-master' of git://github.com/marinaglancy/moodle
David Monllao [Mon, 23 Mar 2015 03:51:09 +0000 (11:51 +0800)]
Merge branch 'wip-MDL-13831-master' of git://github.com/marinaglancy/moodle