mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-16 13:40:15 +01:00
Code Issues Projects Releases Wiki Activity
74,537 Commits 36 Branches 527 Tags
Commit Graph

20559 Commits

Author SHA1 Message Date
Juan Leyva
6b5e69ebe6 MDL-50557 mod_scorm: New WS mod_scorm_get_scorm_sco_tracks 2015-09-16 23:18:39 +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
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
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)
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)
4deecee44f Merge branch 'MDL-50892-master' of git://github.com/marinaglancy/moodle 2015-09-15 23:12:22 +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
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
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
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
Damyon Wiese
4093d64332 MDL-50783 ajax: Default for ajax calls to requirelogin=true 2015-09-15 13:01:30 +08:00
Andrew Nicols
52eaa0ceda Merge branch 'MDL-50982-master' of git://github.com/junpataleta/moodle 2015-09-15 11:01:50 +08:00
Andrew Nicols
0b90eb6155 Merge branch 'MDL-50981-master' of git://github.com/junpataleta/moodle 2015-09-15 08:33:06 +08:00
Andrew Nicols
5a191b2f44 Merge branch 'MDL-51017-master' of git://github.com/jleyva/moodle 2015-09-15 08:23:10 +08:00
Juan Leyva
22de67f4af MDL-51017 mod_scorm: New WS mod_scorm_get_scorm_attempt_count 2015-09-14 10:55:52 +02:00
Andrew Nicols
ac43dc23e4 Merge branch 'MDL-50783-master' of git://github.com/damyon/moodle 2015-09-14 15:52:42 +08:00
Andrew Nicols
08a4dbfe10 Merge branch 'MDL-50994-master' of git://github.com/jleyva/moodle 2015-09-14 15:40:05 +08:00
Damyon Wiese
88982b71b2 MDL-50783 ajax: Properly deprecate the is_allowed_from_ajax() methods. 2015-09-14 15:10:40 +08:00
Damyon Wiese
ad348cbdf9 MDL-50783 ajax: Add specific check for NO_MOODLE_COOKIES 
If loginrequired is set for a webservice - NO_MOODLE_COOKIES cannot
be true - or it is a coding error.
 2015-09-14 15:10:39 +08:00
Damyon Wiese
ba224fb42c MDL-50783 Ajax: Configure how to call a webservice through db/service.php 
Now the db/service.php array can contain these extra keys to provide information
on how a webservice may be called:

    'ajax' => true (Default is false)

Replaces the xx_is_allowed_from_ajax callback.

    'loginrequired' => false (Default is true)

Means that this webservice can be called through lib/ajax/service-nosession.php
which sets NO_MOODLE_COOKIES to true (faster). This is only safe for webservices returning
static public data (e.g. get_string).
 2015-09-14 15:10:21 +08:00
Andrew Nicols
2cf588d4dc Merge branch 'MDL-50980-master' of git://github.com/junpataleta/moodle 2015-09-14 15:07:31 +08:00
David Monllao
09fe55f4de Merge branch 'MDL-51170-master' of git://github.com/andrewnicols/moodle 2015-09-14 14:14:09 +08:00
Andrew Nicols
9608bed133 Merge branch 'MDL-50782-master' of git://github.com/damyon/moodle 2015-09-14 14:00:52 +08:00
Mark Nelson
53914e4465 MDL-51051 core_grades: 'Categories and items' => 'Gradebook setup' 2015-09-14 08:23:32 +08:00
Juan Leyva
7ab43ac84a MDL-50994 mod_forum: New Web Service mod_forum_add_discussion 2015-09-11 13:31:36 +02:00
Juan Leyva
23b398fc81 MDL-50930 completion: New WS core_completion_mark_course_self_completed 2015-09-11 11:31:12 +02:00
Juan Leyva
c0ef63eb38 MDL-50964 core_group: New Web Service core_group_get_activity_groupmode 2015-09-11 11:30:28 +02:00
Juan Leyva
7107c2f066 MDL-50966 core_group: New WS core_group_get_activity_allowed_groups 2015-09-11 11:29:38 +02:00
Jetha Chan
ec887caa4a MDL-50685 core_form: disable hidden options, don't just hide 2015-09-11 15:08:37 +08:00
Marina Glancy
278b8d18a2 MDL-50892 mod: allow activity to have name '0' 2015-09-11 10:51:52 +08:00
Jun Pataleta
e950bca42d MDL-50983 templates: Create core template "columns-autoflow-1to1to1" 2015-09-11 10:32:02 +08:00
Jun Pataleta
2947d0397a MDL-50982 templates: Create core template "columns-1to1to1" 2015-09-11 10:19:00 +08:00
Jun Pataleta
631cc14020 MDL-50981 templates: Create core template "columns-1to2" 2015-09-11 10:08:41 +08:00
Jun Pataleta
a317a83b5c MDL-50980 templates: Create core template "columns-2to1" 2015-09-11 10:03:38 +08:00
rajesh Taneja
cd3a6a78b6 MDL-50516 behat: Back/next button reloads page 
When next/back button is pressed in phantomjs/browserkit
it reload page, so adding a bug_phantomjs, so that we can
test the lesson re-attempt scenario
 2015-09-10 14:30:28 +08:00
Damyon Wiese
08bda175de MDL-51213 weblib: Allow filter=false option for format_string 
And pass this from external_format_string correctly.
 2015-09-10 12:55:52 +08:00
Damyon Wiese
3676873566 MDL-51213 webservice: Fix wrong use of external_format_text 
Was passing cm->id instead of context->id.
 2015-09-10 12:13:02 +08:00