74546 Commits

Author SHA1 Message Date
Juan Leyva
f07a2bb09b MDL-50132 mod_choice: New WS mod_choice_get_choices_by_courses 2015-09-21 09:27:42 +02:00
Eloy Lafuente (stronk7)
d230899db8 weekly release 3.0dev 2015-09-17 18:01:12 +02:00
Eloy Lafuente (stronk7)
22e97e6413 Merge branch 'MDL-30157_master-fix' of git://github.com/dmonllao/moodle 2015-09-17 11:28:31 +02:00
David Monllao
ba523bf5c3 MDL-30157 enrol_manual: timestart a few seconds before
We want to prevent conflicts with get_enrolled_sql trick for db caching
plus users should be able to access the course once enrolled.
2015-09-17 17:09:36 +08:00
Simey Lameze
8c55a50dba MDL-50959 gradebook: fix XML grade export 2015-09-17 10:34:50 +08:00
Eloy Lafuente (stronk7)
115c5270cc Merge branch 'MDL-50557-master' of git://github.com/jleyva/moodle 2015-09-16 23:24:39 +02:00
Juan Leyva
35219d8bb9 MDL-50557 scorm: Add attempt field in mod_scorm_get_scorm_sco_tracks 2015-09-16 23:18:40 +02:00
Juan Leyva
6b5e69ebe6 MDL-50557 mod_scorm: New WS mod_scorm_get_scorm_sco_tracks 2015-09-16 23:18:39 +02:00
Eloy Lafuente (stronk7)
6c9872941e Merge branch 'MDL-50353-master' of git://github.com/jleyva/moodle 2015-09-16 23:15:59 +02:00
Juan Leyva
f26274a45c MDL-50353 mod_scorm: Fix problem with ids ordering in tests 2015-09-16 23:14:11 +02:00
Eloy Lafuente (stronk7)
765d7b7fd5 Merge branch 'MDL-50353-master' of git://github.com/jleyva/moodle 2015-09-16 22:11:55 +02:00
Juan Leyva
6b4ceb24cf MDL-50353 scorm: New Web Service mod_scorm_insert_scorm_tracks 2015-09-16 22:07:34 +02:00
Juan Leyva
822e9df70d MDL-50352 scorm: New Web Service mod_scorm_get_scorm_user_data 2015-09-16 19:25:19 +02:00
Juan Leyva
dfe927c8d6 MDL-50351 scorm: New Web Service mod_scorm_get_scorm_scoes 2015-09-16 19:25:17 +02:00
Marina Glancy
0f7f30021a MDL-51217 auth: check if recaptcha enabled for current plugin 2015-09-16 15:30:04 +08:00
Marina Glancy
a853f15fc3 MDL-46705 admin: Validate unique shortname for frontpage course 2015-09-16 14:38:52 +08:00
David Monllao
974053b93f MDL-48881 mod_lesson: A couple of performance improvements
- Improve memory usage on db drivers not able to use recordsets
  properly
- !array_key_exists replaced by empty calls
2015-09-16 13:32:49 +08:00
David Monllao
48cec36dfb Merge branch 'MDL-48881_m30v5' of git://github.com/sbourget/moodle 2015-09-16 13:20:52 +08:00
David Monllao
13a2aff3f9 Merge branch 'MDL-49561_master' of git://github.com/markn86/moodle
Conflicts:
	lib/bennu/readme_moodle.txt
2015-09-16 09:57:22 +08:00
David Monllao
b3ec8cf95e Merge branch 'MDL-46705-master' of git://github.com/dkns/moodle 2015-09-16 09:44:37 +08:00
David Monllao
04fadbeda4 Merge branch 'MDL-50890_master' of git://github.com/dmonllao/moodle 2015-09-16 09:10:28 +08:00
David Monllao
6bc490e270 MDL-50890 enrol_flatfile: Correcting typo and return
Would be safer to return nothing, execute methods don't have
a return. I understand this return 2 was inherited from the
previous cron function.
2015-09-16 09:08:34 +08:00
Jun Pataleta
fd1b399527 MDL-50890 enrol_flatfile: Modifications for compliance with standards
Also changed the scheduled task to run every hour.
2015-09-16 09:08:34 +08:00
Troy Williams
a771854c46 MDL-50890 enrol_flatfile: Replace cron processing with scheduled task
Replace enrolment plugin flatfile cron processing with scheduled task
2015-09-16 09:08:34 +08:00
Sam Chaffee
5090d26b3a MDL-50936 Atto: Add upgrade path for updating equations setting 2015-09-16 08:24:26 +08:00
Jason Hardin
4f758d7716 MDL-50936 Atto: Add missing math equation buttons 2015-09-16 08:23:20 +08:00
Eloy Lafuente (stronk7)
a4a972285e Merge branch 'MDL-50685_master' of git://github.com/dmonllao/moodle 2015-09-16 02:15:51 +02:00
Eloy Lafuente (stronk7)
7bf83951f9 Merge branch 'MDL-50930-master' of git://github.com/jleyva/moodle 2015-09-16 02:11:12 +02:00
Eloy Lafuente (stronk7)
11fa8ca760 Merge branch 'MDL-49032' of https://github.com/stronk7/moodle 2015-09-16 01:00:03 +02:00
Eloy Lafuente (stronk7)
6aa00dadc6 MDL-49032 lib/bennu: update readme to document the change 2015-09-16 00:53:45 +02:00
Joby Harding
f66cc72387 MDL-49032 lib/bennu: use HTAB only when folding lines 2015-09-16 00:45:51 +02:00
Eloy Lafuente (stronk7)
a9285cd5d4 Merge branch 'MDL-30157_master' of git://github.com/dmonllao/moodle 2015-09-16 00:19:04 +02:00
Eloy Lafuente (stronk7)
62652cdc63 Merge branch 'MDL-50959-master' of git://github.com/lameze/moodle 2015-09-15 23:36:14 +02:00
Eloy Lafuente (stronk7)
4deecee44f Merge branch 'MDL-50892-master' of git://github.com/marinaglancy/moodle 2015-09-15 23:12:22 +02:00
Eloy Lafuente (stronk7)
a16a3592f2 Merge branch 'MDL-50766_master' of git://github.com/dmonllao/moodle 2015-09-15 23:02:25 +02:00
Eloy Lafuente (stronk7)
3c80f01661 MDL-49942 core_course: bump version 2015-09-15 22:53:45 +02:00
Eloy Lafuente (stronk7)
f536f4a77c Merge branch 'MDL-49942-master' of git://github.com/jleyva/moodle 2015-09-15 22:52:13 +02:00
David Monllao
7a3451bc1a MDL-33564 rss: Fixing missing param type 2015-09-15 17:58:05 +08:00
David Monllao
b3434ca51d Merge branch 'MDL-33564-master' of git://github.com/danpoltawski/moodle
Conflicts:
	lib/upgrade.txt
2015-09-15 17:56:20 +08:00
David Monllao
3bc0824e46 Merge branch 'MDL-51213-master' of git://github.com/damyon/moodle 2015-09-15 17:28:34 +08:00
David Monllao
b3e8e09175 Merge branch 'MDL-50884-master' of git://github.com/lameze/moodle 2015-09-15 17:15:47 +08:00
David Monllao
224d819678 Merge branch 'MDL-50964-master' of git://github.com/jleyva/moodle
Conflicts:
	group/tests/externallib_test.php
	lib/db/services.php
2015-09-15 17:09:33 +08:00
David Monllao
8a08668255 Merge branch 'MDL-50966-master' of git://github.com/jleyva/moodle 2015-09-15 16:58:54 +08:00
David Monllao
d005d71881 MDL-30157 enrol_manual: New option to enrol from now
We set the new now option as the default one, as other enrol
plugins use it as the default enrolment start date. We are keeping
the default to today on upgrades.
2015-09-15 16:25:25 +08:00
David Monllao
32f1e17a01 MDL-30157 enrol_manual: Setting proper default
The wrong default value was working because of count starting from 1.
2015-09-15 16:25:25 +08:00
Andrew Nicols
1c97055b68 Merge branch 'MDL-50983-master' of git://github.com/junpataleta/moodle 2015-09-15 15:25:46 +08:00
Juan Leyva
740c354f17 MDL-49942 core_course: New Web Service core_course_search_courses 2015-09-15 09:18:26 +02:00
David Monllao
366d350412 Merge branch 'MDL-50921-master' of git://github.com/ryanwyllie/moodle 2015-09-15 14:26:57 +08:00
David Monllao
de5dd7c5c5 MDL-51048 backup: Removing unnecessary var 2015-09-15 13:43:45 +08:00
David Monllao
79167d5fa9 Merge branch 'MDL-51048' of git://github.com/timhunt/moodle 2015-09-15 13:40:55 +08:00