mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
83,199 Commits 36 Branches 519 Tags
Commit Graph

83199 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Nicols
640b8efad8 Merge branch 'MDL-57429-master' of https://github.com/snake/moodle 2017-03-20 08:16:07 +08:00
Dan Poltawski
1ea1180a6f Merge branch 'MDL-57648-master' of git://github.com/jleyva/moodle 2017-03-17 08:21:03 +00:00
Juan Leyva
d689c1ed46 MDL-57648 mod_lesson: New Web Service mod_lesson_get_questions_attempts 2017-03-16 16:43:03 +01:00
Dan Poltawski
aed2641a8b Merge branch 'MDL-57645-master' of git://github.com/jleyva/moodle 2017-03-16 15:42:07 +00:00
Juan Leyva
4ac71790b6 MDL-57645 mod_lesson: New Web Service mod_lesson_view_lesson 2017-03-16 16:40:25 +01:00
Juan Leyva
7d7a2a4ef1 MDL-57645 mod_lesson: Refactor code to move completion to lib 
This commit also fix how completion was being set (before the access
restriction checks)
 2017-03-16 16:40:24 +01:00
Dan Poltawski
98c4094eac weekly release 3.3dev 2017-03-16 11:52:46 +00:00
Dan Poltawski
ec673f6f98 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2017-03-16 11:52:44 +00:00
Jake Dallimore
cb2a75dcbf MDL-57429 badges: removal of unused Persona code 
Removed the backpackconnect script used with Persona, and all the
associated js code.
 2017-03-16 09:35:14 +08:00
Jake Dallimore
80e8e0061e MDL-57429 badges: lang string deprecation for new email verify process 
Deprecated those lang strings used in the old Persona login process.
 2017-03-16 09:35:14 +08:00
Jake Dallimore
091eaab0da MDL-57429 badges: add email verification for openbackpack connections 
With the Persona provider now out of commission, no new connections to
the Mozilla openbackpack can be created. This patch adds an email
verification step to core to restore the openbackpack functionality.
 2017-03-16 09:35:12 +08:00
Andrew Nicols
9c2ca40041 Merge branch 'MDL-57643-master' of git://github.com/jleyva/moodle 2017-03-16 07:58:08 +08:00
Andrew Nicols
eb6f04732a Merge branch 'MDL-57913_auth_db_sync_task_master' of git://github.com/gthomas2/moodle 2017-03-16 07:39:48 +08:00
gthomas2
0d9704d817 MDL-57913 auth_db: warn CLI about scheduled task, abort CLI if scheduled task enabled 2017-03-15 16:42:45 +00:00
Juan Leyva
630f0e3bce MDL-57643 mod_lesson: New WS mod_lesson_get_access_information 2017-03-15 11:35:27 +01:00
Juan Leyva
37029e468f MDL-57643 mod_lesson: Refactor, move php code to locallib 2017-03-15 11:35:25 +01:00
Dan Poltawski
943055c72d Merge branch 'MDL-57631_master-disable-cli' of git://github.com/dmonllao/moodle 2017-03-15 08:12:04 +00:00
David Monllao
e93f74f446 MDL-57631 enrol_ldap: Disable CLI script if task is enabled 2017-03-15 08:49:22 +01:00
Andrew Nicols
6fcdbc7912 Merge branch 'MDL-57658-master-integration-fix-2' of git://github.com/junpataleta/moodle 2017-03-15 14:44:17 +08:00
Andrew Nicols
5fba3bd7af Merge branch 'MDL-55528-master-fix' of git://github.com/andrewnicols/moodle 2017-03-15 14:31:49 +08:00
Jun Pataleta
02edbe1e30 MDL-57658 calendar: Remove BYDAY filtering dependence on NumberFormatter 2017-03-15 14:18:27 +08:00
Andrew Nicols
484eeebc48 Merge branch 'MDL-57658-master-integration-fix' of git://github.com/junpataleta/moodle 2017-03-15 11:42:28 +08:00
Jun Pataleta
620ffacea1 MDL-57658 calendar: Set sort order for fetched DB records 2017-03-15 11:18:21 +08:00
Andrew Nicols
ef452d9cbc Merge branch 'MDL-47354_gradereport_singleview_perpage' of git://github.com/davosmith/moodle 2017-03-15 11:17:49 +08:00
Andrew Nicols
ac1c66a0c0 MDL-55528 fileconverter_unoconv: Unit test correction 2017-03-15 10:59:53 +08:00
Andrew Nicols
7f2d58bf06 MDL-55528 fileconverter_unoconv: Move env check langstring to core 
AMOS BEGIN
 MOV [unoconvwarning,fileconverter_unoconv],[unoconvwarning,admin]
AMOS END
 2017-03-15 09:15:34 +08:00
Eloy Lafuente (stronk7)
0dc0281cc2 Merge branch 'MDL-57066-master' of git://github.com/junpataleta/moodle 2017-03-15 01:17:19 +01:00
Eloy Lafuente (stronk7)
fc31b06a28 Merge branch 'm33_MDL-58027_Restore_Missing_HTMLEntities_Call' of https://github.com/scara/moodle 2017-03-15 00:37:02 +01:00
Dan Poltawski
edf102805a Merge branch 'MDL-58023_behat_find_node_in_navigation_improvement_master' of https://github.com/gthomas2/moodle 2017-03-14 16:31:05 +00:00
Dan Poltawski
bcd510e36d Merge branch 'MDL-57658-master-3' of git://github.com/junpataleta/moodle 2017-03-14 16:06:19 +00:00
AMOS bot
4cd229238c Automatically generated installer lang files 2017-03-15 00:04:32 +08:00
Juan Leyva
1f7734931f MDL-50538 mod_feedback: New WS mod_feedback_get_feedbacks_by_courses 2017-03-14 15:54:26 +01:00
Dan Poltawski
732bd13171 Merge branch 'MDL-55528-master' of git://github.com/andrewnicols/moodle 2017-03-14 12:07:33 +00:00
David Monllao
f7c7799cbf Merge branch 'MDL-57631_ldap_enrol_sync_task_master' of https://github.com/gthomas2/moodle 2017-03-14 11:27:27 +01:00
David Monllao
291767fbfe Merge branch 'MDL-58114-master-excparams' of git://github.com/mudrd8mz/moodle 2017-03-14 11:27:26 +01:00
David Monllao
f17fc9dba7 MDL-58109 report_security: Remove empty line 2017-03-14 11:27:26 +01:00
David Monllao
f41bbf8e93 Merge branch 'MDL-58109-preventexecpath-check' of https://github.com/brendanheywood/moodle 2017-03-14 11:27:25 +01:00
Dan Poltawski
1a22d8d572 Merge branch 'wip-mdl-58169' of https://github.com/rajeshtaneja/moodle 2017-03-14 11:27:24 +01:00
Andrew Nicols
594ada13c2 Merge branch 'MDL-57751-master' of https://github.com/xow/moodle 2017-03-14 11:27:24 +01:00
Andrew Nicols
ada10e7c18 Merge branch 'MDL-57583-master' of https://github.com/snake/moodle 2017-03-14 11:27:23 +01:00
Andrew Nicols
224853595c Merge branch 'MDL-58217-master' of git://github.com/jleyva/moodle 2017-03-14 11:27:22 +01:00
Andrew Nicols
0c6435838a Merge branch 'wip-mdl-58250' of https://github.com/rajeshtaneja/moodle 2017-03-14 11:27:22 +01:00
Eloy Lafuente (stronk7)
501ed0c46d Merge branch 'MDL-57915-master' of git://github.com/jleyva/moodle 2017-03-14 11:26:55 +01:00
Rajesh Taneja
dba39da081 MDL-58169 phpunit: Clear opcode cache before checking file 
In unit test, we write cache file often and
opcache might fail to detect changes. It will
be nice to invalidate opcode cache to ensure
we have the correct file_exists status
 2017-03-14 13:30:24 +08:00
Rajesh Taneja
337eaa2b55 MDL-58250 behat: Status should be new exit code 
Oring should not be done with old status,
as it will always return failure.
 2017-03-14 07:31:37 +08:00
Matteo Scaramuccia
bf4f857acf MDL-58027 files: Restored missing htmlentities() call 2017-03-13 22:24:33 +01:00
Juan Leyva
9fac7c8640 MDL-57915 mod_data: New Web Service mod_data_view_database 2017-03-13 19:21:08 +01:00
Juan Leyva
023ffa656d MDL-57915 mod_data: Move view completion and event code to function 2017-03-13 19:21:07 +01:00
AMOS bot
e315200ca5 Automatically generated installer lang files 2017-03-14 00:04:26 +08:00
gthomas2
01f2a530b7 MDL-58023 behat: Improve find_node_in_navigation function 2017-03-13 11:41:23 +00:00