da2e9d519b
Merge branch 'MDL-40139-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
2014-01-20 10:33:38 +08:00
33d83d755a
Merge branch 'MDL-43642_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE
2014-01-14 15:48:52 +08:00
892173b3f3
Merge branch 'MDL-40705-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2014-01-13 09:36:12 +08:00
543397a50d
MDL-40139 block_privatefiles: Prevent usage of unmaintained edit page
2014-01-10 13:01:56 +01:00
52a027398e
MDL-43642 behat: Setting the correct files @package
2014-01-10 17:47:49 +08:00
02b5deb65a
Merge branch 'MDL-43590-en_fix_26' of git://github.com/mudrd8mz/moodle into MOODLE_26_STABLE
2014-01-10 10:10:27 +01:00
8772689453
MDL-43590 Merge English strings from the en_fix language pack
2014-01-09 01:11:59 +01:00
bf6527407d
MDL-40705 theme_bootstrapbase: Handling of long words in block content
2014-01-06 15:45:19 +01:00
3db84ae082
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:47:39 +08:00
072ce9a5e7
MDL-34182 js: fixed typo in ajaxException use
2013-12-23 09:43:16 +13:00
45c0583312
Merge branch 'MDL-40436-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
2013-12-16 11:31:13 +13:00
736ce96319
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:10:45 +01:00
3675c98506
Merge branch 'MDL-42625_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE
2013-12-10 23:31:51 +01:00
51d311f703
Merge branch 'wip-MDL-43279-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE
2013-12-11 10:58:49 +13:00
286348d97f
MDL-43279 block_blog_recent: fixed undefined property notice
2013-12-10 09:28:40 +11:00
9f8ef4294a
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 15:53:55 +08:00
503c8dddcc
MDL-42625 behat: Editing .feature files
2013-12-06 15:53:50 +08:00
f5940bfb5f
MDL-41030 behat: Dock blocks compatible with both selenium and phantomjs
2013-12-06 15:53:38 +08:00
d6c8107249
MDL-43152 JavaScript: Fix linting issue with navigation JS
2013-12-06 09:09:01 +08:00
cb891e57f0
Merge branch 'wip-MDL-42731-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE
2013-12-03 17:29:57 +08:00
5259c6b402
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 16:05:18 +08:00
ed52eb4c88
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 16:05:09 +08:00
e2a2209ed6
Merge branch 'wip-mdl-43048-m26' of https://github.com/rajeshtaneja/moodle into MOODLE_26_STABLE
2013-12-03 11:43:53 +08:00
d8be1d9ac5
Merge branch 'MDL-42989-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE
2013-12-02 14:53:37 +08:00
cbb87c9568
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:34:11 +08:00
7d2f938cf0
MDL-42969 Main Menu Block loses ability to move resource or activity up or down (add back exact same behavior than in 2.5)
2013-12-02 14:24:16 +08:00
0a44a45fea
MDL-42731 block_activity_modules: added behat tests
2013-12-02 10:15:52 +11:00
1880d3684c
MDL-43048 block_tags: Initalised content->text for tags block
2013-11-27 14:37:07 +08:00
44e5ac93bc
Merge branch 'MDL-40741_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE
2013-11-26 14:57:15 +08:00
addedcb142
MDL-40741 behat: Changing xpaths for clean theme
...
Keeps compatibility with standard theme.
2013-11-26 13:00:24 +08:00
5e946b2ceb
MDL-43016 block_navigation: fixed category link display
2013-11-22 09:00:09 +13:00
5af5a205a3
Merge branch '42060-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE
2013-11-19 10:39:33 +08:00
005e784e22
MDL-42930 Add 2.6.0 upgrade line
2013-11-18 11:41:59 +08:00
c20f615105
MDL-42060 block_course_list: fixed sorting of mycourses
2013-11-18 11:15:35 +13:00
f2f23af955
Merge branch 'MDL-42711-master' of git://github.com/nebgor/moodle
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2013-11-14 17:18:44 +08:00
9bbcadb228
MDL-42806 block_mentees: can only be docked if it has a valid title set.
2013-11-11 17:18:23 +08:00
1d93c9ae07
MDL-42711 import learnmoodle fixes: Fix the broken links in RSS feed block
...
If the <description> of the feed contains URLs longer than 30 characters, the
URL is split because of the break_up_long_words(). When combined with the
filter that converts URLs to links, this produces broken links.
The proper solution would be to improve break_up_long_words() so that it does
not modifies URLs at all. As a temporary solution for our purpose now is to
call format_text() prior to break_up_long_words() as it will not modify the
inner content of the <a> tag.
This should be fixed upstream. See also discussion at
https://moodle.org/mod/forum/discuss.php?d=34947
2013-11-08 15:35:54 +08:00
b100c4e3a1
MDL-40975 Behat: Fix test failure with block menus
2013-11-07 11:42:27 +08:00
047a8800f4
MDL-40975 course: Adapt behat tests to the new course editing interface
2013-11-06 11:41:00 +08:00
057a79922e
Merge branch 'MDL-42701' of git://github.com/stronk7/moodle
2013-11-05 13:10:52 +08:00
a80af8a652
MDL-42280 Behat: add behat test for block settings.
...
Test includes: modifying setting to hide and move block appearance
2013-11-05 11:37:28 +08:00
f39c82ebed
MDL-42701 Bump all versions near 2.6 release
2013-11-05 02:36:00 +01:00
0c431257e9
MDL-42387 standardise file lifetime handling
2013-11-01 10:42:18 +01:00
12ceaa5514
MDL-42619 block_community: delete course redirect bug fix
2013-11-01 10:17:15 +08:00
fcdc588976
Merge branch 'wip-mdl-42594' of https://github.com/rajeshtaneja/moodle
2013-11-01 08:56:58 +08:00
2e29034313
Merge branch 'MDL-42574-master' of git://github.com/ankitagarwal/moodle
2013-11-01 08:55:24 +08:00
3d49e6ba22
MDL-42594 Navigation: Site admin navigation will show loading icon
...
While loading site admin navigation loading icon will be displayed
2013-10-29 17:27:53 +08:00
a48dcbf604
MDL-42574 blocks: Fix strict standards warning in community block
2013-10-28 15:41:29 +08:00
b1a6c9dc52
Merge branch 'wip-mdl-41811' of git://github.com/rajeshtaneja/moodle
...
Conflicts:
login/change_password.php
2013-10-28 15:37:05 +08:00
6356be73d0
Merge branch 'wip-mdl-42261' of git://github.com/rajeshtaneja/moodle
2013-10-25 11:33:19 +08:00
Dan Poltawski