moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-09 10:56:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
89559 commits 37 branches 544 tags 1.3 GiB
Commit graph

2782 commits

Author SHA1 Message Date
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
Dan Poltawski
2bc34d6528 Merge branch 'MDL-40741_master' of git://github.com/dmonllao/moodle 2013-11-26 14:52:21 +08:00
David Monllao
5df9e40cec MDL-40741 behat: Changing xpaths for clean theme 
Keeps compatibility with standard theme.
 2013-11-26 11:41:13 +08:00
Jerome Mouneyrac
2a974bb79c 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-11-26 11:38:56 +08:00
Sam Hemelryk
9474b47781 MDL-43016 block_navigation: fixed category link display 2013-11-22 08:55:39 +13:00
Dan Poltawski
84cd1a2a91 Merge branch '42060-27' of git://github.com/samhemelryk/moodle 2013-11-19 10:39:30 +08:00
Damyon Wiese
47578dbff4 MDL-42930 Add 2.6.0 upgrade line 2013-11-18 11:47:17 +08:00
Sam Hemelryk
19b13d531a MDL-42060 block_course_list: fixed sorting of mycourses 2013-11-18 11:15:02 +13:00
Damyon Wiese
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
Sam Hemelryk
9bbcadb228 MDL-42806 block_mentees: can only be docked if it has a valid title set. 2013-11-11 17:18:23 +08:00
David Mudrák
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
Andrew Nicols
b100c4e3a1 MDL-40975 Behat: Fix test failure with block menus 2013-11-07 11:42:27 +08:00
sam marshall
3ef7279f26 MDL-42084 Core: Change set_time_limit to core_php_time_limit::raise everywhere 
Exceptions (places where set_time_limit is still left) are:

Third-party libraries:
  ADODB
  PHPMailer

Moodle core:
  PHPUnit - not relevant (CLI mode)
 2013-11-06 16:40:01 +00:00
David Monllao
047a8800f4 MDL-40975 course: Adapt behat tests to the new course editing interface 2013-11-06 11:41:00 +08:00
Damyon Wiese
057a79922e Merge branch 'MDL-42701' of git://github.com/stronk7/moodle 2013-11-05 13:10:52 +08:00
rwijaya
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
Eloy Lafuente (stronk7)
f39c82ebed MDL-42701 Bump all versions near 2.6 release 2013-11-05 02:36:00 +01:00
Petr Škoda
0c431257e9 MDL-42387 standardise file lifetime handling 2013-11-01 10:42:18 +01:00
Sam Hemelryk
12ceaa5514 MDL-42619 block_community: delete course redirect bug fix 2013-11-01 10:17:15 +08:00
Dan Poltawski
fcdc588976 Merge branch 'wip-mdl-42594' of https://github.com/rajeshtaneja/moodle 2013-11-01 08:56:58 +08:00
Sam Hemelryk
2e29034313 Merge branch 'MDL-42574-master' of git://github.com/ankitagarwal/moodle 2013-11-01 08:55:24 +08:00
Rajesh Taneja
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
Ankit Agarwal
a48dcbf604 MDL-42574 blocks: Fix strict standards warning in community block 2013-10-28 15:41:29 +08:00
Dan Poltawski
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
Dan Poltawski
6356be73d0 Merge branch 'wip-mdl-42261' of git://github.com/rajeshtaneja/moodle 2013-10-25 11:33:19 +08:00
Rajesh Taneja
ca85839fd3 MDl-42261 My Home: Fixed string key to show all courses 2013-10-25 11:26:58 +08:00
Dan Poltawski
e36f72414d Merge branch 'wip-mdl-42261' of git://github.com/rajeshtaneja/moodle 2013-10-24 16:57:47 +08:00
Rajesh Taneja
bcf725398a MDL-42261 My Home: Fixed strings to match moodle standards 2013-10-24 16:55:27 +08:00
Rajesh Taneja
6fb0760827 MDL-42261 My Home: Added link to show all courses on my home page 
If not forced by admin, user can see all courses by clicking on link
 2013-10-24 16:55:26 +08:00
Dan Poltawski
b8a5092f2e Merge branch 'MDL-42342-master' of git://github.com/ankitagarwal/moodle 2013-10-23 15:26:54 +08:00
Rajesh Taneja
5ab32c11b7 MDL-41811 navigation: Site admin will be loaded by ajax on non admin pages 2013-10-21 14:17:52 +08:00
Ankit Agarwal
f40be120a4 MDL-42342 blocks: Fix alternate name warning in quiz results block 2013-10-15 14:40:02 +08:00
Marina Glancy
e6bcdc5ece MDL-42278 behat: block context can be returned to original state 
Automate MDLQA-1547 - The context of a block can always be returned to it's original state.
 2013-10-15 14:41:55 +11:00
David Monllao
e9af3ed361 MDL-42013 behat: I should (not)? see checking visibility 
Only for non-Javascript tests. If the step
is named I should/should not see whatever
is makes sense that has to be visible.
 2013-10-10 18:40:29 +08:00
Damyon Wiese
44585a1ecd Merge branch 'MDL-41792_master' of https://github.com/markn86/moodle 2013-10-08 16:03:46 +08:00
Damyon Wiese
b242214269 Merge branch 'MDL-42122' of git://github.com/aolley/moodle 2013-10-08 12:48:10 +08:00
Petr Škoda
e87214bda7 MDL-42078 multiple uninstall improvements and cleanup 
Includes:
* update checker refactored to \core\update\ namespace
* plugininfo classes refactored to \core\plugininfo\ namespace
* plugin_manager renamed to core_plugin_manager
* redirect back to original page after plugin uninstall
* fixed assign subplugin uninstall
* move assign subplugins under the assignment in admin tree
* fixed plugininfo for all question related plugin types
* auth uninstall support
* added missing block dependencies
* added theme uninstall
* subplugin types are following the plugin on plugin overview page
* several performance improvements in plugin manager
* new warnigns when plugininfo are outdated or missing
* multiple fixes and other improvements
 2013-10-07 13:10:36 +02:00
Mark Nelson
da3041379a MDL-41792 core_calendar: refactored the calendar to allow the use of multiple calendar types 2013-10-04 16:17:02 +08:00
Mark Nelson
bb74cdfef3 MDL-41792 block_calendar_upcoming: tidy existing code 2013-10-04 12:35:57 +08:00
Mark Nelson
ec126f624e MDL-41792 block_calendar_month: tidy existing code 2013-10-04 12:35:57 +08:00
Adam Olley
e7dbb03978 MDL-42122 block_community: Dont show install option without capability 2013-10-03 14:25:06 +09:30
Sam Hemelryk
5e319f5101 Merge branch 'wip-MDL-37559-m26-showshortname' of git://github.com/henesnarfel/moodle 2013-10-01 11:18:14 +13:00
Eloy Lafuente (stronk7)
161f995849 Merge branch 'w39_MDL-41437_m26_mia' of https://github.com/skodak/moodle 
Conflicts:
	admin/auth.php
	lib/db/upgrade.php
	version.php
 2013-09-24 20:18:03 +02:00