Commit graph

73478 commits

Author SHA1 Message Date
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
Martin Mastny
8194541e89 MDL-37984 portfolio: Google drive using official client library 2015-03-24 12:26:33 +08:00
David Monllao
019e26db6d Merge branch 'MDL-49470_master-refine' of git://github.com/dmonllao/moodle 2015-03-24 12:02:33 +08:00
David Monllao
bedf3a0a39 MDL-49470 mod_lesson: Adding text space + unit test refinement 2015-03-24 11:59:05 +08:00
Stephen Bourget
14cdeb7ba9 MDL-49470 Lesson: Add page moved event
Conflicts:
	mod/lesson/version.php
2015-03-24 11:05:56 +08:00
Dave Cooper
657b12788d MDL-49518 libraries: Update lessphp to 1.7.0.3 2015-03-24 11:01:13 +08:00
David Monllao
6c6539dd72 Merge branch 'MDL-49555-master' of git://github.com/FMCorz/moodle 2015-03-24 11:00:15 +08:00
David Monllao
b6f7863e77 Merge branch 'MDL-47003-master' of git://github.com/merrill-oakland/moodle 2015-03-24 10:17:28 +08:00
Tim Lock
2a3e6f87da MDL-36506 mod_book: Skip legacy files migration if missing a CM record 2015-03-24 12:45:51 +10:30
Eloy Lafuente (stronk7)
6ae45106fc Merge branch 'MDL-48718-master' of git://github.com/jleyva/moodle 2015-03-24 01:51:44 +01:00
Eloy Lafuente (stronk7)
20e955a18e Merge branch 'MDL-43770-master' of https://github.com/lucisgit/moodle 2015-03-24 01:38:15 +01:00
Eloy Lafuente (stronk7)
e448df5ec9 Merge branch 'wip-MDL-35482-master' of git://github.com/satrun77/moodle 2015-03-24 00:39:12 +01:00
Eloy Lafuente (stronk7)
0b8cb023c1 Merge branch 'MDL-32285_master' of https://github.com/nadavkav/moodle 2015-03-24 00:30:16 +01:00
Dan Marsden
7a0d8e725c MDL-48096 scorm: Make exit activity link return to correct section 2015-03-24 11:40:27 +13:00
Nikita Kalinin
ea33260cce MDL-49327 marking guide: Added condition on definitionid. 2015-03-24 00:14:33 +03:00
Yuliya Bozhko
fffeb03fe7 MDL-49543 badges: Add decription format and backup/restore
Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
2015-03-24 09:22:47 +13:00
AMOS bot
dc6f792335 Automatically generated installer lang files 2015-03-24 00:06:30 +08:00
Dan Poltawski
c1f4001bd1 Merge branch 'wip_MDL-49327_2.9_guide_getinstance' of https://github.com/nixorv/moodle 2015-03-23 15:49:03 +00:00
Dan Poltawski
51a1d6bbf4 Merge branch 'MDL-48443-master' of git://github.com/jleyva/moodle 2015-03-23 15:03:56 +00:00
Dan Poltawski
07eb5a1f5c Merge branch 'wip-mdl-49432' of https://github.com/rajeshtaneja/moodle 2015-03-23 12:37:05 +00:00
Dan Poltawski
6b578e9611 Merge branch 'MDL-35280_m29v2' of https://github.com/sbourget/moodle 2015-03-23 11:25:55 +00:00
Dan Poltawski
68d52a732f Merge branch 'master_MDL-48419' of https://github.com/danmarsden/moodle 2015-03-23 11:15:55 +00:00
Dan Poltawski
ab5b4d80c5 Merge branch 'MDL-21201-master-feedback_anon' of https://github.com/DSI-Universite-Rennes2/moodle 2015-03-23 11:03:28 +00:00
Marina Glancy
8eb35d9826 MDL-13831 workshop: process gradepass only if set 2015-03-23 16:52:20 +08:00
David Monllao
f1d498a62a MDL-48456 course: Using default max int value 2015-03-23 15:16:18 +08:00
David Monllao
ae9ed08f53 Merge branch 'MDL-48456-master' of git://github.com/dkns/moodle 2015-03-23 15:14:58 +08:00
David Monllao
2572356895 Merge branch 'MDL-47002-master' of git://github.com/merrill-oakland/moodle 2015-03-23 14:59:05 +08:00
David Monllao
b191360fea Merge branch 'wip-MDL-27074-master' of git://github.com/marinaglancy/moodle 2015-03-23 14:54:37 +08:00
Damyon Wiese
d2b6447870 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.
2015-03-23 14:25:39 +08:00
Petr Skoda
e737c2ff89 MDL-49631 fix incorrect whitespace remplacements 2015-03-23 17:40:15 +13:00
David Monllao
ef4b8bb98b Merge branch 'wip-MDL-13831-master' of git://github.com/marinaglancy/moodle 2015-03-23 11:51:09 +08:00
Marina Glancy
c977b35059 MDL-13831 grades: allow to set gradepass in mod_form 2015-03-23 11:11:37 +08:00
Gregory Faller
8164fad49d MDL-13831 course: add gradepass field to mod_form 2015-03-23 10:56:56 +08:00
Marina Glancy
c96534600d MDL-27074 calendar: display group name for group events 2015-03-23 10:16:55 +08:00
Adrian Greeve
ecca6b031a MDL-49522 lib: Upgrade TCPDF to 6.2.6 2015-03-23 09:21:24 +08:00
Yuliya
0b6ba27a04 MDL-49543 badges: Fix format_text and description layout
Signed-off-by: Yuliya <yuliya.bozhko@gmail.com>
2015-03-23 09:43:12 +13:00
Dan Marsden
b6906055ca MDL-49054 scorm: Remove some old debugging code. 2015-03-23 08:56:33 +13:00
Yuliya Bozhko
3784d3be98 MDL-49543 badges: Add description to the badge criteria
Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
2015-03-23 08:47:49 +13:00
AMOS bot
a108c8f254 Automatically generated installer lang files 2015-03-23 00:04:17 +08:00
Daniel Kosinski
551e64ccb9 MDL-48456 course: Increase timeout when deleting all courses in category 2015-03-22 16:21:51 +01:00
Eloy Lafuente (stronk7)
50fccc4249 MDL-49622 behat: better handling of profile and tags
This solves some minor annoyances in the run.php script:

A) profile is checked properly, independently of everything else.
B) cli tags get precedence over profile tags.

Indicentally, this also causes run.php to support both profile and
tag in command line together. Previously the use of profile did
invalidate the use of tags.
2015-03-22 11:39:53 +01:00
AMOS bot
ba4e300f60 Automatically generated installer lang files 2015-03-21 00:04:01 +08:00