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

71402 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathon Fowler
70cfc878b9 MDL-45324 assign: notify when workflow is Off, or if state is Released 
When marking workflow is enabled, students will be notified only when
the workflow state transitions to 'Released'. Until that happens,
sending of messages will be held and the 'Notify students' grading
form option will be locked.

Additionally, the batch set marking workflow state facility gains
the 'Notify students' option.

Credit to Steve Upton and David Balch for the basis of this patch.
 2014-12-10 22:29:08 +10:00
Eloy Lafuente (stronk7)
2d84748c26 weekly release 2.9dev 2014-12-05 11:05:11 +01:00
Eloy Lafuente (stronk7)
cd8cefe902 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2014-12-05 11:05:06 +01:00
Marina Glancy
769496373e MDL-21724 course: fixed wrong string in behat test 2014-12-04 12:14:32 +00:00
Andrew Nicols
06e23acc88 MDL-48309 mod_forum: Do not escape ampersands in plain text email 2014-12-04 12:14:32 +00:00
Sam Hemelryk
c62d077b0e MDL-21724 course: fixed handling of returnto=0 2014-12-04 12:14:31 +00:00
Eloy Lafuente (stronk7)
38ea5e0a39 MDL-21724 course: change remaining tests to new "Save and display" 2014-12-04 12:14:31 +00:00
David Monllao
ef5b65dae4 MDL-48285 calendar: Adapting unit tests to the new behaviour 
Testing also the default value including repeated events.
 2014-12-04 12:14:31 +00:00
Eloy Lafuente (stronk7)
010c36e9e2 Merge branch '48425-48374-29' of git://github.com/samhemelryk/moodle 2014-12-04 12:14:30 +00:00
Eloy Lafuente (stronk7)
a610c9abac MDL-48374 behat: Added missing $session 2014-12-04 12:14:30 +00:00
Eloy Lafuente (stronk7)
eb9419c8e2 Merge branch 'test-48374' of git://github.com/rajeshtaneja/moodle 2014-12-04 12:14:30 +00:00
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
Rajesh Taneja
9f3a68fe61 MDL-48374 behat: Check flag before searching for span on page 2014-12-04 12:04:37 +00:00
Andrew Nicols
1b2c35af34 MDL-48374 behat: improved page load detection 
Check that page load detection was correctly started before testing that a
new page was loaded.

Without this, it is possible to have mutliple subsequent cases of:
    And a new page should have loaded since I started watching

Without first starting the page load detection.
 2014-12-04 12:04:36 +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
AMOS bot
6ff1761e3e Automatically generated installer lang files 2014-12-04 00:04:34 +08: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
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
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