1
0
mirror of https://github.com/moodle/moodle.git synced 2025-03-16 21:50:20 +01:00

2074 Commits

Author SHA1 Message Date
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
Sam Hemelryk
db23e92670 Merge branch 'MDL-40436-master' of git://github.com/FMCorz/moodle 2013-12-16 11:31:29 +13:00
Frederic Massart
67850301d0 MDL-40436 block_course_list: Fix bad context resolution
We were trying to get the course context of a remote course
from a completely unrelated ID. It would sometimes work if the
ID was matching the one of a local course. In other places
we are not trying to find a context for the remote course, we
simply use the $PAGE context in format_string. So the usage
of the context has been removed here too.
2013-12-12 09:04:19 +01:00
Andrew Nicols
5947ab3333 MDL-43259 JavaScript: Stop using deprecated lightbox config setting when instantiating dialogues 2013-12-11 16:56:49 +08:00
Eloy Lafuente (stronk7)
ebc77165a4 Merge branch 'MDL-42625_master' of git://github.com/dmonllao/moodle 2013-12-10 23:29:06 +01:00
Sam Hemelryk
78144bd2e7 Merge branch 'wip-MDL-43279-master' of git://github.com/marinaglancy/moodle 2013-12-11 10:59:21 +13:00
Marina Glancy
332d9ec84b MDL-43279 block_blog_recent: fixed undefined property notice 2013-12-10 09:28:05 +11:00
David Monllao
d1e55a47be MDL-42625 behat: Step definitions + related changes in features
In general aiming for compatibility with multiple browsers,
firefox, chrome and phantomjs to be more specific.

* Removing hardcoded waits
* Adding @_alert, @_switch_window and @_switch_frame tags,
  to label actions that different drivers have problems with.
* Adding missing @_files_upload and @_only_local tags to features that
  uploads files.
* Fixing a few wait for page ready what specified miliseconds.
* New methods to ensure elements (usual selectors), sections and editors
  are ready to interact with
* Changing the select an option implementation to deal with the different
  drivers implementations when listening to JS events.
2013-12-06 13:10:24 +08:00
David Monllao
333db2e9b9 MDL-42625 behat: Editing .feature files 2013-12-06 12:13:39 +08:00
David Monllao
5d2b67228c MDL-41030 behat: Dock blocks compatible with both selenium and phantomjs 2013-12-06 12:13:39 +08:00
Andrew Nicols
350ef81938 MDL-43152 JavaScript: Fix linting issue with navigation JS 2013-12-06 08:43:34 +08:00
Damyon Wiese
a977fa7b36 Merge branch 'wip-MDL-42731-master' of git://github.com/marinaglancy/moodle 2013-12-03 17:29:39 +08:00
Dan Poltawski
a9d04b9b91 Merge branch 'MDL-42989-master' of git://github.com/andrewnicols/moodle 2013-12-03 16:01:22 +08:00
Andrew Nicols
d3f62f2aa3 MDL-42989 JavaScript: Check result of navigation IO requests before reporting errors
When making a request which fails, we need to ensure that the AJAX query
was not aborted before displaying the error.

This ensures that if the navigation tree is being requested at the same
time as a page load is being processed, the abortion of the AJAX request is
not displayed before the page reloads.
2013-12-03 14:36:42 +08:00
Andrew Nicols
2f13dd98b0 MDL-42989 JavaScript: Do not attempt to expand navigation when opening link
When clicking on a link which is also expandable, we should not attempt to
expand it.
2013-12-03 14:20:51 +08:00
Damyon Wiese
b3d252a6b4 Merge branch 'wip-mdl-43048' of https://github.com/rajeshtaneja/moodle 2013-12-03 11:43:32 +08:00
Sam Hemelryk
a59a423926 Merge branch 'MDL-42084-master' of git://github.com/sammarshallou/moodle 2013-12-03 11:12:34 +13:00
Dan Poltawski
6bc8b35add Merge branch 'MDL-42989-master' of git://github.com/andrewnicols/moodle 2013-12-02 14:52:03 +08:00
Marina Glancy
9842e231e8 MDL-42731 block_activity_modules: added behat tests 2013-12-02 17:44:32 +11:00
Andrew Nicols
0bb56f2e31 MDL-42989 Admin: Clean output when building site administration tree for JS
Previously, any inappropriate whitespace found whilst building the admin
tree caused a JSON error and for the site administration tree retrieval to
fail.

This change ensures that access to the site administration tree is unbroken
for non-developers, whilst still alerting developers that there is an
issue.
2013-12-02 14:28:37 +08:00
Dan Poltawski
4b9e9fcb01 Merge branch 'MDL-42969-master' of git://github.com/mouneyrac/moodle 2013-12-02 14:23:48 +08:00
Rajesh Taneja
c891a73d97 MDL-43048 block_tags: Initalised content->text for tags block 2013-11-27 14:32:35 +08:00