75370 Commits

Author SHA1 Message Date
Cameron Ball
fdb5d62660 MDL-49973 behat: Update delete button names 2015-09-14 17:46:35 +08:00
Andrew Davis
6537778044 MDL-49973 changed continue to delete on delete confirmations 2015-09-14 17:40:34 +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
David Monllao
742548e251 Merge branch 'wip-mdl-51101' of git://github.com/rajeshtaneja/moodle 2015-09-14 16:18:01 +08:00
Simey Lameze
eb8010351c MDL-50207 block_activity_results: css styling on activity results block
This commit fixes minor styling issues on the activity results block and also add RTL css.
2015-09-14 16:03:40 +08: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
7267daa8d0 MDL-50994 mod_forum: Correct docs for discussion WS 2015-09-14 15:43:26 +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
David Monllao
10fea1efb1 Merge branch 'MDL-51191-master' of git://github.com/StudiUM/moodle 2015-09-14 13:58:55 +08:00
David Monllao
1cb33c66ef Merge branch 'MDL-51205_pix_style' of git://github.com/andyjdavis/moodle 2015-09-14 13:31:06 +08:00
David Monllao
8de4e68e0e Merge branch 'MDL-51296-master' of git://github.com/junpataleta/moodle 2015-09-14 13:16:52 +08:00
David Monllao
14face570f Merge branch 'MDL-51253_forum_urls' of git://github.com/BenKelada/moodle 2015-09-14 13:06:38 +08:00
Ben Kelada
3d8d8a8ca6 MDL-51253 forum: fix urls for exceptions and redirects 2015-09-14 14:18:50 +10:00
Jun Pataleta
0b3ed7f777 MDL-51296 blog: Added title that reflects the blog's editing mode 2015-09-14 10:52:09 +08:00
David Monllao
7426ea3dac Merge branch 'MDL-51217-master' of git://github.com/lucisgit/moodle 2015-09-14 10:04:08 +08:00
Simey Lameze
ef6998015f MDL-50884 auth_shibboleth: fix logout handler url generation
This patch fixes the shibboleth redirect url generation, that can create invalid url
if the shibboleth logout_handler setting has a parameter generating two parameters
with (?) instead of (&).

Thanks to Matteo Boni for the proposed solution.
2015-09-14 09:48:55 +08:00
David Monllao
3f1bc32d22 Merge branch 'MDL-51232' of git://github.com/jinuabraham/moodle 2015-09-14 09:38:56 +08:00
Simey Lameze
e6c990ad21 MDL-50959 gradebook: fix XML grade publishing score 2015-09-14 09:04:14 +08:00
Mark Nelson
53914e4465 MDL-51051 core_grades: 'Categories and items' => 'Gradebook setup' 2015-09-14 08:23:32 +08:00
Colin Campbell
9901bdf7eb MDL-51305 grade: Fix slow grade operations by setting grade_item early.
Exports were fetching the grade item for every item-user combination.
Setting the grade_item object on the grade_item early prevents that.
2015-09-11 15:41:20 -05:00
Jean-Philippe Gaudreau
286d6c81bf MDL-51191 assign: Optimizing slow SQL query for MySQL 2015-09-11 11:10:03 -04: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
David Monllao
8f76bfb628 MDL-50766 grunt: Check that there are yui modules before running shifter 2015-09-11 15:11:48 +08: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
Eloy Lafuente (stronk7)
f495510548 weekly release 3.0dev 2015-09-10 11:09:52 +02:00
Eloy Lafuente (stronk7)
501d9ae74b Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2015-09-10 11:09:46 +02:00
Rajesh Taneja
1a5a476b03 MDL-51101 behat: Fixed wrong hover step usage
Hover step was being mis-used for checking activity completion
This is replaced with proper step which check for img element
2015-09-10 14:46:12 +08:00
Rajesh Taneja
d8ada0f19b MDL-51101 behat: Removed old behat steps checking feature
This was introduced when there were no features
testing all the steps. Now we have all use-cases
so removing this feature file
2015-09-10 14:43:59 +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
1748938e15 MDL-51311 javascript: Teach Behat to wait for pending JQuery ajax 2015-09-10 13:02:16 +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
Eloy Lafuente (stronk7)
e36d7d57ae Merge branch 'MDL-50015-master' of git://github.com/jleyva/moodle 2015-09-10 01:42:06 +02:00
Eloy Lafuente (stronk7)
7650a4c54d Merge branch 'MDL-50537-master' of git://github.com/jleyva/moodle 2015-09-10 01:01:32 +02:00
Tim Hunt
53eee12a7a MDL-51147 qtype_match: stats should cope even if Q edited badly
The numbers become pretty meaningless, but we need to avoid fatal
errors.
2015-09-09 16:48:27 +01:00
Dan Poltawski
5760a1b083 Merge branch 'MDL-50944-master' of git://github.com/jleyva/moodle 2015-09-09 14:29:53 +01:00