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

65985 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam Hemelryk
2b88fa0c90 Merge branch 'MDL-25473-master' of git://github.com/phalacee/moodle 2013-12-17 08:54:33 +13:00
Sam Hemelryk
bb4551334f Merge branch 'MDL-34321-master' of git://github.com/phalacee/moodle 2013-12-17 08:48:08 +13:00
Sam Hemelryk
2b08f90aca Merge branch 'MDL-36984-master' of git://github.com/phalacee/moodle 2013-12-17 08:45:05 +13:00
Sam Hemelryk
0359fe71e2 Merge branch 'w51_MDL-43268_m27_filternotice' of https://github.com/skodak/moodle 2013-12-17 08:25:08 +13:00
Frederic Massart
4c29120354 MDL-30195 portfolio_googledocs: Allow export of rich HTML 2013-12-16 11:02:10 +01:00
Andrew Nicols
052d64a478 MDL-43322 JavaScript: Correct cache-base entry in base rollup 2013-12-16 16:59:11 +08:00
Jerome Mouneyrac
8e4b9a45b1 MDL-43399 Badge: the Choose... option can still be selected once a role is choosen. 2013-12-16 14:33:02 +08:00
Frederic Massart
545b310c84 MDL-42212 mod_lesson: Use autoloading for mod_lesson_file_info 2013-12-16 07:03:46 +01:00
Frederic Massart
89133afae6 MDL-42212 mod_lesson: Localise area names 2013-12-16 06:49:05 +01:00
Frederic Massart
b47dc5ffea MDL-42212 mod_lesson: Fix callbacks retrieving activity files 2013-12-16 06:49:05 +01:00
Jerome Mouneyrac
97b659a13f MDL-41075 Remove "Choose..." option from participants page. 2013-12-16 12:07:33 +08:00
Andrew Nicols
9a45ac14f0 MDL-43322 JavaScript: Include moodle-core-popuphelp in the mcore rollup 
moodle-core-popuphelp is used on every page in Moodle, so it should be
included in the rollup by default to save a request each time.
 2013-12-16 16:14:26 +13:00
Sam Hemelryk
21ad9a7921 Merge branch 'MDL-43240-master' of git://github.com/andrewnicols/moodle 2013-12-16 16:03:09 +13:00
Damyon Wiese
f268fb5d20 MDL-43250 Assign: separate groups mode fix 
When in separate groups mode, only get graders in a group that is in the course module grouping.
 2013-12-16 10:54:38 +08:00
Sam Hemelryk
9f5b319345 Merge branch 'MDL-34432-master' of git://github.com/damyon/moodle 2013-12-16 15:46:56 +13:00
Sam Hemelryk
d431ff1f51 Merge branch 'wip-mdl-21180' of https://github.com/rajeshtaneja/moodle 2013-12-16 15:44:15 +13:00
Sam Hemelryk
d842685028 Merge branch 'MDL-43062-master-nomerge' of git://github.com/mouneyrac/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-12-16 15:40:40 +13:00
Damyon Wiese
c7a7368958 MDL-34432: Allow comment inline (stripping embedded images version) 2013-12-16 10:38:23 +08:00
Rajesh Taneja
134c514be0 MDL-21180 Gradebook: Consistent handling of change in aggregation 
Change from/to GRADE_AGGREGATE_WEIGHTED_MEAN and GRADE_AGGREGATE_EXTRACREDIT_MEAN was only
handled prior to this patch. GRADE_AGGREGATE_SUM and GRADE_AGGREGATE_WEIGHTED_MEAN2 also
behave similar and should be handled same way
 2013-12-16 09:57:42 +08:00
Marina Glancy
2a73cfb011 Merge branch 'MDL-37972-master' of git://github.com/phalacee/moodle 2013-12-16 12:27:38 +11:00
Sam Hemelryk
3c3eed7e01 Merge branch 'wip-MDL-43348_master' of git://github.com/gjb2048/moodle 2013-12-16 14:10:15 +13:00
Sam Hemelryk
3b94d80c20 Merge branch 'MDL-40096-master' of git://github.com/damyon/moodle 2013-12-16 13:52:16 +13:00
Sam Hemelryk
c57864b76f Merge branch 'MDL-42965_master' of https://github.com/totara/openbadges 2013-12-16 13:47:57 +13:00
Sam Hemelryk
db23e92670 Merge branch 'MDL-40436-master' of git://github.com/FMCorz/moodle 2013-12-16 11:31:29 +13:00
Sam Hemelryk
2244289809 Merge branch 'w51_MDL-42931_m27_env27' of https://github.com/skodak/moodle 2013-12-16 11:18:02 +13:00
Sam Hemelryk
063baa62b5 Merge branch 'MDL-42085-master' of git://github.com/mouneyrac/moodle 2013-12-16 11:11:38 +13:00
Sam Hemelryk
6015500d5b Merge branch 'MDL-43326-master' of git://github.com/damyon/moodle 2013-12-16 09:46:47 +13:00
Yuliya Bozhko
455d13b7e4 MDL-40551 badges: Support fully deleting badges 2013-12-16 09:29:38 +13:00
Frederic Massart
0aa3b16c90 MDL-35032 mod_book: 1.9 backup restore convertis files to book area 2013-12-13 10:20:49 +01:00
David Monllao
e227cfe0e3 MDL-43235 behat: Ensure that behat_config_manager::get_config_file_contents() has always a behat_wwwroot 2013-12-13 14:20:03 +08:00
Andrew Nicols
5329506f22 MDL-34182 Repositories: Check for and warn on invalid output in the file picker 2013-12-13 14:10:05 +08:00
Andrew Nicols
f2c780d525 MDL-34182 AJAX: Change to use shared method when checking the siteadminbranch for invalid output 2013-12-13 14:10:04 +08:00
Andrew Nicols
af736f903d MDL-34182: Add functions to warn of output in AJAX scripts 
We need to be able to capture output when including contributed code as it
may add additional content which makes makes the json we output invalid.

We only warn of these errors if the site is in debugdeveloper, otherwise
we silently drop them.
 2013-12-13 14:10:04 +08:00
Petr Škoda
dbe0203ba8 MDL-42931 fix hardcoded PHP version tests for 2.7 2013-12-13 14:04:24 +08:00
Petr Škoda
d1a628e5fd MDL-42931 set new requirements for 2.7 2013-12-13 14:04:24 +08:00
Petr Škoda
60129d5d1f MDL-43213 try to simplify behat config and init code 
1/ always require 3 behat settings - $CFG->behat_wwwroot, $CFG->behat_dataroot and $CFG->behat_prefix
2/ cleanup init code
3/ do not require $CFG->wwwroot and $CFG->dataroot on test sites
4/ remove switch completely - the most confusing part for me
5/ print out behat_wwwwroot in init script so that you can test the test site manually
 2013-12-13 14:03:04 +08:00
Petr Škoda
ed67f462fe MDL-43268 fix filter notice when not in debug mode 2013-12-13 13:57:59 +08:00
Jerome Mouneyrac
41c2a197ba MDL-43062 course: Content of label is left-aligned, regardless of alignment chosen 2013-12-13 13:27:26 +08:00
Sam Hemelryk
2f4e0db7c3 weekly release 2.7dev 2013-12-13 16:59:10 +13:00
Sam Hemelryk
61b46e4c4d Merge branch 'install_master' of git://git.moodle.org/moodle-install 2013-12-13 16:59:08 +13:00
AMOS bot
184d614f26 Automatically generated installer lang files 2013-12-13 00:42:11 +00:00
Tim Lock
9f1d04920a MDL-33925: auth_imap: add self-signed cert support 2013-12-12 12:52:51 +01:00
David Monllao
fff500c727 MDL-42625 behat: Wrapping select an option extra actions in a try & catch 
To select an option is specially painful, every browser
behaves differently and phantomjs just joined the party
throwing "Element does not exist in cache" random
exceptions that we need to catch.
 2013-12-12 12:16:45 +01:00
Gareth J Barnard
fde0b8cd1b MDL-43348 theme: html <nav> element on the wrong content. 2013-12-12 11:07:03 +00:00
David Monllao
244da9d1f8 MDL-43355 testing: Return the hash when HEAD points to a hash 2013-12-12 17:26:22 +08:00
Dan Poltawski
1f1a8f03d8 MDL-38832 course: remove unused constants 2013-12-12 16:44:20 +08:00
Andrew Nicols
5c1d99b027 MDL-43325 JavaScript: Set a default visibility for most Moodle dialogues 
We used to ignore the 'visible' field in the initializer, but now we hide
dialogues if visible is false. This was an unintentional change from the
stable API and means that confirmation boxes, alerts, and exceptions are no
longer shown by default.
 2013-12-12 16:20:02 +08:00
Jerome Mouneyrac
571906e3f7 MDL-42085 Enrol: Always apply enrolment duration. 
Before the fix, the startdates and duration fields were integrated to HTML code only
when the user clicked on the collapsible region to see them.
It was wrong because their values were not sent by the form
if ever the user didn't expand this Enrolment options region.
 2013-12-12 16:04:52 +08:00
Frederic Massart
67850301d0 MDL-40436 block_course_list: Fix bad context resolution 
We were trying to get the course context of a remote course
from a completely unrelated ID. It would sometimes work if the
ID was matching the one of a local course. In other places
we are not trying to find a context for the remote course, we
simply use the $PAGE context in format_string. So the usage
of the context has been removed here too.
 2013-12-12 09:04:19 +01:00
Jason Fowler
082ad25776 MDL-36984 Assign: Add redirect after saving grades 2013-12-12 14:19:26 +08:00