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

71615 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
172d7f16ce Merge branch 'm29_MDL-48483' of https://github.com/totara/moodle 2014-12-22 13:43:51 +00:00
Dan Poltawski
e9db67b43a Merge branch 'MDL-48580-master' of git://github.com/lameze/moodle 2014-12-22 13:41:11 +00:00
Dan Poltawski
d61ecfffe5 Merge branch 'patch-1' of https://github.com/jrchamp/moodle 2014-12-22 13:37:52 +00:00
Dan Poltawski
e04cf8d83f MDL-48653 behat: fix incorrect phpdoc 2014-12-22 13:12:48 +00:00
Dan Poltawski
6a96178bc0 Merge branch 'MDL-48653' of git://github.com/timhunt/moodle 2014-12-22 13:10:44 +00:00
Dan Poltawski
0a6ac6e2d9 Merge branch 'MDL-48088-master' of git://github.com/jethac/moodle 2014-12-22 13:05:51 +00:00
Dan Poltawski
c67c00a6fe Merge branch 'MDL-42616-master' of https://github.com/sammarshallou/moodle 2014-12-22 12:13:31 +00:00
Dan Poltawski
d29f655a99 Merge branch 'MDL-48666' of git://github.com/timhunt/moodle 2014-12-22 11:53:15 +00:00
Dan Poltawski
f9b7d0bfac Merge branch 'MDL-48244' of git://github.com/jmvedrine/moodle 2014-12-22 11:16:41 +00:00
Jean-Michel Vedrine
25345cb4cd MDL-48244 Lesson: add custom end of lesson reached completion rule 2014-12-21 16:23:49 +01:00
sam marshall
d3fd2be7aa MDL-42616 filelib: New user interface to edit and add file types (2/2) 
New admin tool tool_filetypes which uses the new API to add and
modify file type definitions.
 2014-12-19 14:49:01 +00:00
sam marshall
91fed57a4e MDL-42616 filelib: Use config value for custom MIME types (1/2) 
Uses a new optional config variable to define custom MIME types
in JSON format. Includes new API for accessing and modifying
this data.
 2014-12-19 14:48:59 +00:00
Tim Hunt
fe03b762c9 MDL-48666 quiz: let JS to get a Qs slot number on the summary page 2014-12-19 14:39:15 +00:00
Brian Barnes
649243260d MDL-48483 admin: attached color label to input control 2014-12-19 14:26:18 +13:00
Tim Hunt
20dd5a7a7a MDL-48653 behat: Steps to click and dismiss a dialogue. 
We already had the corresponding
    I click on "Home" "link" confirming the dialogue
but I needed the opposite
    I click on "Home" "link" dismissing the dialogue
 2014-12-18 19:29:29 +00:00
jrchamp
efa2b9b35c MDL-48591 calendar: Mini Cal Display DST Events 2014-12-18 09:32:46 -05:00
Dan Poltawski
981f06fad5 weekly release 2.9dev 2014-12-18 11:24:59 +00:00
Dan Poltawski
6708b369d1 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2014-12-18 11:24:57 +00:00
Andrew Nicols
dc59c6b68e Merge branch 'MDL-43902-master-fixup' of https://github.com/FMCorz/moodle 2014-12-18 14:45:30 +08:00
Frederic Massart
5c5721285f MDL-43902 cohort: Fix behat failure because attribute does not exist 2014-12-18 14:34:59 +08:00
Andrew Nicols
2da076e6bc Merge branch 'MDL-45324_master' of https://github.com/markn86/moodle 2014-12-18 14:07:46 +08:00
David Monllao
2d7b234362 Merge branch 'MDL-48235-master-fixes' of git://github.com/xow/moodle 2014-12-18 12:35:55 +08:00
Zachary Durber
a68b8d8d16 MDL-47442 mod_assign: Notify student when quick-grading grade 2014-12-18 12:10:01 +08:00
Andrew Nicols
0e61dba339 MDL-38663 login: Remove login info from forgot password page 
Since this is checked in several locations, I have introduced a new
protected function to check whether the current page is a login page.

This could potentially be exposed as a public function, but Sam's original
comment suggests that this is undesirable.
 2014-12-18 11:58:26 +08:00
Marina Glancy
244ee80e80 MDL-48452 Completion: js correction to behat test 2014-12-18 11:26:44 +08:00
John Okely
3a5581c1ad MDL-48235 mod_assign: Fix grade of 0 not showing on feedback page in oracle 2014-12-18 10:23:03 +08:00
Dan Poltawski
344b4b9846 Merge branch 'MDL-44829_MOODLE_MASTER' of git://github.com/BenKelada/moodle 2014-12-17 10:11:40 +00:00
Eloy Lafuente (stronk7)
b033a93682 Merge branch 'MDL-46122-master' of git://github.com/FMCorz/moodle 2014-12-17 10:12:34 +01:00
Mark Nelson
8dc1f5ff71 MDL-45324 mod_assign: always notify students when requested 2014-12-16 23:41:00 -08:00
BKelada
8ce30abf5b MDL-44829 libraries: Update android user agent detection 2014-12-17 16:10:24 +11:00
David Monllao
ceb7769a29 Merge branch 'MDL-48243_master' of git://github.com/lazydaisy/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-12-17 11:48:42 +08:00
Frederic Massart
c9bd4e41eb MDL-46122 libraries: Final deprecation of file lib/pluginlib.php 2014-12-17 09:37:11 +08:00
David Monllao
a646812d1b MDL-48482 core_admin: version change to add new lang strings 2014-12-17 08:54:46 +08:00
David Monllao
92f5468179 Merge branch 'm29_MDL-48482' of git://github.com/totara/moodle 2014-12-17 08:52:58 +08:00
Brian Barnes
60b57b6189 MDL-48482 core_admin: Added additional label for durations 2014-12-17 08:54:55 +13:00
Dan Poltawski
861265b43a Merge branch 'MDL-43462_landscape_pdf' of git://github.com/davosmith/moodle 2014-12-16 19:20:22 +00:00
Dan Poltawski
d23bf1f5b8 Merge branch 'MDL-42501-master' of git://github.com/lameze/moodle 2014-12-16 19:17:57 +00:00
Dan Poltawski
f5360dd16b Merge branch 'MDL-43902-master' of git://github.com/FMCorz/moodle 2014-12-16 18:52:40 +00:00
Dan Poltawski
4b0c38daee Merge branch '38663-29' of git://github.com/samhemelryk/moodle 2014-12-16 18:45:33 +00:00
Eloy Lafuente (stronk7)
ccad9ddee6 Merge branch 'MDL-48452-master' of https://github.com/sammarshallou/moodle 2014-12-16 19:21:40 +01:00
sam marshall
af729c3f5e MDL-48452 Completion: Expected date doesn't save when form is locked 
The completion fields are locked when a user has already completed the
task, to prevent you accidentally causing it to recalculate the data.

This lock doesn't apply to the expected date field, as this doesn't
affect user completion. However, changes to the field in this
situation were incorrectly not saved.
 2014-12-16 17:31:00 +00:00
Dan Poltawski
aaca4e3eff Merge branch 'MDL-48587-master' of git://github.com/xow/moodle 2014-12-16 17:05:03 +00:00
Eloy Lafuente (stronk7)
8b25d8d70c Merge branch '34041-29' of git://github.com/samhemelryk/moodle 2014-12-16 16:35:47 +01:00
Eloy Lafuente (stronk7)
cccab73451 Merge branch 'm29_MDL-48532' of https://github.com/totara/moodle 2014-12-16 15:47:06 +01:00
Dan Poltawski
b721d502e4 Merge branch 'MDL-46442-master' of git://github.com/zbdd/moodle 2014-12-16 13:52:52 +00:00
Dan Poltawski
c236f820e1 Merge branch 'MDL-47610-master' of git://github.com/zbdd/moodle 2014-12-16 12:59:45 +00:00
Dan Poltawski
eb7ab07ef8 Merge branch 'MDL-44985-master' of git://github.com/ankitagarwal/moodle 2014-12-16 12:44:22 +00:00
Eloy Lafuente (stronk7)
3bd434cd49 Merge branch 'MDL-34550-master' of git://github.com/ankitagarwal/moodle 2014-12-16 13:35:52 +01:00
Dan Poltawski
4c4507d6dc Merge branch 'MDL-42862-master' of git://github.com/ankitagarwal/moodle 2014-12-16 12:22:37 +00:00
Dan Poltawski
d3a1c13ed8 Merge branch 'MDL-46651-master-restore-course-completion-duplicate-key' of https://github.com/Trii/moodle 2014-12-16 11:58:53 +00:00