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
77,310 Commits 36 Branches 519 Tags
Commit Graph

77310 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Simey Lameze
dfc7c0a9df MDL-53519 auth_cas: update cas to version 1.3.4 2016-03-21 13:16:03 +08:00
Eloy Lafuente (stronk7)
e8952c5951 weekly release 3.1dev 2016-03-10 13:30:56 +01:00
Eloy Lafuente (stronk7)
cdd89b0ceb Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2016-03-10 13:30:51 +01:00
Rajesh Taneja
d2ee22e744 MDL-27628 behat: Added delay to ensure the value is set. 
After user type there is a 400ms delay, then search
Adding 2 sec delay to ensure search is finished before
click event is triggred
 2016-03-10 13:17:11 +01:00
Mark Nelson
9621d5a7ae MDL-52252 core_course: removed unused variables 
The call to 'context_coursecat::instance($COURSE->category);'
was causing Moodle to throw an exception due to non-existent
category.
 2016-03-10 13:17:11 +01:00
Damyon Wiese
6b04655573 MDL-27628 enrol_meta: Set options to exclude existing courses, and the current course 
When adding a new meta enrolment, you should not be able to select the current course,
or any courses with an existing meta link.
 2016-03-10 13:17:10 +01:00
Eloy Lafuente (stronk7)
fac004e28b MDL-51167 tool_monitor: fix too strict condition & minor cleanup 2016-03-10 13:17:10 +01:00
Eloy Lafuente (stronk7)
7e9b046a50 Merge branch 'MDL-53369' of git://github.com/timhunt/moodle 2016-03-10 13:17:09 +01:00
Simey Lameze
ce59760476 MDL-50705 auth_db: apply standard cleaning to all fields 
Also unit tests were added to cover the new clean_data() method.
 2016-03-10 13:17:08 +01:00
Simey Lameze
dccf9ca308 MDL-50705 core_user: introduce new fill_properties_cache() 
Also the get_property_definition() was created to get the property without retrieve the whole definition cache and
    unit tests were created to tests those new methods.
 2016-03-10 13:17:08 +01:00
David Monllao
fb0b522035 Merge branch 'MDL-27628-master' of git://github.com/damyon/moodle 2016-03-10 13:17:07 +01:00
David Monllao
9fff0c469f MDL-52252 tags: Bump version to add course_modules area 2016-03-09 15:36:30 +08:00
David Monllao
b8bc9037f1 Merge branch 'wip-MDL-52252-master' of https://github.com/marinaglancy/moodle 2016-03-09 15:35:16 +08:00
Marina Glancy
1ea2f7d650 MDL-52252 tags: course module tags small correction 2016-03-09 15:33:25 +08:00
David Monllao
9de085c6fc MDL-52786 quiz: Adding mod_quiz_get_combined_review_options to mobile service 2016-03-09 15:29:41 +08:00
David Monllao
da51a9be95 Merge branch 'MDL-52786-master' of git://github.com/jleyva/moodle 
Conflicts:
	lib/db/services.php
 2016-03-09 15:29:02 +08:00
David Monllao
ba8afbdb07 MDL-52785 quiz: Adding mod_quiz_get_user_best_grade to mobile service 2016-03-09 15:18:11 +08:00
David Monllao
20097a057d Merge branch 'MDL-52785-master' of git://github.com/jleyva/moodle 
Conflicts:
	lib/db/services.php
 2016-03-09 15:16:48 +08:00
David Monllao
5ca1a77649 MDL-52670 quiz: Adding function to mobile service 2016-03-09 15:12:10 +08:00
David Monllao
9b701a37e4 Merge branch 'MDL-52670-master' of git://github.com/jleyva/moodle 
Conflicts:
	lib/db/services.php
 2016-03-09 15:10:54 +08:00
David Monllao
11bad2b099 Merge branch 'MDL-51324-master' of git://github.com/damyon/moodle 2016-03-09 14:20:18 +08:00
Nadav Kavalerchik
dffcf46f43 MDL-52252 Tags: Add tags to modules (Resources and Activities) 2016-03-09 14:19:47 +08:00
Andrew Nicols
d84a657dda MDL-53273 search: Whitespace fix 2016-03-09 14:14:33 +08:00
Andrew Nicols
02726a29cc Merge branch 'MDL-53273-master' of git://github.com/merrill-oakland/moodle 2016-03-09 14:11:17 +08:00
Andrew Nicols
0809a0ea02 Merge branch 'MDL-53247_fix' of git://github.com/dmonllao/moodle 2016-03-09 14:05:00 +08:00
David Monllao
ee72a4dbf3 MDL-53247 search: Require search to be available before running indexer script 2016-03-09 13:37:33 +08:00
Damyon Wiese
6f326bd204 MDL-27628 enrol_meta: Use new multi-course selector 
Allows adding multiple instances of the meta enrol plugin at once.

I had to add support to the autocomplete element for filling the field from behat
when it was not using tags. I also had to make the shortnames more easily searchable
and unique in the behat feature file.
 2016-03-09 13:32:08 +08:00
Damyon Wiese
3e66b0fccd MDL-51324 coursecat: Add to search courses unit test 
Cover new option "requiredcapabilities".
 2016-03-09 13:30:28 +08:00
Damyon Wiese
91ab264cf5 MDL-51324 forms: fix autocomplete element double selection bug 
Incorrect types were preventing the currently selected values from
being removed from the new values returned via ajax.

Also fix a selection bug with autocomplete+ajax+singleselect.
 2016-03-09 13:30:27 +08:00
Damyon Wiese
235ef57a3d MDL-51324 forms: Add a new course selector 
This is a squashed commit containing a number of changes:

This is an ajax driven course selector that has searching etc. It can select single, or multiple courses.
Make course selector accept a list of courses to exclude
courseselector - lookup coursename on setValue
Use the get_course_display_name_in_list function to generate the course names
Add a throttle to auto-complete to reduce spamming the server
Do a single query to fetch all the courses in the mform element when validation fails
Fix core course search function to return results when there are less than 2 chars in the query.
Handle setData with an empty array in new course selector
 2016-03-09 13:30:18 +08:00
Eric Merrill
9502c7f539 MDL-53281 search: Properly set timeout, and don't wait for optimize 2016-03-09 13:30:18 +08:00
Dan Poltawski
be8b6b489a MDL-53327 search: add missing pluginfo lang strings 
AMOS BEGIN
 CPY [searchengine,admin],[type_search,plugin]
AMOS END
 2016-03-09 13:30:18 +08:00
Andrew Nicols
f758ad33e4 MDL-49897 calendar: mktime => usergetmidnight 2016-03-09 13:18:09 +08:00
Andrew Nicols
233b677bd4 MDL-51571 lti: Whitespace fixes 2016-03-09 12:05:08 +08:00
Andrew Nicols
b80343e223 Merge branch 'MDL-51571_ltiErrorHandler' of https://github.com/moodlerooms/moodle 2016-03-09 11:11:32 +08:00
Andrew Nicols
4f9303c443 Merge branch 'MDL-53271-master' of git://github.com/merrill-oakland/moodle 2016-03-09 11:05:44 +08:00
David Monllao
c17e0034a1 Merge branch 'MDL-50032-master' of git://github.com/jleyva/moodle 2016-03-09 10:55:18 +08:00
Andrew Nicols
bd2e5ef17d Merge branch 'MDL-53325-master' of git://github.com/merrill-oakland/moodle 2016-03-09 10:06:47 +08:00
Andrew Nicols
020d27a733 Merge branch 'MDL-53281-master' of git://github.com/merrill-oakland/moodle 2016-03-09 09:25:07 +08:00
Andrew Nicols
65e7fee267 Merge branch 'MDL-53327-master' of git://github.com/danpoltawski/moodle 2016-03-09 08:48:44 +08:00
Andrew Nicols
f4b6081ebf Merge branch 'MDL-52522-master' of git://github.com/cameron1729/moodle 2016-03-09 08:35:14 +08:00
Simey Lameze
85984545a9 MDL-53031 mod_assign: add session check on assignment plugins management 2016-03-08 19:46:07 +01:00
AMOS bot
416dcf62b1 Automatically generated installer lang files 2016-03-09 00:04:02 +08:00
Jun Pataleta
8e24a54e52 MDL-52433 user: Remove unnecessary capability check 2016-03-08 12:23:44 +01:00
Cameron Ball
fa8e27b32b MDL-52522 grades: Add rescale grades option for grade categories. 
When a grade category is overridden, it starts to behave like a regular grade item.
Therefore we need similar behaviour to what was implemented in MDL-48634.
 2016-03-08 16:26:44 +08:00
David Monllao
406151d8e2 Merge branch 'wip-mdl-53300' of https://github.com/rajeshtaneja/moodle 2016-03-08 16:13:42 +08:00
David Monllao
d94df7afa8 MDL-41648 gradingforms: Remove unnecessary attr 2016-03-08 15:32:19 +08:00
David Monllao
f084c4b231 Merge branch 'wip-MDL-41648' of https://github.com/dg711/moodle 2016-03-08 15:32:17 +08:00
Andrew Nicols
540394e1db Merge branch 'MDL-49897' of https://github.com/rushi963/moodle 2016-03-08 15:05:50 +08:00
David Monllao
3f5c6ff2de Merge branch 'MDL-50218-master' of https://github.com/xow/moodle 2016-03-08 14:39:54 +08:00