72760 Commits

Author SHA1 Message Date
Costantino Cito
be9854162f MDL-49203 webservices: New WS core_comment_get_comments 2015-03-26 15:57:21 +01:00
Eloy Lafuente (stronk7)
20d38830ae weekly release 2.9dev 2015-03-26 10:47:44 +01:00
Eloy Lafuente (stronk7)
293610873a Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2015-03-26 10:47:34 +01:00
David Monllao
cfb32192d6 MDL-47002 editor_atto: Remove all after html when pasting 2015-03-26 16:15:29 +08:00
David Monllao
d784f5edc3 MDL-47002 editor_atto: Clean the comments separately 2015-03-26 14:37:55 +08:00
Eloy Lafuente (stronk7)
cca1142f0e Merge branch 'MDL-49543' of https://github.com/totara/openbadges 2015-03-26 00:51:01 +01:00
Yuliya Bozhko
f951916362 MDL-49543 badges: Add URL params to criteria settings page
Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
2015-03-26 08:48:02 +13:00
Eloy Lafuente (stronk7)
54c40ffe75 Merge branch 'MDL-47002-int-master' of git://github.com/merrill-oakland/moodle 2015-03-25 18:17:17 +01:00
Eric Merrill
665829ec2a MDL-47002 atto: Prevent removal of Rangy spans 2015-03-25 10:02:43 -04:00
Dan Poltawski
21e864c983 Merge branch 'MDL-49558-28-master-table-fix' of https://github.com/dmonllao/moodle 2015-03-25 08:40:54 +00:00
Dan Poltawski
b74bff0685 MDL-48969 block_quiz_results: correct upgrade logic check 2015-03-25 08:13:02 +00:00
Dan Poltawski
e9610166d6 Merge branch 'MDL-49470_master-fix-number-events' of git://github.com/dmonllao/moodle 2015-03-25 07:35:58 +00:00
David Monllao
b7bfbfee2c MDL-49470 mod_lesson: Triggering just 1 event 2015-03-25 15:33:07 +08:00
David Monllao
044a884f24 MDL-49558 gradereport_user: Fixing table border 2015-03-25 13:54:37 +08:00
Andrew Nicols
7db6d31bf0 MDL-49262 bootstrapbase: Add log to bootstrapbase init 2015-03-25 13:41:34 +08:00
Marina Glancy
a824e60ab6 MDL-13831 course: validate gradepass only if needed 2015-03-25 10:59:33 +08:00
Eloy Lafuente (stronk7)
33d65f705b MDL-49425 webservices: Fix unit test dependent of php.ini 2015-03-25 03:09:24 +01:00
David Monllao
67b853ff6b 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.
2015-03-25 09:39:12 +08:00
David Monllao
1c78065ad6 Merge branch 'MDL_45619_m29v5' of git://github.com/sbourget/moodle 2015-03-25 09:38:24 +08:00
Eloy Lafuente (stronk7)
7962f73e51 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).
2015-03-25 01:37:33 +01:00
Eloy Lafuente (stronk7)
89267d6a51 Merge branch 'MDL-49543' of https://github.com/totara/openbadges 2015-03-25 01:32:34 +01:00
Eloy Lafuente (stronk7)
8251b4b055 Merge branch 'MDL-49425-master' of git://github.com/jleyva/moodle 2015-03-25 00:39:39 +01:00
Eloy Lafuente (stronk7)
fb42902b28 Merge branch 'MDL-48499' of https://github.com/danielneis/moodle 2015-03-24 22:00:07 +01:00
Daniel Neis Araujo
77acc5d7a7 MDL-48499 messages: Show which users have not received bulk messages 2015-03-24 14:58:30 -03:00
Dan Poltawski
eaad7d35e6 Merge branch 'MDL-49262-master' of git://github.com/damyon/moodle 2015-03-24 15:29:59 +00:00
Dan Poltawski
4c243a24ab Merge branch 'MDL-49622' of https://github.com/stronk7/moodle 2015-03-24 15:15:44 +00:00
Dan Poltawski
fee04d206e Merge branch 'MDL-49354-master' of https://github.com/mtavella-netspot/moodle 2015-03-24 15:14:08 +00:00
Dan Poltawski
422c29d339 Merge branch 'master_MDL-49054' of git://github.com/danmarsden/moodle 2015-03-24 15:12:24 +00:00
Dan Poltawski
b051a0aff5 Merge branch 'MDL-48918-master' of git://github.com/andrewnicols/moodle 2015-03-24 15:06:34 +00:00
Eloy Lafuente (stronk7)
891b28ff40 Merge branch 'MDL-48795' of https://github.com/apsdehal/moodle 2015-03-24 15:44:37 +01:00
Dan Poltawski
23137001c5 Merge branch 'wip-mdl-49374' of https://github.com/rajeshtaneja/moodle 2015-03-24 13:36:59 +00:00
Dan Poltawski
91062d4ceb Merge branch 'MDL-49070_scheduled' of https://github.com/andyjdavis/moodle 2015-03-24 13:33:38 +00:00
Dan Poltawski
52e81cd14d MDL-48969 block_quiz_results: disable on install 2015-03-24 12:15:11 +00:00
Dan Poltawski
9569976f86 Merge branch 'MDL-48969_m29v9' of https://github.com/sbourget/moodle 2015-03-24 11:48:44 +00:00
Dan Poltawski
bd65120bff Merge branch 'wip_MDL-49631_29_utfregex' of https://github.com/skodak/moodle 2015-03-24 11:10:19 +00:00
Dan Poltawski
db8a3b2eb9 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
2015-03-24 11:04:04 +00:00
Dan Poltawski
37ccb211fa MDL-49444 phpunit: add missing suite definition 2015-03-24 11:00:27 +00:00
Dan Poltawski
44a7e27b7b Merge branch 'MDL-49565-master' of git://github.com/merrill-oakland/moodle 2015-03-24 09:57:12 +00:00
David Monllao
6f27fbb435 Merge branch 'MDL-49337-master' of git://github.com/jleyva/moodle
Conflicts:
	lib/db/services.php
2015-03-24 17:55:42 +08:00
Juan Leyva
067b3fda6a MDL-49337 webservices: Unit tests for mod_data_get_databases_by_courses 2015-03-24 10:46:36 +01:00
Juan Leyva
a090259eaa MDL-49337 webservices: Include the new WS in the mobile app service 2015-03-24 10:46:36 +01:00
Juan Leyva
5c438daad5 MDL-49337 webservices: mod_data services file definition 2015-03-24 10:46:35 +01:00
Juan Leyva
2ab3481990 MDL-49337 webservices: New WS mod_data_get_databases_by_courses 2015-03-24 10:46:35 +01:00
David Monllao
636c609b24 Merge branch 'MDL-49444-master' of git://github.com/jleyva/moodle 2015-03-24 17:43:29 +08:00
Dan Poltawski
e8d14e464b Merge branch 'wip_MDL-49327_2.9_guide_getinstance' of https://github.com/nixorv/moodle
Conflicts:
	grade/grading/form/guide/tests/guide_test.php
2015-03-24 09:29:06 +00:00
Juan Leyva
25c49a85ff MDL-49444 webservices: Added new function to the mobile service 2015-03-24 09:50:03 +01:00
Juan Leyva
1490586ea8 MDL-49444 webservices: Tests for update_activity_completion_status 2015-03-24 09:50:02 +01:00
Juan Leyva
b9d17109e2 MDL-49444 webservices: New WS update_activity_completion_status 2015-03-24 09:50:01 +01:00
David Monllao
890d8dbffe Merge branch 'MDL-49558_master' of git://github.com/nadavkav/moodle 2015-03-24 14:51:07 +08:00
David Monllao
a2be9de182 Merge branch 'MDL-49430_m29v4' of git://github.com/sbourget/moodle
Conflicts:
	mod/lesson/version.php
2015-03-24 13:25:26 +08:00