mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-08 18:03:19 +02:00
Code Issues Projects Releases Wiki Activity
71,386 Commits 36 Branches 530 Tags
Commit Graph

71386 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
f889c45159 MDL-26226 course: force version bump for new setting 2014-12-04 12:14:29 +00:00
Eloy Lafuente (stronk7)
8b9bb799f9 Merge branch '21724-29' of git://github.com/samhemelryk/moodle 2014-12-04 12:14:29 +00:00
Eloy Lafuente (stronk7)
fca0b79d18 Merge branch '23178-29' of git://github.com/samhemelryk/moodle 2014-12-04 12:14:28 +00:00
Sam Hemelryk
101348192b Merge branch 'MDL46116_IMSCP_container_items.updates_2014-11-11' of https://github.com/Dave-B/moodle 
Conflicts:
	mod/imscp/module.js
 2014-12-04 12:14:26 +00:00
Dan Poltawski
13e0300961 Merge branch '26226-48304-29' of git://github.com/samhemelryk/moodle 2014-12-04 12:06:04 +00:00
Helen Foster
946f83b04b MDL-36236 caching: improved help string 
(and Dan keeping codechecker happy)
 2014-12-04 12:04:12 +00:00
Dan Poltawski
4592f67789 Merge branch '36236-29' of git://github.com/samhemelryk/moodle 2014-12-04 12:04:11 +00:00
Dan Poltawski
ddb483a468 Merge branch 'wip-mdl-48290' of https://github.com/rajeshtaneja/moodle 2014-12-04 12:04:11 +00:00
Dan Poltawski
690a634156 Merge branch 'MDL-48285_master' of git://github.com/dmonllao/moodle 2014-12-04 12:04:11 +00:00
Dan Poltawski
2852a9a0aa Merge branch 'MDL-34627_master' of https://github.com/dmonllao/moodle 2014-12-04 12:04:10 +00:00
David Monllao
e07e04c123 MDL-48285 webservices: default timeend to infinity and beyond 2014-12-04 12:04:10 +00:00
Eloy Lafuente (stronk7)
951af91e08 Merge branch '48374-29' of git://github.com/samhemelryk/moodle 2014-12-04 12:04:09 +00:00
Dan Poltawski
3d891e3263 Merge branch 'MDL-47628-master' of https://github.com/sammarshallou/moodle 
Conflicts:
	availability/yui/build/moodle-core_availability-form/moodle-core_availability-form-min.js
 2014-12-04 12:04:07 +00:00
Sam Hemelryk
7594ed1e2a Merge branch 'MDL-40419-master-2nd' of git://github.com/FMCorz/moodle 2014-12-04 12:03:18 +00:00
Sam Hemelryk
6c4e70a6d8 Merge branch 'wip_MDL-47830_m29_pwrotation' of https://github.com/skodak/moodle 2014-12-04 12:03:15 +00:00
Dan Poltawski
50944630bd Merge branch 'm29_MDL-48317' of https://github.com/totara/moodle 2014-12-04 11:37:53 +00:00
Dan Poltawski
63015d84c3 Merge branch 'm29_MDL-48359' of https://github.com/totara/moodle 2014-12-04 11:37:52 +00:00
Dan Poltawski
7dad52f704 Merge branch 'wip_MDL-48420_m29_lasttypo' of https://github.com/skodak/moodle 2014-12-04 11:37:52 +00:00
Dan Poltawski
67a51a5bed Merge branch 'MDL-48342' of git://github.com/jmvedrine/moodle 2014-12-04 11:37:52 +00:00
Dan Poltawski
f9fae51704 Merge branch 'wip-MDL-32547-master-v2' of git://github.com/abgreeve/moodle 
Conflicts:
	version.php
 2014-12-04 11:37:48 +00:00
Dan Poltawski
7b58b245bf Merge branch 'MDL-40241_master' of https://github.com/dmonllao/moodle 2014-12-04 11:33:27 +00:00
Dan Poltawski
8c0f7298b6 Merge branch '48335-29' of git://github.com/samhemelryk/moodle 2014-12-04 11:33:27 +00:00
Sam Hemelryk
24d0d813e9 MDL-21724 course: ability to return when editing/creating 2014-12-03 10:21:54 +13:00
Sam Hemelryk
5d795b5717 MDL-23178 block_site_main_menu: indenting is possible now 2014-12-03 09:54:55 +13:00
David Balch
c57617dac1 MDL-46116 mod_imscp: Fix some jshint issues. 2014-12-02 10:33:11 +00:00
Rajesh Taneja
a296ebffed MDL-48290 behat: Add log out after checking exported file 
If the download step is the last in the scenario then we
can sometimes run into the situation where the download page
causes a http redirect but behat has already conducted its
reset (generating an error). By putting a logout step we avoid
behat doing the reset until we are off that page.
 2014-12-02 09:38:26 +08:00
Sam Hemelryk
a33fed2161 MDL-48374 behat: improved page load exceptions 
The following improvements have been made to the page load watching:
* Improved the exceptions when a page load expectation fails.
* Added an exception if start watching happens twice without a page load.
* Improved the page load span and xpath to make it faster and less likely
  to interfer in the future.
 2014-12-02 11:43:58 +13:00
Tim Hunt
a109a3ca35 MDL-48374 behat: new steps for detecting page loads. 2014-12-02 08:57:28 +13:00
Dan Poltawski
b2ab6cc330 Merge branch '27548-29' of git://github.com/samhemelryk/moodle 
Conflicts:
	lib/db/install.xml
	lib/db/upgrade.php
	version.php
 2014-12-01 12:21:19 +00:00
David Monllao
95d1a366ea MDL-40241 core_completion: Minor fixes to provided patch 
Thanks to Aaron Barnes and Jon Sharp for working on this issue.
 2014-12-01 15:03:18 +08:00
Charles Fulton
f885712200 MDL-34627 feedback: Convert default format value during restore 2014-12-01 10:53:15 +08:00
Sam Hemelryk
91bae397b4 Merge branch 'MDL-18183-master' of git://github.com/FMCorz/moodle 2014-12-01 14:45:50 +13:00
Sam Hemelryk
0893f8d399 Merge branch 'wip-MDL-48377-master' of git://github.com/marinaglancy/moodle 2014-12-01 14:02:08 +13:00
Sam Hemelryk
0c3b2180d6 Merge branch 'MDL-48382' of git://github.com/timhunt/moodle 2014-12-01 13:58:13 +13:00
Sam Hemelryk
7c96d1e81d Merge branch 'MDL-35696-master-course-meta-link-sort-order' of https://github.com/amandadoughty/moodle 2014-12-01 13:50:52 +13:00
Sam Hemelryk
b5e8781465 Merge branch 'MDL-46618_master' of git://github.com/kordan/moodle 2014-12-01 13:11:32 +13:00
Sam Hemelryk
ecf3b93d39 Merge branch 'MDL-40607-master' of git://github.com/danpoltawski/moodle 2014-12-01 11:40:57 +13:00
Sam Hemelryk
602b281dcb Merge branch 'MDL-14402-master' of git://github.com/andrewnicols/moodle 2014-12-01 11:35:44 +13:00
Sam Hemelryk
930d160bcd Merge branch 'MDL-48384-master' of git://github.com/danpoltawski/moodle 2014-12-01 11:31:29 +13:00
Sam Hemelryk
783d96c6da Merge branch 'MDL-48309-master' of git://github.com/andrewnicols/moodle 2014-12-01 11:10:25 +13:00
Sam Hemelryk
e2f7da2a80 Merge branch 'MDL-34867-master' of https://github.com/tbannister/moodle 2014-12-01 10:45:04 +13:00
Sam Hemelryk
d125c7d238 MDL-47133 editor_atto: fixed lint errors 2014-12-01 10:36:23 +13:00
Sam Hemelryk
231cb5e3d4 Merge branch 'MDL-47133-master' of git://github.com/FMCorz/moodle 2014-12-01 10:34:18 +13:00
Petr Skoda
e5035ecb3f MDL-48420 test: fix lasttnamephonetic typo 2014-12-01 09:25:55 +13:00
Sam Hemelryk
2d1df7a3be Merge branch 'MDL-48227-master' of git://github.com/ankitagarwal/moodle 2014-12-01 09:14:46 +13:00
Petr Skoda
1d658535b6 MDL-47830 auth: Add pw rotation restrictions 2014-12-01 08:53:52 +13:00
Sam Hemelryk
eb8f9f9adb Merge branch 'MDL-42717-master' of git://github.com/ankitagarwal/moodle 2014-12-01 08:47:34 +13:00
Sam Hemelryk
1eded976e5 Merge branch 'wip-mdl-48192' of https://github.com/rajeshtaneja/moodle 2014-12-01 08:33:53 +13:00
Andrew Nicols
64e7aa4de1 MDL-28286 JavaScript: Convert all uses of M.str to M.util.get_string 2014-12-01 08:32:04 +13:00
Dan Poltawski
e4d9185e4a MDL-40607 deprecatedlib: final deprecations of 2.0 functions 
These functions are getting final deprecation following our process.
Note that print_arrow() is getting more time due to incorrect
replacement - see MDL-45448
 2014-11-29 12:42:31 +00:00