Sam Hemelryk
70b370982f
Merge branch 'MDL-47476' of git://github.com/timhunt/moodle
...
Conflicts:
lib/db/upgrade.php
version.php
2014-10-08 11:02:38 +13:00
Sam Hemelryk
93fad868d9
Revert "MDL-46978 gradebook: Edit grade item changes visibility of category"
...
This reverts commit bad2c9b14f
.
2014-10-08 10:37:12 +13:00
Dan Poltawski
99675668b4
Merge branch 'MDL-45893-master-v3' of git://github.com/jethac/moodle
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2014-10-07 16:52:07 +01:00
Jetha Chan
854a647e62
MDL-45893 user_menu: responsive approach; fixed minor issues
2014-10-07 23:31:47 +08:00
Dan Poltawski
08abbd61c2
Merge branch 'wip-MDL-35618-master' of git://github.com/marinaglancy/moodle
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2014-10-07 09:24:39 +01:00
Frederic Massart
26331e3d17
MDL-46647 core_grades: Adding tests for fetch_all_helper()
2014-10-07 15:23:05 +08:00
Damyon Wiese
4a813f3959
Merge branch 'wip-MDL-36014-master' of git://github.com/marinaglancy/moodle
...
Conflicts:
lib/db/install.xml
lib/db/upgrade.php
version.php
2014-10-07 12:34:34 +08:00
Sam Hemelryk
94cdabcdee
Merge branch 'MDL-46284-master' of git://github.com/andrewnicols/moodle
...
Conflicts:
lib/db/install.xml
lib/db/upgrade.php
version.php
2014-10-07 16:28:50 +13:00
Eloy Lafuente (stronk7)
eadcdee936
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.
2014-10-07 10:44:08 +08:00
Andrew Nicols
27f7487f82
MDL-47197 core: Private files handler
...
This issue is a part of the MDL-47194 Task.
This issue is a part of the MDL-39707 Epic.
2014-10-07 10:01:19 +08:00
Andrew Nicols
776b4acc81
MDL-46284 core: Add e-mail fetcher from IMAP
...
This issue is a part of the MDL-47194 Task.
This issue is a part of the MDL-39707 Epic.
2014-10-07 10:01:19 +08:00
Andrew Nicols
77c0a68db9
MDL-46284 core: Add e-mail fetcher from IMAP
...
This issue is a part of the MDL-47194 Task.
This issue is a part of the MDL-39707 Epic.
2014-10-07 09:58:35 +08:00
Petr Skoda
41186f4f80
MDL-41593 admin: use default setting if preventexecpath active
...
This resolves problems when installing Moodle
and addons when preventexecpath active.
Please note the admin_setting_configfile is still
incorrectly restricted - this will be resolved by
MDL-40949.
2014-10-07 11:30:08 +13:00
Sam Hemelryk
f46606936a
Merge branch 'MDL-46978' of https://github.com/danielneis/moodle
2014-10-07 10:26:05 +13:00
Dan Poltawski
f5bacd6539
Merge branch 'wip-MDL-46576-master' of git://github.com/abgreeve/moodle
...
Conflicts:
lib/upgrade.txt
lib/db/upgrade.php
version.php
2014-10-06 18:06:13 +01:00
Dan Poltawski
fb991204a9
Merge branch 'MDL-46054-master' of git://github.com/jleyva/moodle
2014-10-06 16:01:26 +01:00
Marina Glancy
b79d2e2c08
Merge branch 'wip_MDL-47538_m28_phpunitseq' of git://github.com/skodak/moodle
2014-10-06 20:40:13 +08:00
Marina Glancy
e286185334
Merge branch 'MDL-47221-master' of git://github.com/danpoltawski/moodle
2014-10-06 20:38:29 +08:00
Petr Skoda
ddffa9d6d3
MDL-47538 phpunit: fix invalid PHPUNIT_SEQUENCE_START constant
2014-10-06 17:31:15 +13:00
Andrew Nicols
ee7432b32c
MDL-46531 editor_atto: Color plugins should use classes rather than hardcoded colours
2014-10-06 12:07:31 +08:00
Adrian Greeve
aa60bda9f4
MDL-46547 gradebook: grade import plugin for drag and drop.
...
This allows information to be dragged and dropped directly into a
form to be imported into the gradebook.
2014-10-06 09:14:04 +08:00
Eloy Lafuente (stronk7)
37c99c3237
MDL-47536 timezones: update to 2014h (2296 rules)
2014-10-06 01:53:48 +02:00
Sam Hemelryk
127ef54082
Merge branch 'MDL-45374' of git://github.com/jleyva/moodle
2014-10-06 10:44:30 +13:00
Dan Poltawski
a90674fc9c
MDL-47496 lib: remove XML_Parser library
...
It has been flagged as deprecated for many years and no longer used.
2014-10-05 14:28:33 +01:00
Dan Poltawski
ab7fa55694
MDL-47470 behat: fix 'I navigate to' exception
...
When a child page is not found
2014-10-05 14:28:15 +01:00
Dan Poltawski
16078807f8
MDL-47221 task: allow 'random' time definitions
...
When working against external services it can be advantageous to not
have automated tasks all hit the service at the exact same time from
many different installations.
This change allows the use of 'R' in hour/minute fields of the scheduled
task definition so a task will be installed with a 'random' hour/minute
value for these sort of occasions.
Note that the task will be installed in the database with a defined
time, this simply randomises the time chosen when loading from the
definiton.
2014-10-05 14:27:04 +01:00
Julien Boulen
0556eaa9b0
MDL-46984 core_course: added grouping name for activities with no link
2014-10-03 13:10:01 -07:00
Juan Leyva
6ff4464b43
MDL-45374 messages: get_messages ws unit tests
2014-10-03 16:37:13 +02:00
Juan Leyva
aff9da176a
MDL-45374 messages: get_messages ws definition
2014-10-03 16:37:12 +02:00
Juan Leyva
da1be050bc
MDL-47084 forum: New moodle_url method make_webservice_pluginfile_url
2014-10-03 16:34:48 +02:00
Juan Leyva
2ce8934b35
MDL-46458 forum: New WS get_forum_discussions_paginated services
2014-10-03 16:34:00 +02:00
Tony Butler
1e31f11852
MDL-28484 core_lib: Add function for https detection
...
Signed-off-by: Tony Butler <tonyjbutler@gmail.com>
2014-10-03 13:02:29 +01:00
Marina Glancy
58b5b04d4b
MDL-35618 enrol_cohort: remove enrolment button
2014-10-03 18:28:48 +08:00
Marina Glancy
80f98467f8
MDL-36014 cohorts: Allow teachers to view cohorts
...
Added property 'visible' for cohorts. Unsetting it hides the cohort from users in the course.
AMOS BEGIN
CPY [visible,core_moodle],[visible,core_cohort]
AMOS END
2014-10-03 18:26:34 +08:00
Neill Magill
a2aac5147d
MDL-46182 Inefficient query during Moodle upgrade on course_section table.
...
This part of the code is changing an index on the course_sections table to be unique, for this to happen in the upgrade script the index must be deleted and then the new version added.
Before this change the following was being done:
* The index is removed
* A query to delete records that were not unique on this index is performed
* The unique version of the index is added
After this change the following happens:
* A query to delete records that were not unique on this index is performed
* The index is removed
* The unique version of the index is added
When the original index is present the query uses it, which greatly improves the execution plan.
Before the change an upgrade on a site with around 387967 course_section records the upgrade would be stuck on the delete query for many hours, after the change the time can be measured in minutes.
2014-10-03 10:27:06 +01:00
Adrian Greeve
102c1c3671
MDL-46576 core_grades: Update upgrade scripts new version number
2014-10-03 17:06:42 +08:00
Damyon Wiese
a9937aec06
MDL-47062 Grades: Add an upgrade step to warn about changes in upgrade.
...
Puts a notice on the grader report about the change in aggregation method
from "Sum of grades" to "Natural".
Part of: MDL-46576
2014-10-03 17:06:41 +08:00
Marina Glancy
ccff58daee
MDL-47299 libraries: upgrade PHPMailer to 5.2.8
2014-10-03 16:44:42 +08:00
Jetha Chan
6da0e4cfff
MDL-45893 user_menu: based on action_menu, new responsive approach
2014-10-03 15:12:59 +08:00
Marina Glancy
97329f1bc1
MDL-47492 behat: refer to table column indexes instead of names
2014-10-03 13:55:25 +08:00
Frederic Massart
0b2e8ae07b
MDL-47430 core_grades: Handle negative grademin with natural weighting
...
Part of: MDL-46576
2014-10-03 13:55:24 +08:00
Damyon Wiese
11c93e286b
MDL-47110 Grades: Get the autoupdateweight behat tests to pass.
...
Part of: MDL-46576
2014-10-03 13:55:24 +08:00
Damyon Wiese
e61f25a4f8
MDL-47110 Grades: Change how updated weights notifications are detected.
...
Part of: MDL-46576
2014-10-03 13:55:24 +08:00
Adrian Greeve
f70da024c8
MDL-47110 core_grades: Update to auto_adjust_weights
...
Part of: MDL-46576
2014-10-03 13:55:24 +08:00
Adrian Greeve
519429b24f
MDL-47110 core_grades: Normalisation of grade weights.
...
This includes behat tests for this change.
Part of: MDL-46576
2014-10-03 13:55:24 +08:00
Frederic Massart
64055d50bc
MDL-47377 core_grades: Handle items with a weight of 0
...
They do not contribute to the category/course total any more.
Part of: MDL-46576
2014-10-03 13:55:24 +08:00
Damyon Wiese
c529f4b30f
MDL-47420 Grades: Get unit tests passing on natural grading branch
...
Part of: MDL-46576
2014-10-03 13:55:24 +08:00
Damyon Wiese
6077a4d43b
MDL-47064 Grades: Final fix - set the grademax from the item, not the cat
...
Part of: MDL-46576
2014-10-03 13:55:23 +08:00
Damyon Wiese
ee07a54be0
MDL-47064 Grades: Peer review cleanups
...
Changes include:
* Search for existing items to reduce DB queries in grade_category::aggregate_grades
* Comments improvements
* Move brackets to be part of lang string
* Convert aggregationhints to be a class variable instead of passing it around
Part of: MDL-46576
2014-10-03 13:55:23 +08:00
Damyon Wiese
6070e53313
MDL-47064 Grades: Add comments to explain this tricky code.
...
Part of: MDL-46576
2014-10-03 13:55:23 +08:00