Commit graph

65969 commits

Author SHA1 Message Date
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
Marina Glancy
bdd5a6c5c2 Merge branch 'MDL-42625_master-failures-fix' of git://github.com/dmonllao/moodle 2013-12-12 16:49:56 +11:00
David Monllao
fb99ef1ded MDL-42625 behat: Fixing failures
* Expanding fieldsets before setting the course format
* Ensure editors are loaded moved to expand_all_fieldsets
* Return true rather than false when JS is disabled and
  non-allowed steps should continue without throwing an
  exception.
* Submit create user form after editing it
2013-12-12 13:41:07 +08:00
Marina Glancy
10484ad5e4 Merge branch 'mucupdates27' of https://github.com/skodak/moodle 2013-12-12 15:39:14 +11:00
Petr Škoda
cac367e4a4 MDL-42973 fix MUC caching issue when fetching available updates 2013-12-12 11:43:35 +08:00
Jason Fowler
871015414d MDL-34321 Assignment2.2 - Fixing submission count 2013-12-12 10:35:41 +08:00
Rajesh Taneja
2270661e51 MDL-40058 mod_wiki: trigger event on page map view 2013-12-12 13:08:18 +11:00
Eloy Lafuente (stronk7)
32a8bcc4a7 MDL-31410 paypal: fix problem on notifications
This commit fixes a PHP warning about using a
unititialised variable and also the problems when
notifications are enabled and there is not yet a
teacher in the course, defaulting to admin for student
notifications and preventing teacher notifications to happen.
2013-12-12 02:27:53 +01:00
Eloy Lafuente (stronk7)
d47d52d531 Merge branch 'w50_MDL-31410_m27_paypalipn' of https://github.com/skodak/moodle 2013-12-12 01:09:02 +01:00
Sam Hemelryk
623d49dde4 Merge branch 'MDL-43232-master-1' of git://github.com/andrewnicols/moodle 2013-12-12 09:13:42 +13:00
David Monllao
c5a1015338 MDL-42625 behat: Fixing ExpectationException::__construct() call
Also adding an extra checking to the selector to
ensure it is no updating the list of files.
2013-12-11 17:02:46 +08:00
Andrew Nicols
5947ab3333 MDL-43259 JavaScript: Stop using deprecated lightbox config setting when instantiating dialogues 2013-12-11 16:56:49 +08:00
Andrew Nicols
44b724c374 MDL-43232 JavaScript: Correct typo when cancelling the confirmcancel 2013-12-11 13:29:46 +08:00
Damyon Wiese
e9fe65d575 MDL-43326 Assign: Start new attempt from previous missing sesskey 2013-12-11 13:07:52 +08:00
Rajesh Taneja
0e72987517 MDL-40058 mod_wiki: modified wiki_restore_page api to accept version and context 2013-12-11 13:53:04 +11:00
Rajesh Taneja
e94f6c6572 MDL-40058 Events: added unit test 2013-12-11 13:53:04 +11:00
Rajesh Taneja
86b0e3b308 MDL-40058 Events: Replaced add_to_log for page comments to event 2013-12-11 13:53:00 +11:00