2117 Commits

Author SHA1 Message Date
Damyon Wiese
4e8a350c35 Merge branch 'MDL-45618' of git://github.com/timhunt/moodle 2014-05-20 14:59:48 +08:00
Dan Poltawski
06a689b761 Merge branch '44711-28' of git://github.com/samhemelryk/moodle 2014-05-20 10:15:11 +08:00
Tim Hunt
5bcfd504df MDL-45618 Fix @since PHPdoc tags. 2014-05-19 17:03:04 +01:00
Sam Hemelryk
817d39b8aa MDL-44711 navigation: better handling of course expansion exception 2014-05-19 08:41:14 +12:00
Dan Poltawski
11a325c673 MDL-37838 block_courseoverview: fix pluaralisation logic
Note that this kind of handling of plurals is extremely limited, see:

https://moodle.org/mod/forum/discuss.php?d=85897
http://search.cpan.org/~petdance/Locale-Maketext-1.12/lib/Locale/Maketext/TPJ13.pod

However, this is a simple fix to the existing logic
2014-05-12 17:42:14 +08:00
Eloy Lafuente (stronk7)
538bf99ece MDL-45486 Bump all versions to planned release
This bumps all versions to planned 2.7 release
(2014051200) version and all the dependencies to
current 2.7rc2 (2014050800)
2014-05-09 02:12:28 +02:00
Frederic Massart
6f6345e327 MDL-45462 flickr: Requests are now done over HTTPS 2014-05-08 11:27:36 +08:00
Frederic Massart
b04bf988ef MDL-43877 blocks: Files from blocks in my/ were accessible to the world 2014-05-07 14:27:11 +08:00
Marina Glancy
447d55d55a MDL-45429 block_glossary_random: check capability before suggesting to edit 2014-05-06 16:06:29 +08:00
Marina Glancy
8ced50e3da Merge branch 'MDL-45315-master' of git://github.com/danpoltawski/moodle 2014-04-30 09:55:10 +08:00
Dan Poltawski
a15d2052e8 MDL-45315 block_news_items: Add missing depedency 2014-04-29 14:24:10 +08:00
Marina Glancy
506b3e2317 Merge branch 'MDL-45289-master' of git://github.com/danpoltawski/moodle 2014-04-29 12:49:30 +08:00
Dan Poltawski
e1850856c9 MDL-45289 block_course_summary: Add behat tests 2014-04-29 09:52:54 +08:00
Marina Glancy
2666d179ff Merge branch 'MDL-45266-master' of git://github.com/danpoltawski/moodle 2014-04-28 18:00:57 +08:00
Dan Poltawski
16f37c5c13 MDL-45266 behat: tests for login block 2014-04-28 10:32:50 +08:00
Dan Poltawski
16a8764210 MDL-45268 behat: tests for participants block 2014-04-25 16:13:21 +08:00
Sam Hemelryk
5fbcc5263a Merge branch 'MDL-45096-master' of git://github.com/andrewnicols/moodle 2014-04-24 12:14:34 +12:00
Dan Poltawski
d7ef1ac747 Merge branch 'MDL-45172_block' of https://github.com/andyjdavis/moodle 2014-04-23 16:40:22 +08:00
Andrew Davis
40d230162c MDL-45172 block_completionstatus: added a check for an empty string before appending 2014-04-23 11:22:04 +08:00
Steve Clay
d8edfff658 MDL-45096 block_navigation: Check for existence of the siteadminbranch before modifying it
Prevents JS errors in some themes when admin block is hidden
2014-04-22 16:32:42 +08:00
Dan Poltawski
768a10f066 Merge branch 'wip-MDL-45036-master' of git://github.com/abgreeve/moodle 2014-04-18 10:50:06 +08:00
Damyon Wiese
cc29e5d4dd Merge branch 'MDL-43277-master' of git://github.com/andrewnicols/moodle 2014-04-16 11:12:36 +08:00
Sam Hemelryk
37358ac5c0 Merge branch 'wip-MDL-45083-master' of git://github.com/marinaglancy/moodle 2014-04-16 09:52:05 +12:00
Andrew Nicols
b359900cd7 MDL-43277 block_navigation: Trim from the left for long names 2014-04-15 10:24:32 +08:00
Marina Glancy
3c4b2f0b4c MDL-45083 recent_activity: fixed debugging message on removed module type 2014-04-14 15:20:24 +08:00
Adrian Greeve
f3f60eb27b MDL-45036 blocks: Update to the mentee block sql to incorporate additional name fields. 2014-04-11 14:00:46 +08:00
Ankit Agarwal
3610ad436c MDL-45035 events: Fix @package and @since tags in Moodle 2.7 events 2014-04-11 13:45:33 +08:00
Sam Hemelryk
566889aaa8 MDL-42317 output: reviewed standard/base layouts and converted where a better option was available 2014-04-06 15:57:32 +12:00
Frederic Massart
969b30022e MDL-43784 behat: Removed usage of Afterburner in a feature 2014-03-26 16:18:13 +08:00
Eloy Lafuente (stronk7)
eb4606aeb0 Merge branch 'wip-MDL-41285-master' of git://github.com/marinaglancy/moodle 2014-03-25 21:53:38 +01:00
Andrew Nicols
1f777e5c6c MDL-41987 Javascript: Tidy up YUI documentation 2014-03-25 17:01:37 +08:00
Marina Glancy
177052dc55 MDL-41285 blocks: capabilities to view structural changes in recent activities 2014-03-21 15:46:12 +08:00
Marina Glancy
f5b4cdf91d MDL-41285 blocks: recent activity does not use log table
instead it defines it's own table and stores the necessary events
2014-03-21 15:46:07 +08:00
Marina Glancy
f7c1b465f9 MDL-41285 block_recent_activity: behat test for structural changes 2014-03-21 15:42:44 +08:00
Dan Poltawski
7f42ee92eb Merge branch 'MDL-44440_master' of git://github.com/dmonllao/moodle 2014-03-10 13:45:26 +08:00
David Monllao
1f631c7c63 MDL-44440 behat: Changing , for > as a navigation tree nodes separator
Using greater than as seems a more natural separator
than the comma when separating nodes which have a
hierarchy relation.
2014-03-10 13:35:40 +08:00
David Monllao
759b323e0e MDL-43236 behat: Updating references to deprecated methods 2014-03-07 16:05:21 +08:00
David Monllao
a542553d42 MDL-44440 behat: Refactoring features to use I navigate to
Replacing multiple "I expand node" steps by the
new "I navigate to". Also fixing few I navigate to
when dealing with non-JS.
2014-03-07 14:46:54 +08:00
David Monllao
f083d6145e MDL-43738 behat: Updating features files
The following used steps were replaced by the ones
added in this issue:
- I fill the moodle form with
- I fill in with
- I select from
- I select radio button
- I check
- I uncheck
- the field should match

Also removing test for deprecated steps:
- the ASD checkbox should be checked
- the ASD checkbox should not be checked
2014-02-27 18:22:05 +08:00
Eloy Lafuente (stronk7)
993414fdf6 MDL-44151 Amend subplugin packages.
This commit fixed the @package for all assignment subplugins.
Also adds a tiny change in the community block (MDL-44120).
2014-02-18 01:33:05 +01:00
Eloy Lafuente (stronk7)
6f9b4cccb4 Merge branch '44120-27' of git://github.com/samhemelryk/moodle 2014-02-18 01:02:22 +01:00
Andrew Nicols
af64bc6179 MDL-33099 Javascript: Deprecate the ajaxenabled function 2014-02-17 14:11:21 +08:00
Sam Hemelryk
f25a6839fd MDL-44120 block: tidied up block @package uses 2014-02-16 12:17:14 +13:00
Marina Glancy
1b066c06c6 Merge branch 'MDL-43440-master' of git://github.com/mr-russ/moodle 2014-02-03 13:42:23 +08:00
Rajesh Taneja
623a32e50d MDL-43736 Events: Updated unit test to test context not used in event 2014-01-29 11:39:50 +08:00
Russell Smith
74b63eae76 MDL-43440 unit testing: Use cmid in unit tests when it should be used.
instance is has been used instead of cmid.  This works as all id's are 1
in most cases, but not always.

accesslib_clear_all_caches_for_unit_testing was updated to clear the
$USER->access cache which would fail test when the wrong user's data was used.
2014-01-25 08:57:32 +11:00
Eloy Lafuente (stronk7)
bc6d39a561 Merge branch 'wip-MDL-43333-master' of git://github.com/marinaglancy/moodle 2014-01-21 01:59:50 +01:00
Eloy Lafuente (stronk7)
ba766c4772 Merge branch 'wip-MDL-43211-master' of git://github.com/marinaglancy/moodle 2014-01-21 01:54:00 +01:00
Eloy Lafuente (stronk7)
b7623bcb5d Merge branch 'MDL-43480_master' of git://github.com/dmonllao/moodle 2014-01-21 01:43:13 +01:00
Eloy Lafuente (stronk7)
1816a46d11 Merge branch 'MDL-40533-master' of git://github.com/FMCorz/moodle 2014-01-21 00:17:31 +01:00