2095 Commits

Author SHA1 Message Date
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
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
Dan Poltawski
67deeb244d Merge branch 'MDL-40139-master' of git://github.com/FMCorz/moodle 2014-01-20 10:33:36 +08:00
Marina Glancy
0c74b33fbf MDL-43333 blocks: move activity icon in social and main menu 2014-01-17 17:29:47 +08:00
Marina Glancy
fc630b2b01 MDL-43211 blocks: style edit icons in main menu and social activities 2014-01-17 17:29:22 +08:00
David Monllao
81ad5438c7 MDL-43480 behat: Removing @_only_local tags from steps where it is not necessary 2014-01-17 10:41:37 +08:00
Frederic Massart
f15aff3802 MDL-40533 block_html: Remove styles specific to the block 2014-01-14 19:00:31 +01:00
Dan Poltawski
2c9c8c7f46 Merge branch 'MDL-43642_master' of git://github.com/dmonllao/moodle 2014-01-14 15:48:49 +08:00
Damyon Wiese
1bedb6b92f MDL-33952 Assignment: Remove behat tests for mod_assignment - it is not a real activity anymore. 2014-01-14 09:57:05 +08:00
Dan Poltawski
b5c8e7cbc3 Merge branch 'MDL-40705-master' of git://github.com/FMCorz/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-01-13 09:35:50 +08:00
Frederic Massart
4e5f3996b2 MDL-40139 block_privatefiles: Remove unused edit form 2014-01-10 13:03:31 +01:00
Frederic Massart
ad5ec8fc10 MDL-40139 block_privatefiles: Prevent usage of unmaintained edit page 2014-01-10 13:00:45 +01:00
David Monllao
abe572e3f2 MDL-43642 behat: Setting the correct files @package 2014-01-10 17:50:50 +08:00
Eloy Lafuente (stronk7)
577432283c Merge branch 'MDL-43590-en_fix' of git://github.com/mudrd8mz/moodle 2014-01-10 10:08:34 +01:00
Helen Foster
480fca77b3 MDL-43590 Merge English strings from the en_fix language pack 2014-01-09 01:06:01 +01:00
Damyon Wiese
de47c9c81b Merge branch 'wip-mdl-43293' of https://github.com/rajeshtaneja/moodle 2014-01-07 12:22:49 +08:00
Dan Poltawski
7afca0ff5a Merge branch 'wip-mdl-43521' of https://github.com/rajeshtaneja/moodle 2014-01-07 11:08:23 +08:00
Frederic Massart
f802fe7d7f MDL-40705 theme_bootstrapbase: Handling of long words in block content 2014-01-06 15:43:26 +01:00
Dan Poltawski
73ee2fda6b MDL-41690 course: remove use of deprecated functions 2014-01-06 10:45:59 +08:00
Rajesh Taneja
42ebe8f04f MDL-43521 block_admin_bookmarks: Site admin node is of type TYPE_SITE_ADMIN
Since 2.6 Site admin node is of type TYPE_SITE_ADMIN, previously it was TYPE_SETTING
2014-01-03 10:39:50 +08:00
Rajesh Taneja
cdfd607449 MDL-43293 Events: Added unit test for comment events 2013-12-23 09:22:15 +08:00
Rajesh Taneja
a55eaf0351 MDL-43293 Events: Added comments event in modules supporting comments 2013-12-23 09:22:14 +08:00
Sam Hemelryk
0e7367a57e MDL-34182 js: fixed typo in ajaxException use 2013-12-23 09:54:57 +13:00
Sam Hemelryk
233e6b985b Merge branch 'MDL-43259-master' of git://github.com/andrewnicols/moodle
Conflicts:
	lib/upgrade.txt
2013-12-17 16:32:35 +13:00