mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-25 10:00:31 +01:00
Code Issues Projects Releases Wiki Activity
71,488 Commits 36 Branches 527 Tags
Commit Graph

71488 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Marina Glancy
1ce4b63bdd MDL-48366 blocks: always display custom regions in dropdown 2014-12-04 16:07:56 +08:00
David Monllao
a1ceaf894b MDL-34684 tool_health: Course categories checking refinements 
Minor changes:
- Updating all course categories that are part of a loop
- Moved functions to tool_health scope
- Moved tests to tool_health scope
- Raised issue importance
- Minor coding style changes

Thanks to Marko Vidberg.
 2014-12-04 11:37:16 +08:00
Logan Reynolds
8db188c8cc MDL-34684 tool_health: Added health check for course category structure 
And corresponding unit test. Work by Marko Vidberg.
 2014-12-04 10:42:58 +08:00
AMOS bot
6ff1761e3e Automatically generated installer lang files 2014-12-04 00:04:34 +08:00
Matt Petro
f61992951d MDL-47323 backup: added enrol plugin backup structure and annotation 2014-12-02 21:46:33 -05: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
Simey Lameze
ef9739f0eb MDL-48255 auth_ldap: make ldap cookie check more robust 
Thanks to Baptiste Desprez for spotting this and provide a solution.
 2014-12-02 15:28:03 +08:00
Ankit Agarwal
5bc886259b MDL-37704 user_profile: Make sure description field can be locked 
Thanks JD for the initial patch.
 2014-12-02 09:40:09 +05:30
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
fafb221336 MDL-48425 course: management behat tests improved 2014-12-02 11:45:25 +13: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
pau.ferrer-ocana
8e371539f4 MDL-48430 custom_menu: Malformed url in custom menu cannot break the platform 2014-12-01 10:50:26 +01:00
Didier Raboud
9318de17ef MDL-34437 shibboleth: Correct the shibboleth wiki links. 2014-12-01 14:56:29 +05:30
Frederic Massart
fbd846bebc MDL-14908 user: Parents are not restricted when separated groups is used 2014-12-01 15:14:26 +08: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
Marina Glancy
c6fb5a7e1e MDL-31851 course request: do not autologin 2014-12-01 14:36:06 +08:00
Marina Glancy
6f98532334 MDL-46486 coursecat: remove function forgotten in MDL-38147 2014-12-01 13:12:21 +08:00
Rajesh Taneja
55f4734100 MDL-48426 behat: soft-reset mink session before scenario 2014-12-01 12:39:42 +08:00
Rajesh Taneja
146dbacc45 MDL-48426 behat: Wait for redirection after save 
After saving wiki comment, page is redirected
Make sure to wait for redirection after save
to avoid random fails
 2014-12-01 11:24:04 +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
Dan Poltawski
141e7d8747 MDL-40552 course: fixup unit test 
Previously there was an assertion which was never used, now
we ensure to test the course themes functionality each time.
 2014-11-29 12:20:36 +00:00
AMOS bot
2956b2ec0f Automatically generated installer lang files 2014-11-29 00:03:58 +08:00
sam marshall
a4c318325c MDL-47628 Availability: Restrict by selected grouping button 2014-11-28 15:55:41 +00:00