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

71645 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
38da9a45e8 Merge branch 'master-48421' of https://github.com/timpricecatalyst/moodle 2014-12-22 17:00:19 +00:00
Dan Poltawski
f957ec61ca Merge branch 'MDL-43730-master' of git://github.com/ankitagarwal/moodle 2014-12-22 16:34:48 +00:00
Dan Poltawski
affdc3b7e6 MDL-48638 course: update unit test to new message 2014-12-22 16:23:04 +00:00
Dan Poltawski
427f70a8d3 Merge branch 'MDL-42166-master' of git://github.com/xow/moodle 2014-12-22 15:38:49 +00:00
Dan Poltawski
677172f722 Merge branch 'MDL-48638-master' of git://github.com/merrill-oakland/moodle 2014-12-22 15:25:25 +00:00
Dan Poltawski
ca9ef112c6 Merge branch 'MDL-48643-master' of git://github.com/merrill-oakland/moodle 2014-12-22 15:22:37 +00:00
Dan Poltawski
e51f99739d MDL-43004 blog: fix upgrade.txt typo 2014-12-22 15:13:41 +00:00
Dan Poltawski
991d2e9633 Merge branch 'MDL-43004-master' of git://github.com/FMCorz/moodle 2014-12-22 15:09:53 +00:00
Dan Poltawski
7293a1aafd MDL-44260 uplodate: move deprecated functions to deprecatedlib 2014-12-22 15:07:59 +00:00
Dan Poltawski
65a19504d7 Merge branch 'MDL-44260-master' of git://github.com/lameze/moodle 2014-12-22 14:57:30 +00:00
Dan Poltawski
7f384c8f92 Merge branch 'MDL-48062-master' of https://github.com/dthies/moodle 2014-12-22 14:36:46 +00:00
Dan Poltawski
b21575c753 Merge branch 'm29_MDL-48423' of https://github.com/totara/moodle 2014-12-22 14:15:09 +00:00
Dan Poltawski
1f2789ebf2 Merge branch 'MDL-48224-master' of git://github.com/xow/moodle 2014-12-22 14:04:05 +00:00
Dan Poltawski
2da35cd459 Merge branch 'MDL-48445-master' of https://github.com/jmarshall-netspot/moodle 2014-12-22 13:56:19 +00:00
Dan Poltawski
b8572fa904 Merge branch 'MDL-48534_master' of https://github.com/markn86/moodle 2014-12-22 13:52:36 +00:00
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
Eric Merrill
6f0776b6ff MDL-48643 Javascript: Create modals hidden, then show, to prevent scroll 
Modal dialogs need to be created with visible: false and then call
.show() on it to make it visible. This prevents the page from jumping to
the top.
 2014-12-21 22:54:25 -05: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
Daniel Thies
eb8b2425a6 MDL-48062 atto_image: Add image select on single click 2014-12-18 18:26:28 -06:00
Tim Price
6eb3da841d MDL-48421 navigation: accounting for potential regression 2014-12-19 09:19:38 +11:00
Tim Price
85e59ac2f3 MDL-48421 navigation: correctly load child categories if parent is loaded 2014-12-19 09:19:38 +11: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
Eric Merrill
3f0023b995 MDL-48638 database SQL: Fix typo in exception constructor 2014-12-18 13:31:36 -05: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
Brian Barnes
18d0acf8ca MDL-48423 messages: improved accessibility of contacts list 2014-12-18 10:56:19 +13:00
Ankit Agarwal
c905907bdd MDL-43730 mod_book: Automate MDLQA-2426 
Behat feature to make sure show/hide feature for book chapter works as expected
 2014-12-17 22:29:04 +05:30
Ankit Agarwal
22255d8c78 MDL-43730 mod_book: Make chapter action links accessible 2014-12-17 22:28:05 +05:30
Dan Poltawski
344b4b9846 Merge branch 'MDL-44829_MOODLE_MASTER' of git://github.com/BenKelada/moodle 2014-12-17 10:11:40 +00:00