David Monllao
9d1593d686
Merge branch 'wip-mdl-49772' of git://github.com/rajeshtaneja/moodle
2015-05-27 11:50:01 +08:00
Rajesh Taneja
b7861ddab3
MDL-49772 behat: Removed optimization as it's not required
...
This api is called very few times in behat
initilisation process, so such optimization
is an over engineer. Hence removing it.
2015-05-27 11:20:48 +08:00
David Monllao
1bd2c8ad01
Merge branch 'MDL-49611' of git://github.com/srynot4sale/moodle-fixes
2015-05-27 08:49:23 +08:00
Eloy Lafuente (stronk7)
777cb3ece8
Merge branch 'wip-mdl-49772' of https://github.com/rajeshtaneja/moodle
2015-05-26 18:48:03 +02:00
Eloy Lafuente (stronk7)
84152b676a
Merge branch 'wip-MDL-50191-master' of https://github.com/marinaglancy/moodle
2015-05-26 18:19:42 +02:00
Dan Poltawski
502bcf9738
Merge branch 'MDL-50318-master-courseresources' of git://github.com/mudrd8mz/moodle
2015-05-26 13:05:16 +01:00
Dan Poltawski
2a72614f53
Merge branch 'MDL-49787_email_attachments_symlink_fix' of https://github.com/iamandrew/moodle
2015-05-26 12:57:12 +01:00
Dan Poltawski
450b0f1dfd
Merge branch 'MDL-49776-master' of git://github.com/lameze/moodle
2015-05-26 11:53:34 +01:00
Dan Poltawski
aa55e70382
Merge branch 'MDL-49560-master' of git://github.com/gurgus/moodle
2015-05-26 11:33:26 +01:00
Dan Poltawski
e0db4c775e
Merge branch 'MDL-50271-master' of git://github.com/jleyva/moodle
2015-05-26 11:31:38 +01:00
David Monllao
9b7c42eac7
Merge branch 'MDL-50344-master' of git://github.com/ankitagarwal/moodle
2015-05-26 17:29:22 +08:00
David Monllao
74c32f21e2
Merge branch 'MDL-48664-master' of git://github.com/jethac/moodle
2015-05-26 14:45:34 +08:00
David Monllao
fb00b083ce
Merge branch 'MDL-46550-master' of git://github.com/ankitagarwal/moodle
2015-05-26 12:28:59 +08:00
David Monllao
c8f92d487a
Merge branch 'MDL-50289-master-notes' of git://github.com/mudrd8mz/moodle
2015-05-26 12:23:03 +08:00
Jetha Chan
b146b6a8c3
MDL-48664 output: change paging_bar to not use non-breaking spaces
2015-05-26 12:13:14 +08:00
Dan Poltawski
9dbe663dbf
Merge branch 'MDL-50313-master-featureidnumber' of git://github.com/mudrd8mz/moodle
2015-05-25 13:54:04 +01:00
Dan Poltawski
3b88ce4bce
Merge branch 'MDL-50321-master-modupgradetxt' of git://github.com/mudrd8mz/moodle
2015-05-25 12:30:34 +01:00
Dan Poltawski
cd580ee337
Merge branch 'MDL-40592_master' of https://github.com/nadavkav/moodle
2015-05-25 12:28:38 +01:00
Dan Poltawski
e2a472e024
Merge branch 'MDL-49493-master' of git://github.com/mastnym/moodle
2015-05-25 12:00:44 +01:00
David Mudrák
e9acc1d6c5
MDL-50289 notes: No navigation to notes if the feature is disabled
2015-05-25 12:35:26 +02:00
David Monllao
5362e3ca3a
Merge branch 'wip-MDL-49572-master' of git://github.com/marinaglancy/moodle
2015-05-25 17:54:00 +08:00
Damien Bezborodov
e604d38fc7
MDL-50285 gradereport_user: Grade categories calculate wrong with suspended users (Student's view)
2015-05-25 17:43:48 +08:00
David Monllao
d34a865a61
Merge branch 'wip-MDL-50330-master' of git://github.com/abgreeve/moodle
2015-05-25 16:37:06 +08:00
Marina Glancy
d08f2f1175
MDL-49560 webservice: avoid recursion in soap
...
Thanks to El Leonidych for providing a patch
2015-05-25 15:57:23 +08:00
Ankit Agarwal
f987afbc2c
MDL-50344 restore: Make restore file required
2015-05-25 12:02:16 +05:30
spvickers
058cd1c1d0
MDL-49776 mod_lti: Set parameter in privacy check
...
Moved sending of the lis_result_sourcedid parameter to within the block
which checks that grades are being accepted for the link.
2015-05-25 13:01:33 +08:00
Martin Mastny
4ee052641e
MDL-49493 backup: Implemented missing methods for anonymous backup
2015-05-25 10:35:11 +08:00
Juan Leyva
b3e1e2d007
MDL-50271 webservices: Allow to load multiple themes in WS_SERVER mode
2015-05-22 13:27:23 +02:00
Adrian Greeve
c2c5f874e1
MDL-50330 blog: Behat test for blog visibility.
2015-05-22 16:13:03 +08:00
Nadav Kavalerchik
d19de800ed
MDL-40592 assign/grading: Display default user picture, if none is set.
2015-05-22 10:35:47 +03:00
Adrian Greeve
0c7131622d
MDL-50330 blog: Fixed fatal error accessing blogs.
2015-05-22 15:34:09 +08:00
David Mudrák
f7a84c6386
MDL-50321 docs: Add info about deprecated method into mod/upgrade.txt
...
This was forgotten in MDL-49101.
2015-05-21 18:06:41 +02:00
David Mudrák
01f329babe
MDL-50318 course: Fix the URL of embedded images at resources overview
...
Not only mod_resource instances are listed here. All modules that
declare their FEATURE_MOD_ARCHETYPE as MOD_ARCHETYPE_RESOURCE (well, all
but those without own view page, such as mod_label) are listed. So we
must use the real plugin name when rendering the intro field.
2015-05-21 17:23:25 +02:00
David Mudrák
de158ec57c
MDL-50313 docs: Fix the documentation for the FEATURE_IDNUMBER constant
...
The constant is used by course/moodleform_mod.php to decide whether the
field 'ID number' (cmidnumber) should be included in the common module
settings section of the activity settings form. Activity modules that do
not use grades (such as the Label) can explicitly return false when
checking for this feature support. By default, all activity modules are
supposed to support it.
2015-05-21 16:53:00 +02:00
Eloy Lafuente (stronk7)
803f565753
weekly on-sync release 3.0dev
2015-05-21 12:44:08 +02:00
Rajesh Taneja
91a96d402a
MDL-49772 behat: Added support to updatestep file by parallel run
2015-05-21 13:24:29 +08:00
Marina Glancy
e65d05c128
MDL-50191 cohorts: check manage cap to display hide icon
2015-05-21 12:19:57 +08:00
Eloy Lafuente (stronk7)
2e365978de
Merge branch 'MDL-50277-master' of git://github.com/andrewnicols/moodle
2015-05-20 11:04:56 +02:00
Marina Glancy
2d1164800c
MDL-49572 cache: correctly purge cache on event
2015-05-20 14:07:58 +08:00
David Monllao
a103ccb4a4
Merge branch 'wip-mdl-49061' of git://github.com/rajeshtaneja/moodle
2015-05-20 10:18:11 +08:00
Rajesh Taneja
99018b283d
MDL-49061 behat: Fixed input name to use full activity name
2015-05-20 10:07:26 +08:00
Andrew Nicols
4218673093
MDL-50277 Javascript: Hardcode nodejs dependencies
...
In order to produce a consistent build across the board, we must hardcode
several package versions. We must additionally specify compatible
versions for any sub-dependency that we have a requirement upon.
In this instance, the only sub-dependency which has an effect upon the
overall output is grunt-contrib-uglify's dependency upon uglify-js.
Since change in uglify-js may lead to changes in the generated output, we
must specify a fixed version of that dependency. That version must be
compatible with the dependency signature for grunt-contrib-uglify or the
dependency manager will just download a different version.
This issue also bumps the version of uglify-js to a version which changes
the output. This is the latest version at time of commit.
2015-05-20 09:41:17 +08:00
Eloy Lafuente (stronk7)
7dd6cd75de
Merge branch 'wip-mdl-50259' of https://github.com/rajeshtaneja/moodle
2015-05-19 18:02:34 +02:00
Dan Poltawski
2ce0c86d62
Merge branch 'wip-MDL-49061-master' of https://github.com/marinaglancy/moodle
2015-05-19 15:00:26 +01:00
Dan Poltawski
c1b9c3d10d
Merge branch 'wip-mdl-50203' of https://github.com/rajeshtaneja/moodle
2015-05-19 12:38:56 +01:00
Aaron Barnes
03f3f7180f
MDL-49611 completion: Update dangling err_nocriteria lang strings
2015-05-19 22:41:19 +12:00
Andrew Nicols
5fd62ba064
Merge branch 'MDL-50276-master' of git://github.com/ankitagarwal/moodle
2015-05-19 15:43:28 +08:00
Dan Poltawski
9e4e5d1194
Merge branch 'wip-mdl-50116' of https://github.com/rajeshtaneja/moodle
2015-05-19 08:27:49 +01:00
Rajesh Taneja
53cf1a4149
MDL-50259 behat: Use strict activity name checking
...
contains might select wrong activity
so using strict activity text checking
2015-05-19 14:20:05 +08:00
Ankit Agarwal
23e9968a25
MDL-50276 forums: Add a new line in forum emails
2015-05-19 11:46:00 +05:30