Dan Poltawski [Fri, 10 Oct 2014 11:09:18 +0000 (12:09 +0100)]
Moodle release 2.8beta
jabber bot fighting edition.
Dan Poltawski [Fri, 10 Oct 2014 11:09:18 +0000 (12:09 +0100)]
NOBUG: Fixed file access permissions
Dan Poltawski [Fri, 10 Oct 2014 11:09:15 +0000 (12:09 +0100)]
NOBUG: Fixed SVG browser compatibility
Dan Poltawski [Fri, 10 Oct 2014 11:09:14 +0000 (12:09 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Tim Hunt [Fri, 10 Oct 2014 10:00:12 +0000 (11:00 +0100)]
MDL-43089 quiz editing: don't pop up qbank on initial page load.
Dan Poltawski [Fri, 10 Oct 2014 08:20:30 +0000 (09:20 +0100)]
Merge branch 'wip-MDL-46576-master-upgrade-fix' of https://github.com/abgreeve/moodle
Adrian Greeve [Fri, 10 Oct 2014 07:30:12 +0000 (15:30 +0800)]
MDL-46576 core_grades: Fix upgrade to natural weight.
When upgrading from 'Sum of grades' to natural aggregation the
weights were no automatically assigned and the grade totals were
wrong. This has now been rectified.
Helen Foster [Fri, 10 Oct 2014 07:30:06 +0000 (08:30 +0100)]
MDL-40351 course overview block: improved strings
Andrew Nicols [Fri, 5 Sep 2014 01:37:34 +0000 (09:37 +0800)]
MDL-46658 gradereport_grader: Remove max-width for RTL
For some reason, Safari behaves incorrectly when dealing with RTL content
where the table has a max-width of 100%.
This issue is a part of the MDL-25544 Epic.
Andrew Nicols [Fri, 5 Sep 2014 01:37:34 +0000 (09:37 +0800)]
MDL-46658 gradereport_grader: Fix minor RTL style issues
This issue is a part of the MDL-25544 Epic.
Andrew Nicols [Fri, 5 Sep 2014 01:37:34 +0000 (09:37 +0800)]
MDL-46658 gradereport_grader: Style the ajax editing error
This issue is a part of the MDL-25544 Epic.
Andrew Nicols [Fri, 5 Sep 2014 01:37:34 +0000 (09:37 +0800)]
MDL-47353 gradereport_grader: Only respect fixed headers
Even if the navbar is in a static header, it should only be respected if it
is fixed still.
This issue is a part of the MDL-46658 Task.
This issue is a part of the MDL-25544 Epic.
Tim Hunt [Thu, 9 Oct 2014 16:22:22 +0000 (17:22 +0100)]
MDL-43089 quiz editing: fix some qbank popup JS issues.
AMOS bot [Thu, 9 Oct 2014 16:05:27 +0000 (00:05 +0800)]
Automatically generated installer lang files
Tim Hunt [Thu, 9 Oct 2014 15:34:38 +0000 (16:34 +0100)]
MDL-43089 quiz editing: fix RTL
As part of this, I tweaked the LTR style a bit, in a way that is both an
improvement (I hope) and also to reduce the amount of RTL-specific code
required. (Thanks to Fred for spotting some of the problems.)
Also, I changed one course style in boostrapbase, where the RTL rule was
different from the LTR rule.
Finally, I saw some repeated RTL rules in the quiz styles.css, and so
eliminated the the duplicate rules.
Dan Poltawski [Thu, 9 Oct 2014 11:16:43 +0000 (12:16 +0100)]
Merge branch 'MDL-46481-master-fixup' of https://github.com/FMCorz/moodle
Frederic Massart [Thu, 9 Oct 2014 10:45:32 +0000 (18:45 +0800)]
MDL-46481 backup: Ensure one-click backup is not displayed on restore
Dan Poltawski [Thu, 9 Oct 2014 09:54:19 +0000 (10:54 +0100)]
Merge branch 'MDL-47556' of git://github.com/timhunt/moodle
Marina Glancy [Thu, 9 Oct 2014 07:33:49 +0000 (15:33 +0800)]
MDL-36014 cohorts: fix error in SQL query
Dan Poltawski [Thu, 9 Oct 2014 06:13:18 +0000 (07:13 +0100)]
Merge branch 'MDL-47509' of https://github.com/stronk7/moodle
Dan Poltawski [Thu, 9 Oct 2014 06:05:09 +0000 (07:05 +0100)]
Merge branch 'MDL-46647-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Thu, 9 Oct 2014 03:19:47 +0000 (11:19 +0800)]
MDL-46921 User: Add @core_user to new behat test.
Sam Hemelryk [Thu, 9 Oct 2014 02:44:04 +0000 (15:44 +1300)]
Merge branch 'MDL-47194-master-fixes' of git://github.com/andrewnicols/moodle
Andrew Nicols [Wed, 8 Oct 2014 09:19:22 +0000 (17:19 +0800)]
MDL-46284 tool_messageinbound: Fail with warning if handler disabled
If a handler is disabled, the user should be informed of this issue.
This issue is a part of the MDL-47194 Task.
This issue is a part of the MDL-39707 Epic.
Damyon Wiese [Thu, 9 Oct 2014 01:57:58 +0000 (09:57 +0800)]
Merge branch 'wip-MDL-46921-master' of git://github.com/abgreeve/moodle
Adrian Greeve [Mon, 29 Sep 2014 06:48:45 +0000 (14:48 +0800)]
MDL-46921 lib: behat tests for alternate name sorting.
Adrian Greeve [Mon, 8 Sep 2014 08:21:53 +0000 (16:21 +0800)]
MDL-46921 lib: Sorting on additional fields, admin, enrolment pages.
Adrian Greeve [Tue, 9 Sep 2014 06:52:01 +0000 (14:52 +0800)]
MDL-46921 lib: Update get_all_user_name_fields() plus unit tests.
Adrian Greeve [Mon, 8 Sep 2014 06:14:17 +0000 (14:14 +0800)]
MDL-46921 lib: Add sorting on additional name fields
A thank you to Yishe Choden for creating a patch for this issue.
Sam Hemelryk [Wed, 8 Oct 2014 20:16:40 +0000 (09:16 +1300)]
Merge branch 'MDL-46984_master' of https://github.com/markn86/moodle
Sam Hemelryk [Wed, 8 Oct 2014 19:51:40 +0000 (08:51 +1300)]
Merge branch 'MDL-46481-master' of https://github.com/FMCorz/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Dan Poltawski [Wed, 8 Oct 2014 14:49:58 +0000 (15:49 +0100)]
Merge branch 'wip-MDL-47543-master' of git://github.com/marinaglancy/moodle
Conflicts:
theme/bootstrapbase/less/moodle/grade.less
theme/bootstrapbase/style/moodle.css
Dan Poltawski [Wed, 8 Oct 2014 14:33:46 +0000 (15:33 +0100)]
Merge branch 'wip-MDL-46547-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Wed, 8 Oct 2014 14:24:14 +0000 (15:24 +0100)]
Merge branch 'MDL-47536' of git://github.com/stronk7/moodle
Damyon Wiese [Wed, 8 Oct 2014 14:00:20 +0000 (22:00 +0800)]
Merge branch 'wip-mdl-46987' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Wed, 8 Oct 2014 13:43:13 +0000 (14:43 +0100)]
Merge branch 'MDL-47084-master' of git://github.com/jleyva/moodle
Damyon Wiese [Wed, 8 Oct 2014 13:14:39 +0000 (21:14 +0800)]
Merge branch 'MDL-46458-master' of git://github.com/jleyva/moodle
Conflicts:
version.php
Marina Glancy [Wed, 8 Oct 2014 11:58:43 +0000 (19:58 +0800)]
Merge branch 'MDL-47298-master' of git://github.com/FMCorz/moodle
Tim Hunt [Wed, 1 Oct 2014 15:59:56 +0000 (16:59 +0100)]
MDL-47497 qformats gift and xml: basic test of export.
Really, this is just to test the new behat setps, as much as anything.
Note that the details of what is written to the export files is tested in
the unit tests.
Tim Hunt [Wed, 1 Oct 2014 15:39:06 +0000 (16:39 +0100)]
MDL-47497 behat: steps for basic download testing.
These steps were created by sam marshall and Jes Ackland-Snow at the Open
University. I just altered them to make them a bit more generic, and
submitted them to Moodle core, at the point when I wanted to reuse them
in another plugin.
This commit introduces two new steps:
Then following "XXX" should download "YY" bytes
Then following "XXX" should download between "YY" and "ZZ" bytes
At the moment, this only works for links with href attributes.
Marina Glancy [Wed, 8 Oct 2014 11:22:14 +0000 (19:22 +0800)]
MDL-47297 libraries: upgrade note about Google API update
Frederic Massart [Tue, 30 Sep 2014 11:59:02 +0000 (19:59 +0800)]
MDL-47297 repository_googledocs: Use the newer Google API
Frederic Massart [Tue, 30 Sep 2014 11:52:26 +0000 (19:52 +0800)]
MDL-47297 libraries: Update Google API to v1.0.5-beta
Dan Poltawski [Wed, 8 Oct 2014 10:08:29 +0000 (11:08 +0100)]
Merge branch 'MDL-47389-master' of git://github.com/jleyva/moodle
Dan Poltawski [Wed, 8 Oct 2014 09:42:20 +0000 (10:42 +0100)]
Merge branch 'MDL-45893-master-fixup' of https://github.com/FMCorz/moodle
Dan Poltawski [Wed, 8 Oct 2014 09:22:25 +0000 (10:22 +0100)]
MDL-46658 - fix trailing whitespace
Dan Poltawski [Wed, 8 Oct 2014 09:26:13 +0000 (10:26 +0100)]
Merge branch 'MDL-46658-master' of git://github.com/andrewnicols/moodle
Conflicts:
theme/bootstrapbase/less/moodle/grade.less
theme/bootstrapbase/style/moodle.css
Frederic Massart [Wed, 8 Oct 2014 08:16:01 +0000 (16:16 +0800)]
MDL-45893 my: Specifically follow My home from block in Behat tests
Damyon Wiese [Wed, 8 Oct 2014 08:46:12 +0000 (16:46 +0800)]
Merge branch 'MDL-38540' of git://github.com/jmvedrine/moodle
Dan Poltawski [Wed, 8 Oct 2014 07:54:07 +0000 (08:54 +0100)]
Merge branch 'MDL-46284-master-fix' of git://github.com/andrewnicols/moodle
Dan Poltawski [Wed, 8 Oct 2014 07:39:31 +0000 (08:39 +0100)]
Merge branch 'MDL-40697_master_alt_usergraded' of https://github.com/markn86/moodle
Andrew Nicols [Wed, 8 Oct 2014 07:10:58 +0000 (15:10 +0800)]
MDL-46284 tool_messageinbound: Handle checkboxes correctly
When a checkbox is not checked, it does not submit in the form, therefore
this must be an !empty() test instead of an (int) casting.
This issue is a part of the MDL-47194 Task.
This issue is a part of the MDL-39707 Epic.
Marina Glancy [Tue, 7 Oct 2014 13:57:40 +0000 (21:57 +0800)]
MDL-47543 core_grades: behat changes, also MDL-47541
Marina Glancy [Tue, 7 Oct 2014 13:58:19 +0000 (21:58 +0800)]
MDL-47543 core_grades: improve navigation menu in grade administration
Marina Glancy [Tue, 7 Oct 2014 04:11:08 +0000 (12:11 +0800)]
MDL-47541 core_grades: hints about aggregation settings on setup page
Also do not indicate 'Natural' aggregation method
Frederic Massart [Wed, 8 Oct 2014 05:45:24 +0000 (13:45 +0800)]
MDL-46481 backup: Reposition one-click backup button
Jean-Michel Vedrine [Sun, 17 Mar 2013 22:40:40 +0000 (23:40 +0100)]
MDL-38540 Lesson: import images in question answers
Dan Poltawski [Sun, 5 Oct 2014 08:20:25 +0000 (09:20 +0100)]
MDL-38106 lesson: fix tests introduced in MDL-32870
Mark Nelson [Thu, 25 Sep 2014 01:36:17 +0000 (18:36 -0700)]
MDL-40697 mod_*: fixed unit tests so they pass
Mark Nelson [Sat, 27 Sep 2014 01:14:26 +0000 (18:14 -0700)]
MDL-40697 core: added unit test for grade_deleted event
Mark Nelson [Tue, 26 Aug 2014 01:10:01 +0000 (18:10 -0700)]
MDL-40697 core: added more unit tests for the user_graded event
Mark Nelson [Fri, 26 Sep 2014 03:52:40 +0000 (20:52 -0700)]
MDL-40697 core_grades: trigger the grade_deleted event
Mark Nelson [Mon, 15 Sep 2014 03:46:06 +0000 (20:46 -0700)]
MDL-40697 core_grades: trigger the user_graded event
Mark Nelson [Sat, 27 Sep 2014 00:29:33 +0000 (17:29 -0700)]
MDL-40697 core_grades: removed existing user_graded event triggers
Mark Nelson [Tue, 30 Sep 2014 06:04:02 +0000 (23:04 -0700)]
MDL-40697 core_grades: changed user_graded event name
Mark Nelson [Mon, 22 Sep 2014 04:57:52 +0000 (21:57 -0700)]
MDL-40697 core: added grade_deleted event
Damyon Wiese [Wed, 8 Oct 2014 01:52:17 +0000 (09:52 +0800)]
MDL-28484 Libraries: Update comments to suggest using new is_https()
Damyon Wiese [Wed, 8 Oct 2014 01:53:53 +0000 (09:53 +0800)]
Merge branch 'MDL-28484-master' of https://github.com/lucisgit/moodle
Sam Hemelryk [Wed, 8 Oct 2014 01:35:02 +0000 (14:35 +1300)]
Merge branch 'wip_MDL-47477_m28_jqueryuitheme' of https://github.com/skodak/moodle
Andrew Nicols [Tue, 7 Oct 2014 23:31:49 +0000 (07:31 +0800)]
MDL-46658 gradebook: Fix gradebook behat tests
This issue is a part of the MDL-25544 Epic.
Sam Hemelryk [Wed, 8 Oct 2014 01:31:40 +0000 (14:31 +1300)]
Merge branch 'wip_MDL-47303_m28_jquery' of https://github.com/skodak/moodle
Sam Hemelryk [Wed, 8 Oct 2014 01:10:50 +0000 (14:10 +1300)]
Merge branch 'MDL-47301-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Wed, 8 Oct 2014 01:07:57 +0000 (14:07 +1300)]
Merge branch 'wip-MDL-47299-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Tue, 7 Oct 2014 23:37:09 +0000 (01:37 +0200)]
MDL-47509 Profile restriction: More oracle/text fixes
1) Get rid of "uid" that is a reserved word.
2) Add cross-db support for text columns in the get_condition_sql() method
by adding a new, defaulting to false for BC param and intensively using
the sql_compare_text() helper to build the correct sql fragments.
sam marshall [Thu, 2 Oct 2014 10:11:30 +0000 (11:11 +0100)]
MDL-47509 Profile restriction: Broken Oracle causes problem
Sam Hemelryk [Tue, 7 Oct 2014 23:21:31 +0000 (12:21 +1300)]
Merge branch 'MDL-47470-master' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Tue, 7 Oct 2014 23:01:42 +0000 (12:01 +1300)]
Merge branch 'MDL-47132' of git://github.com/timhunt/moodle
Sam Hemelryk [Tue, 7 Oct 2014 22:52:17 +0000 (11:52 +1300)]
Merge branch 'MDL-47474' of https://github.com/bostelm/moodle
Sam Hemelryk [Tue, 7 Oct 2014 22:51:32 +0000 (11:51 +1300)]
Merge branch 'MDL-47481-master' of https://github.com/sammarshallou/moodle
Sam Hemelryk [Tue, 7 Oct 2014 22:40:49 +0000 (11:40 +1300)]
Merge branch 'MDL-47484' of git://github.com/aolley/moodle
Sam Hemelryk [Tue, 7 Oct 2014 22:37:24 +0000 (11:37 +1300)]
Merge branch 'MDL-47496-master' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Tue, 7 Oct 2014 22:36:01 +0000 (11:36 +1300)]
Merge branch 'wip-MDL-40351-master' of https://github.com/marinaglancy/moodle
Sam Hemelryk [Tue, 7 Oct 2014 22:28:19 +0000 (11:28 +1300)]
Merge branch 'MDL-46182' of https://github.com/NeillM/moodle
Sam Hemelryk [Tue, 7 Oct 2014 22:16:54 +0000 (11:16 +1300)]
Merge branch 'MDL-47197-master' of git://github.com/andrewnicols/moodle
Conflicts:
lib/db/install.xml
lib/db/upgrade.php
version.php
Sam Hemelryk [Tue, 7 Oct 2014 22:02:38 +0000 (11:02 +1300)]
Merge branch 'MDL-47476' of git://github.com/timhunt/moodle
Conflicts:
lib/db/upgrade.php
version.php
Sam Hemelryk [Tue, 7 Oct 2014 21:57:15 +0000 (10:57 +1300)]
Merge branch 'MDL-28075' of git://github.com/timhunt/moodle
Sam Hemelryk [Tue, 7 Oct 2014 21:45:23 +0000 (10:45 +1300)]
Merge branch 'MDL-46391-master' of https://github.com/DmitryNefedov/moodle
Sam Hemelryk [Tue, 7 Oct 2014 21:37:12 +0000 (10:37 +1300)]
Revert "MDL-46978 gradebook: Edit grade item changes visibility of category"
This reverts commit
bad2c9b14f27e6d9a370ac6cff6b8b5c2dc79a17.
Sam Hemelryk [Tue, 7 Oct 2014 20:39:44 +0000 (09:39 +1300)]
MDL-3714 mod_forum: pre-integration clean up
Sam Hemelryk [Tue, 7 Oct 2014 20:39:01 +0000 (09:39 +1300)]
Merge branch 'MDL-3714-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 7 Oct 2014 15:52:07 +0000 (16:52 +0100)]
Merge branch 'MDL-45893-master-v3' of git://github.com/jethac/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Jetha Chan [Fri, 3 Oct 2014 09:02:02 +0000 (17:02 +0800)]
MDL-45893 user_menu: responsive approach; fixed minor issues
Dan Poltawski [Tue, 7 Oct 2014 13:32:48 +0000 (14:32 +0100)]
Merge branch 'MDL-47518' of https://github.com/rlorenzo/moodle
Dan Poltawski [Tue, 7 Oct 2014 13:25:06 +0000 (14:25 +0100)]
Merge branch '46481-28' of git://github.com/samhemelryk/moodle
Marina Glancy [Tue, 7 Oct 2014 09:16:56 +0000 (17:16 +0800)]
Merge branch 'MDL-32870' of git://github.com/jmvedrine/moodle
Dan Poltawski [Tue, 7 Oct 2014 08:24:39 +0000 (09:24 +0100)]
Merge branch 'wip-MDL-35618-master' of git://github.com/marinaglancy/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Frederic Massart [Tue, 7 Oct 2014 02:43:40 +0000 (10:43 +0800)]
MDL-46647 core_grades: Adding tests for fetch_all_helper()
Damyon Wiese [Tue, 7 Oct 2014 04:34:34 +0000 (12:34 +0800)]
Merge branch 'wip-MDL-36014-master' of git://github.com/marinaglancy/moodle
Conflicts:
lib/db/install.xml
lib/db/upgrade.php
version.php
Sam Hemelryk [Tue, 7 Oct 2014 03:28:50 +0000 (16:28 +1300)]
Merge branch 'MDL-46284-master' of git://github.com/andrewnicols/moodle
Conflicts:
lib/db/install.xml
lib/db/upgrade.php
version.php
Eloy Lafuente (stronk7) [Mon, 6 Oct 2014 15:40:12 +0000 (17:40 +0200)]
MDL-46647 grades: Fix fetch_all_helper() towards cross-db
That helper, used to fetch information from DB by all the grade_object
chidren classes was not behaving properly handling TEXT/CLOB columns.
Instead of creating a property within every class listing the
existing columns, it seems to be a better solution to instrospect
the database metadata (cached) to ensure the correct SQL is generated
in every case.