mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-07-25 08:11:39 +02:00
Code Issues Projects Releases Wiki Activity
79,654 Commits 37 Branches 540 Tags
a9b1af901b1acf032b9daa1c7b79b225a11f544b
Commit Graph

4598 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
8c7840df32 Merge branch 'MDL-54941-master' of git://github.com/jleyva/moodle 2016-08-03 00:29:45 +02:00
David Monllao
2a36babbc8 MDL-55357 search: Contents include UTF8 characters, adding u modifier 2016-07-29 14:36:17 +08:00
Juan Leyva
145900708c MDL-54941 webservice: Refactor file handling in WS 
This commit reduces boilerplate code.
It also forces WS returning files to always return the following
fields: filename, filepath, mimetype, filesize, timemodified and
fileurl.
 2016-07-28 12:07:04 +02:00
Eloy Lafuente (stronk7)
ddf1d5c692 Merge branch 'MDL-55244-master' of git://github.com/danpoltawski/moodle 2016-07-27 00:19:40 +02:00
Eloy Lafuente (stronk7)
7647f3887f Merge branch 'MDL-54801-master' of git://github.com/jleyva/moodle 2016-07-26 19:54:53 +02:00
Dan Poltawski
773a11519d Merge branch 'MDL-55278_master' of https://github.com/dmonllao/moodle 2016-07-26 11:57:09 +01:00
David Monllao
837cec00f9 Merge branch 'wip-mdl-55091-m' of https://github.com/rajeshtaneja/moodle 
Conflicts:
	lib/upgrade.txt
 2016-07-26 10:14:30 +08:00
Rajesh Taneja
52f3e060e4 MDL-55091 phpunit: Following has been deprecated. 
1. getMock()
2. setExpectedException()
3. checkForUnintentionallyCoveredCode renamed to beStrictAboutCoversAnnotation
4. beStrictAboutTestSize renamed to enforceTimeLimit
5. UnitTestCase class is now fully removed.
 2016-07-26 10:11:30 +08:00
Dan Poltawski
3a0bc0fdc4 MDL-55244 js: build changes 
There should be no changes to minified code
 2016-07-25 07:58:05 +01:00
Dan Poltawski
bc8b6dc652 MDL-55244 js: fix various lint warnings in yui 
* Incorrect brace style
* Empty functions
* Multiple var statemnts
 2016-07-25 07:53:05 +01:00
Dan Poltawski
5bb4f444de MDL-55244 js: fix problems with eslint --fix 
eslint --fix '**/yui/src/**/*.js'
 2016-07-25 07:53:05 +01:00
Stephen Bourget
12306a9f0f MDL-55254 mod_data: Add view permissions 2016-07-24 21:00:57 -04:00
David Monllao
0bd8383a8b MDL-55278 search: Updating references to area namespace 2016-07-21 18:38:18 +02:00
Dan Poltawski
ff0039689b Merge branch 'MDL-31356_master' of https://github.com/StudiUM/moodle 2016-07-19 13:01:34 +01:00
David Monllao
b3b1833097 Merge branch 'MDL-54943-master' of git://github.com/jleyva/moodle 
Conflicts:
	version.php
 2016-07-19 01:19:13 +02:00
Serge Gauthier
cc6b92483a MDL-31356 enrol_imsenterprise: Continue development for added features 
* Add the possibility to make it works as before (with categrory name or idnumber).
    * Add possibility to specify nested categories by name or idnumber.
    * Fix error in core_course_courselib_testcase::test_course_created_event because dependency with imsenterprise
 2016-07-14 09:36:03 -04:00
Juan Leyva
c1da311ad6 MDL-54801 webservice: Support 'ids' search in get_categories 2016-07-12 15:41:32 +01:00
Eloy Lafuente (stronk7)
cf7dc57a91 Merge branch 'MDL-54944-master' of git://github.com/danpoltawski/moodle 2016-07-11 16:50:51 +02:00
Dan Poltawski
64ec975e19 Merge branch 'MDL-55082-master' of git://github.com/merrill-oakland/moodle 2016-07-11 15:20:48 +01:00
Dan Poltawski
7d650df727 Merge branch 'MDL-55128-master' of git://github.com/jleyva/moodle 2016-07-11 13:33:23 +01:00
Dan Poltawski
ad3f8cd18c MDL-54944 eslint: make the .eslintrc default stricter 
Instead of using the more rollup-tolerant config for all files, make the
configuration stricter by default but lower in grunt for yui modules.

This means that manual runs (prechecker) or editor integrations will
flag up the errors as well as grunt.

Also add ignore lines to the core files so that eslint isn't noisy when
not running with grunt.
 2016-07-11 12:44:34 +01:00
Eloy Lafuente (stronk7)
ed2d12a125 Merge branch 'MDL-54955-master' of git://github.com/jleyva/moodle 2016-07-05 21:15:31 +02:00
Eloy Lafuente (stronk7)
e51f7a6a20 Merge branch 'MDL-49244-master' of git://github.com/jleyva/moodle 2016-07-05 20:16:44 +02:00
Juan Leyva
8908432fab MDL-55128 course: Fix param type for shortname 2016-07-05 09:50:32 +01:00
Juan Leyva
7c4e686f94 MDL-54943 webservice: New WS core_course_get_activities_overview 2016-07-05 09:10:13 +01:00
Juan Leyva
6a1131e2c2 MDL-55019 webservice: Course summary text should not be cleaned 2016-07-04 14:51:14 +01:00
Eric Merrill
55b62370aa MDL-55082 search: Update core areas to return results in time ASC order 2016-06-30 11:11:35 -04:00
Juan Leyva
b8b1be1554 MDL-49244 course: Clean parameters in core_course_get_categories 2016-06-30 13:26:54 +01:00
Juan Leyva
9df9f1f096 MDL-54104 webservice: Return section number in WS get_course_contents 2016-06-24 13:55:04 +01:00
Rajesh Taneja
f34ab57411 MDL-53399 behat: Activity chooser link is removed. 2016-06-22 09:07:31 +08:00
Rajesh Taneja
f0be6b892e MDL-54940 behat: No need to press save 
Previous step press save button, so no need to press again
 2016-06-21 18:53:03 +08:00
Andrew Nicols
0871afcd5f Merge branch 'MDL-54940-master' of https://github.com/LukeCarrier/moodle 2016-06-21 11:53:05 +08:00
Andrew Nicols
c6d20e61e3 Merge branch 'wip-MDL-53399' of https://github.com/JoeyAndres/moodle 2016-06-21 09:03:48 +08:00
Andrew Nicols
da871bb4c1 Merge branch 'wip-MDL-53292-master' of https://github.com/marinaglancy/moodle 2016-06-21 08:46:38 +08:00
Eloy Lafuente (stronk7)
795150c550 Merge branch 'MDL-37554-master-test' of git://github.com/cameron1729/moodle 2016-06-21 00:03:45 +02:00
Juan Leyva
d889b58747 MDL-54955 webservice: Apply external_format_string in course names 2016-06-20 13:16:52 +01:00
Andrew Nicols
0256b7a620 Merge branch 'MDL-51163-master' of git://github.com/cameron1729/moodle 2016-06-20 11:09:47 +08:00
Luke Carrier
a48f2d3d90 MDL-54940 behat: use the fixed step 2016-06-19 17:22:17 +01:00
Luke Carrier
3ceaea2638 MDL-54940 behat: rectify section edit regression in MDL-53381 2016-06-19 17:11:31 +01:00
Andrew Nicols
d91b6854e9 Merge branch 'MDL-45762-master' of https://github.com/xow/moodle 2016-06-16 09:04:16 +01:00
Dan Poltawski
0fd08fc7e5 Merge branch 'MDL-35628' of https://github.com/mr-russ/moodle 2016-06-16 09:04:12 +01:00
Andrew Nicols
45a0932a9e Merge branch 'MDL-54797' of git://github.com/aolley/moodle 2016-06-16 09:04:07 +01:00
Guy Thomas
8e61e0f9b9 MDL-45762 course: Error when accessing a conditionally hidden section 
Show a nice error when the user accidentally views a section
that is conditionally hidden.  Otherwise, continue to show
original error when section is just hidden to them.
 2016-06-15 09:53:35 +08:00
Marina Glancy
8fef061da4 MDL-53292 core: deprecate callback delete_course 2016-06-13 10:48:06 +08:00
Cameron Ball
3f897b1966 MDL-51163 course: Remove course/category.php 2016-06-13 10:24:15 +08:00
eWallah
6ae9dbc2aa MDL-37554 activities select all option 2016-06-13 10:22:16 +08:00
Dan Poltawski
834f1b66d4 MDL-54890 course: remove erranous duplicated switch label 
Detected by eslint rule 'no-duplicate-case'
 2016-06-10 10:06:28 +01:00
Russell Smith
1fcf0ca8a5 MDL-35628 performance: Remove dirname() where possible. 
dirname() is a slow function compared with __DIR__ and using
'/../'.  Moodle has a large number of legacy files that are included
each time a page loads and is not able to use an autoloader as it is
functional code.  This allows those required includes to perform as
best as possible in this situation.
 2016-06-10 08:06:49 +10:00
Dan Poltawski
015b4d22a2 Merge branch 'MDL-54820-master' of git://github.com/jleyva/moodle 2016-06-06 14:09:59 +01:00
Juan Leyva
72ac2aacfa MDL-54820 webservice: Fix regression in core_course_search_courses 
Regression caused by MDL-51324
 2016-06-03 12:56:11 +02:00