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

69712 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damyon Wiese
db074792b9 Merge branch 'MDL-46944-master-lti-iframe' of git://github.com/schmod/moodle 2014-09-15 15:08:31 +08:00
Damyon Wiese
e8cf07fa51 Merge branch 'm28_MDL-47186' of https://github.com/totara/moodle 2014-09-15 14:16:59 +08:00
Damyon Wiese
7114249071 Merge branch 'MDL-46747' of git://github.com/timhunt/moodle 2014-09-15 14:03:39 +08:00
Damyon Wiese
8b1e5aa4ce Merge branch 'MDL-47209-master' of git://github.com/FMCorz/moodle 2014-09-15 13:50:43 +08:00
Damyon Wiese
7214b77a51 Merge branch 'wip-MDL-35468-master' of git://github.com/marinaglancy/moodle 2014-09-15 13:16:59 +08:00
Damyon Wiese
3a46c04459 Merge branch 'MDL-47208' of git://github.com/aolley/moodle 2014-09-15 12:25:32 +08:00
Marina Glancy
5076b96171 MDL-35468 cohorts: upload cohorts from csv file 2014-09-12 10:24:04 +08:00
Marina Glancy
bd855fd572 MDL-35468 behat: escape user supplied strings in xpath 2014-09-12 10:23:55 +08:00
Adam Olley
0151ca2b91 MDL-47208 core_availability: Return false when cm isnt in modinfo list 
If a cm isn't in modinfo's cm list, then the user shouldn't be able to see that cm.
This fixes an issue where hidden activities would cause users to be unable to use moodle.
 2014-09-12 09:14:56 +09:30
Tim Hunt
9cc01bf323 MDL-46747 questions: add More info link to qbehaviour help. 
Thanks to Tony Gardner-Medwin for the suggestion.
 2014-09-11 16:16:57 +01:00
Dan Poltawski
482abd0f70 weekly release 2.8dev 2014-09-11 15:44:24 +01:00
Dan Poltawski
6bceb3ba8a Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2014-09-11 15:44:21 +01:00
Frederic Massart
385de04b10 MDL-47209 repository_skydrive: Use new oauth URLs 2014-09-11 15:16:31 +08:00
Marina Glancy
a80f592298 MDL-46834 dndupload: check course dndupload cap on course level 2014-09-11 11:23:32 +08:00
Marina Glancy
e0dfc380c6 Revert "Merge branch 'wip-MDL-40356-master' of git://github.com/abgreeve/moodle" 
This reverts commit 4b5fd6eb6d34b5c519d778a8d9c5c1a014146f54, reversing
changes made to a788aade7ce694b3f36c8e27295c60a5178c5b23.
 2014-09-11 10:54:40 +08:00
AMOS bot
dc63722459 Automatically generated installer lang files 2014-09-11 00:05:38 +08:00
Andrew Schmadel
a73b1ba23f MDL-46844 Embed LTI External Tools with an IFrame 
Clears up weird browser issues that occur when embedding content with an
`<object>` tag.
 2014-09-10 09:17:07 -04:00
Rajesh Taneja
54e6e19a47 MDL-46572 behat: Select user dialogue is not visible in phantomjs 2014-09-10 09:14:20 +01:00
Marina Glancy
e6a0f10152 MDL-46834 dndupload: check course dndupload cap on course level 2014-09-10 15:00:35 +08:00
Brian Barnes
1d3972adcc MDL-47186 calendar: Changed month name to h2 from h1 2014-09-10 15:34:15 +12:00
Marina Glancy
a3f234edfb Revert "Merge branch 'MDL-47012-m' of git://github.com/micaherne/moodle" 
This reverts commit 0e88fe02274f15b8ca8bfc1470a56b82f553d0d0, reversing
changes made to de62e57a9b8a535d661bd93a3c800bc5f83d5d30.
 2014-09-10 11:18:52 +08:00
Marina Glancy
4525ff2cfb Merge branch 'MDL-46818-master-fixup' of https://github.com/FMCorz/moodle 2014-09-10 10:50:06 +08:00
Frederic Massart
ef93efbf9d MDL-46818 core_grade: Prevent form checker to catch move fields 2014-09-10 10:43:16 +08:00
Andrew Nicols
83daad5ac9 MDL-47107 mod_forum: is_subscribed $cm input does not need to be a cm_info 2014-09-10 10:00:00 +08:00
AMOS bot
3b8b94904b Automatically generated installer lang files 2014-09-10 00:05:28 +08:00
Dan Poltawski
4b5fd6eb6d Merge branch 'wip-MDL-40356-master' of git://github.com/abgreeve/moodle 2014-09-09 10:35:48 +01:00
Marina Glancy
a788aade7c Merge branch 'MDL-46997-master' of git://github.com/damyon/moodle 2014-09-09 17:18:42 +08:00
Marina Glancy
0e88fe0227 Merge branch 'MDL-47012-m' of git://github.com/micaherne/moodle 2014-09-09 17:16:15 +08:00
Marina Glancy
de62e57a9b Merge branch 'master_MDL-47076' of git://github.com/totara/moodle 2014-09-09 17:12:28 +08:00
Damyon Wiese
b50b12b3f9 MDL-46997 Grades: fix sum of grades with hidden items with differing maxgrades 2014-09-09 17:11:59 +08:00
Damyon Wiese
0db54b5ba2 MDL-46997 Grades: Fix aggregation when hiding is excluded and items have nested dependencies 
Includes a unit test for the dependency flattening function.
 2014-09-09 17:11:59 +08:00
Damyon Wiese
15ace20460 MDL-46997 Grades: Improve the behat tests for grade aggregation 
The tests now cover hidden grades in sub categories for all aggregation types. This change
includes a data generator for grade categories, with unit tests and behat tests for
the generator.
 2014-09-09 17:11:59 +08:00
Marina Glancy
ba41742ea2 MDL-47080 theme: call format_string on site shortname 2014-09-09 10:05:28 +01:00
Dan Poltawski
fb385cb7af Merge branch 'MDL-46572_master' of https://github.com/markn86/moodle 2014-09-09 09:18:00 +01:00
Dan Poltawski
78f284b6ea Merge branch 'MDL-46696-master-fixup' of https://github.com/FMCorz/moodle 2014-09-09 08:46:01 +01:00
Dan Poltawski
c35e9b73a5 Merge branch 'wip-MDL-46834-master' of git://github.com/marinaglancy/moodle 2014-09-09 08:06:40 +01:00
David Curry
927ea484ec MDL-47076 badges: Add checks to user fields during badges restoration 
Change-Id: Iff6402d1da835ed57dc17d079adf1bbd2e76dd6c
 2014-09-09 16:22:52 +12:00
Frederic Massart
f1272bbecd MDL-46696 backup: Handle older backups not containing grade history 2014-09-09 10:23:11 +08:00
Marina Glancy
588ff74f11 MDL-46834 dndupload: Hide dnd message when user cant upload files 2014-09-09 10:02:25 +08:00
Marina Glancy
7b22e2ab54 MDL-46834 filepicker: dnd upload should respect the current context id 2014-09-09 10:02:24 +08:00
Adrian Greeve
4112ef994a MDL-40356 lib: Unit tests for the alternativefullnameformat setting. 2014-09-09 09:23:19 +08:00
Adrian Greeve
ea6f548081 MDL-40356 lib: Added a new setting to display more information from the fullname function. 2014-09-09 09:22:43 +08:00
Eloy Lafuente (stronk7)
eb80a145c8 Merge branch 'm28_MDL-47054' of git://github.com/totara/moodle 2014-09-09 02:18:59 +02:00
Eloy Lafuente (stronk7)
a02aef0c7c Merge branch 'MDL-47107-master' of git://github.com/andrewnicols/moodle 2014-09-09 02:15:26 +02:00
Eloy Lafuente (stronk7)
559f6d6d1b Merge branch 'MDL-46428_master3' of https://github.com/Syxton/moodle 2014-09-09 01:33:44 +02:00
Dan Poltawski
99e221f844 Merge branch 'MDL-40451-master-random-glossary-block-title' of git://github.com/amandadoughty/moodle 2014-09-08 17:26:56 +01:00
Dan Poltawski
205cd43352 Merge branch 'wip-MDL-45602-master' of git://github.com/marinaglancy/moodle 2014-09-08 16:30:33 +01:00
Dan Poltawski
a3b93be8f8 Merge branch 'MDL-46696-master' of git://github.com/FMCorz/moodle 2014-09-08 16:23:59 +01:00
Dan Poltawski
0072e5d559 Merge branch 'MDL-46586-master' of git://github.com/jleyva/moodle 2014-09-08 15:31:13 +01:00
Dan Poltawski
7b41ee2752 Merge branch 'wip-MDL-43739-master' of git://github.com/marinaglancy/moodle 2014-09-08 15:16:38 +01:00