Commit graph

76346 commits

Author SHA1 Message Date
David Monllao
32f1e17a01 MDL-30157 enrol_manual: Setting proper default
The wrong default value was working because of count starting from 1.
2015-09-15 16:25:25 +08:00
Andrew Nicols
1c97055b68 Merge branch 'MDL-50983-master' of git://github.com/junpataleta/moodle 2015-09-15 15:25:46 +08:00
Juan Leyva
740c354f17 MDL-49942 core_course: New Web Service core_course_search_courses 2015-09-15 09:18:26 +02:00
Johannes Burk
97fe80ad68 MDL-50664 mod_data: add 'manageapproved' setting.
New function data_user_can_manage_entry checks whether a user is allowed to manage an entry.
Considering manageentries capability, data_in_readonly_period() result,
ownership (determined by data_isowner()), approval and manageapproved setting.
2015-09-15 07:16:40 +00:00
David Monllao
366d350412 Merge branch 'MDL-50921-master' of git://github.com/ryanwyllie/moodle 2015-09-15 14:26:57 +08:00
David Monllao
de5dd7c5c5 MDL-51048 backup: Removing unnecessary var 2015-09-15 13:43:45 +08:00
David Monllao
79167d5fa9 Merge branch 'MDL-51048' of git://github.com/timhunt/moodle 2015-09-15 13:40:55 +08:00
Andrew Nicols
bbbca469ad Merge branch 'MDL-51290-master' of git://github.com/cameron1729/moodle 2015-09-15 13:05:30 +08:00
Damyon Wiese
4093d64332 MDL-50783 ajax: Default for ajax calls to requirelogin=true 2015-09-15 13:01:30 +08:00
Paul Nicholls
0bad799dc4 MDL-51190 javascript: Make "maximised embed" compatible with MS Edge
MS Edge exhibits strange behaviour when M.util.init_maximised_embed hides
the embedded document by setting its width and height to 0px.  Toggling
display:none instead achieves the intended goal without breaking Edge.
2015-09-15 16:34:55 +12:00
David Monllao
785ebcdbe6 Merge branch 'MDL-51008-master' of git://github.com/marinaglancy/moodle 2015-09-15 11:21:22 +08:00
Marina Glancy
4f2424ca1c MDL-51408 badges: fix criteria for custom profile fields 2015-09-15 11:17:21 +08:00
Andrew Nicols
52eaa0ceda Merge branch 'MDL-50982-master' of git://github.com/junpataleta/moodle 2015-09-15 11:01:50 +08:00
David Monllao
d4218943d8 Merge branch 'MDL-51147' of git://github.com/timhunt/moodle 2015-09-15 10:07:55 +08:00
David Monllao
9ff2a265d0 Merge branch 'm30_MDL-51363_Fix_Default_Settings_1x_Restore' of git://github.com/scara/moodle
Conflicts:
	mod/scorm/version.php
2015-09-15 09:58:08 +08:00
Andrew Nicols
0b90eb6155 Merge branch 'MDL-50981-master' of git://github.com/junpataleta/moodle 2015-09-15 08:33:06 +08:00
Andrew Nicols
5a191b2f44 Merge branch 'MDL-51017-master' of git://github.com/jleyva/moodle 2015-09-15 08:23:10 +08:00
Matteo Scaramuccia
32c114ca04 MDL-51363 SCORM: fixed default settings on restoring 1.x backups 2015-09-14 23:48:25 +02:00
Cameron Ball
80ef91effa MDL-51290 user: Expand picture section in profile by default 2015-09-14 17:49:48 +08:00
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
Daniel Thies
d0ec31716b MDL-51228 atto_editor: Add documententation for inlineFormat flag 2015-09-13 14:29:07 -05: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