mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-26 02:22:51 +01:00
Code Issues Projects Releases Wiki Activity
82,698 Commits 36 Branches 527 Tags
Commit Graph

4728 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
6214e08f6a Merge branch 'MDL-57629-master' of git://github.com/jleyva/moodle 2017-01-17 20:55:05 +01:00
Juan Leyva
9db43c7341 MDL-57629 webservice: Fix external functions phpdoc 
Replace external_external_function_parameters with
external_function_parameters
 2017-01-11 16:56:25 +01:00
Eloy Lafuente (stronk7)
777361983c Merge branch 'wip-mdl-56519-m' of https://github.com/rajeshtaneja/moodle 2017-01-11 02:42:29 +01:00
Dan Poltawski
38425d9fee Merge branch 'MDL-57480-master' of https://github.com/snake/moodle 2017-01-10 08:40:10 +00:00
Jake Dallimore
865c4f5df9 MDL-57480 core_course: make drag and drop fire a dom updated event 
When adding media via drag and drop, the notifyFilterContentUpdated
event should be called after the item is added to the DOM. This allows
things like videojs for example, to process the new content.
 2017-01-10 07:42:52 +08:00
David Monllao
461d6d390c Merge branch 'MDL-57392-master' of git://github.com/jleyva/moodle 2017-01-09 13:40:14 +01:00
David Monllao
2e87e3ce90 Merge branch 'wip-mdl-55042' of https://github.com/rajeshtaneja/moodle 2017-01-09 12:54:16 +01:00
Rajesh Taneja
57bee542ab
MDL-56519 behat: Fixed lint errors 2017-01-03 09:12:54 +08:00
Rajesh Taneja
d15a44d6fb
MDL-55042 phpunit: Get sorted sections 
Sometimes db doesn't return records in order
So enusre it is in order so that last record
doesn't have section equal 0. As section 0
can't be deleted.
 2017-01-03 06:52:03 +08:00
Dan Poltawski
589449b81e Merge branch 'MDL-57080-m' of https://github.com/micaherne/moodle 2017-01-02 12:15:01 +00:00
Dan Poltawski
6dbe175454 Merge branch 'MDL-57395-master' of git://github.com/jleyva/moodle 2017-01-02 11:46:44 +00:00
Pau Ferrer Ocaña
7180cdc7b5 MDL-57512 categories: Use maxcategorydepth only when getting all cats 2016-12-29 11:30:57 +01:00
Juan Leyva
879a8f56c9 MDL-57395 course: New Web Service core_course_get_updates_since 2016-12-28 11:24:40 +01:00
Juan Leyva
e45fc71e2a MDL-57392 course: Return course filters status via WS 
Return active filters in core_course_get_courses_by_field
 2016-12-27 09:31:29 +01:00
Michael Aherne
1afea82da0 MDL-57080 completion: Update completion expected date on reset 2016-12-22 11:37:51 +00:00
Eloy Lafuente (stronk7)
bd31523a30 Merge branch 'MDL-55720' of https://github.com/ak4t0sh/moodle 2016-12-13 11:41:35 +01:00
Dan Poltawski
2956ca50fa Merge branch 'MDL-57250_master' of git://github.com/markn86/moodle 2016-12-13 10:25:07 +00:00
Dan Poltawski
5eeb5e89a9 Merge branch 'MDL-57198' of git://github.com/phager-at/moodle 2016-12-12 12:46:39 +00:00
Mark Nelson
f04dda1071 MDL-57250 core: show admin settings when only one category exists 2016-12-09 13:41:34 +08:00
Philipp Hager
29df1cade1 MDL-57198 course: add css-classes to restrictbygroup-button 2016-12-08 13:24:18 +01:00
Marina Glancy
c0ad000f46 MDL-56614 behat: corrections to new steps 2016-12-07 13:37:49 +08:00
Rajesh Taneja
9bad658aaf
MDL-56614 behat: Fixed steps to use new definition 2016-12-07 07:10:35 +08:00
Andrew Nicols
7586a36022 Merge branch 'MDL-56301-master' of https://github.com/snake/moodle 2016-12-06 14:10:40 +08:00
Andrew Nicols
5b67c9ecd1 Merge branch 'wip-MDL-56614-master-2' of https://github.com/marinaglancy/moodle 2016-12-06 13:37:33 +08:00
Marina Glancy
7a12a02dc7 MDL-56614 behat: add navigation block when required 
Most of these hacks have links to corresponding MDL issues
 2016-12-06 11:49:14 +08:00
Marina Glancy
e5287f9b3b MDL-56614 behat: navigate without navigation and admin blocks 2016-12-06 11:49:14 +08:00
Marina Glancy
ebcff7e256 MDL-56614 behat: new steps for navigation without blocks 2016-12-06 11:49:11 +08:00
Donald Barrett
4fc74fe587 MDL-56301 course: Use value for intro field if set in a mods function 
Respects a module that has set a value for the db field intro in it's lib function modulename_add_instance.
 2016-12-06 10:34:38 +08:00
Dan Poltawski
d68562bdb9 Merge branch 'MDL-57256-master-legacylink' of git://github.com/mudrd8mz/moodle 2016-12-05 15:45:31 +00:00
David Mudrák
17a23673a9 MDL-57256 course: Fix display of the Legacy course files link 
The patch fixes the classical operator precedence bug.
 2016-12-02 14:10:06 +01:00
David Monllao
c5a5f26ce2 Merge branch 'MDL-57090-master' of git://github.com/ankitagarwal/moodle 2016-11-30 10:43:16 +08:00
Eloy Lafuente (stronk7)
04649747a4 MDL-57197 versions: bump all versions and requires near release 
version = 2016120500 release version
requires= 2016112900 current rc4 version
 2016-11-29 22:57:05 +01:00
Rajesh Taneja
8392a86068
MDL-57168 behat: Check for button not text 2016-11-29 07:36:43 +08:00
Ankit Agarwal
3d1be67752 MDL-57090 hubs: Replace smart select with searchableselect 2016-11-28 12:22:25 +05:30
Rajesh Taneja
d442a3169c
MDL-57168 behat: Return link is the existing category 2016-11-28 12:57:56 +08:00
Marina Glancy
392367c4f7 MDL-56586 behat: fix behat tests to work with new add block 2016-11-25 14:04:10 +08:00
Dan Poltawski
304e8a8d0c Merge branch 'wip-MDL-56586-master-2' of git://github.com/marinaglancy/moodle 2016-11-24 09:30:29 +00:00
David Monllao
4de871f4ca Merge branch 'MDL-57001-master' of git://github.com/damyon/moodle 2016-11-24 15:29:04 +08:00
Damyon Wiese
8c224317ee MDL-57001 switchroles: Add a cancel link to the page. 2016-11-24 15:11:19 +08:00
Damyon Wiese
70b03eff02 MDL-57001 switchroles: Move to user menu 
Take this out of the navigation and force it in the user menu.
 2016-11-24 15:11:19 +08:00
Marina Glancy
b1e5624ad9 MDL-56586 blocks: Fix mess with links to permissions 
problem 1: links to blocks permissions changes were missing in boost
problem 2: when modifying link from dashboard user is returned to profile ('returnurl' passed but not respected)
problem 3: link to check permissions missing from category management page
fix: instead of respecting both 'return' and 'returnurl' parameter use only 'returnurl'
fix: use 'popup' layout when modifying permissions for a block
 2016-11-24 14:24:59 +08:00
Dan Poltawski
203f51d627 MDL-57064 tests: update externallib test 2016-11-23 13:00:29 +00:00
Dan Poltawski
9f82774a8b Merge branch 'MDL-57064-master' of git://github.com/FMCorz/moodle 2016-11-23 12:46:18 +00:00
Cameron Ball
1b367ac6e8
MDL-57112 blocks: Add back social_activities block for social courses. 
Courses in the social format are difficult to use. This patch
simply adds back the social activities block to the social
course format.
 2016-11-23 16:06:37 +08:00
Frederic Massart
84979ab793
MDL-57064 course: Return all properties when getting navigation options 2016-11-22 12:58:52 +08:00
Dan Poltawski
f7d76254fd Merge branch 'MDL-56994-master-2' of git://github.com/junpataleta/moodle 2016-11-21 07:30:58 +00:00
Jun Pataleta
e47d61e198 MDL-56994 course: Show News field only if course format supports news 2016-11-21 10:05:01 +08:00
Jun Pataleta
87799e9fba MDL-56994 course: New method to check if format supports news forum 2016-11-21 09:50:55 +08:00
David Monllao
30cfed3731 Merge branch 'MDL-57052-master' of git://github.com/jleyva/moodle 2016-11-21 09:47:51 +08:00
David Monllao
406f1eb76d Merge branch 'MDL-57051-master' of git://github.com/jleyva/moodle 2016-11-21 09:45:44 +08:00