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

19010 Commits

Author SHA1 Message Date
Marina Glancy
bd855fd572 MDL-35468 behat: escape user supplied strings in xpath 2014-09-12 10:23:55 +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
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
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
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
Dan Poltawski
fb385cb7af Merge branch 'MDL-46572_master' of https://github.com/markn86/moodle 2014-09-09 09:18:00 +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
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
Dan Poltawski
205cd43352 Merge branch 'wip-MDL-45602-master' of git://github.com/marinaglancy/moodle 2014-09-08 16:30:33 +01:00
Marina Glancy
70fb279f56 Merge branch 'MDL-47060-master' of git://github.com/damyon/moodle 2014-09-08 12:57:41 +08:00
Marina Glancy
9cc66e866c MDL-45602 behat: add members to cohorts 2014-09-05 16:40:00 +08:00
Damyon Wiese
3a7887baa4 MDL-47060 Atto: Autosave - play nicely with HTML source view. 
There are 2 fixes here:
1. do not overwrite the changes to the HTML source when we do an autosave.
2. Move the Atto notifications alert to the containing div so it aligns properly for either view.
 2014-09-03 15:00:02 +08:00
Marina Glancy
3b4db5bdf5 MDL-44725 dml: added sql_intersect() 2014-09-03 13:33:58 +08:00
sam marshall
002ccdcf49 MDL-44725 Add Behat support for setting grouping condition (14) 
Makes it possible to add a grouping condition when creating an
activity, using the Behat field type API. You can set the field
using a syntax 'Grouping: NAME' (at present, only groupings are
supported, obviously we could potentially extend this to add
support for other conditions if needed).

Tested in Firefox and Chrome in JS mode, and in non-JS mode.
 2014-09-02 13:03:35 +01:00
sam marshall
61c3b60c03 MDL-44725 Update cm_info::create to allow 'false' param (13) 
Currently cm_info::create allows the 'null' parameter, and
returns null (as a null $cm should still be null when treated
as a cm_info object).

Some unit tests relied on the value 'false' being treated
the same as null in this regard. This seems like a generally
safe assumption (given this is a function about changing
weakly typed data into a stronger type) so I modified the
function to accept anything PHP false, returning null.
 2014-09-02 13:03:33 +01:00
sam marshall
9c85baa8c5 MDL-44725 Availability: Replace groupmembersonly - FEATURE_xx (6) 
Remove old FEATURE_GROUPMEMBERSONLY as no longer required.
 2014-09-02 13:03:17 +01:00
sam marshall
48c79eb3e9 MDL-44725 Availability: Replace groupmembersonly - login (5) 
Remove groupmembersonly option from require_login.

NOTE: This code, and another branch (both related to login when
accessing activities on the site course), are not actually
necessary because there is code above which already checks
$cm->uservisible.

NOTE: You can see this change more simply by doing
git diff --ignore-space-change; indent was altered.
 2014-09-02 13:03:15 +01:00
sam marshall
061e6b2864 MDL-44725 Availability: Replace groupmembersonly - upgrade, core (1) 
* Upgrades existing data so that the groupmembersonly option is
  replaced with equivalent data for the new availability API.
* Removes the database field and admin setting used for
  groupmembersonly.
* Changes core modinfo library to remove/deprecate groupmembersonly
  data and functions.
* Changes other core library files to remove groupmembersonly
  references.

Includes deprecation of several functions, listed in lib/upgrade.txt.
 2014-09-02 13:03:07 +01:00
Eloy Lafuente (stronk7)
f034d6d113 Merge branch 'MDL-43639_updatePassEveryLogin' of https://github.com/moodlerooms/moodle 2014-09-02 01:07:36 +02:00
Michael Aherne
38b8d3e7f1 MDL-47012 core_enrol: remove desc and fix alias from ordering 2014-09-01 10:10:27 +01:00
Damyon Wiese
37b0059539 Merge branch 'wip-MDL-46540-master' of git://github.com/marinaglancy/moodle 2014-09-01 16:08:19 +08:00
Marina Glancy
6bb1f0bf4c MDL-46540 stats: missing include file 
Thanks to Vadim Dvorovenko for finding a bug and providing a solution
 2014-09-18 03:40:54 +08:00
Marina Glancy
d0a9fa02e4 Merge branch 'MDL-46861' of https://github.com/Lightwork-Marking/moodle 2014-09-01 16:06:22 +08:00
Matteo Scaramuccia
cfa5bd1f3f MDL-46985 Added 7-Zip and RAR MIME types. 2014-08-31 22:33:28 +02:00
Paul Charsley
352f3f4797 MDL-46861 added missing required field areaname 2014-08-29 09:42:54 +12:00
Rajesh Taneja
3c7bfae29c MDL-46572 behat: extended table head look up to check if header is link 
Header can be a link, this step will now look if
header has a text or header link has the text

Part of MDL-46191
 2014-08-28 13:06:45 -07:00
Eloy Lafuente (stronk7)
934a22a333 Merge branch 'm28_MDL-46875' of https://github.com/totara/moodle 2014-08-27 01:41:58 +02:00
Damyon Wiese
6d9a83c294 Revert "Merge branch 'MDL-46917-master' of git://github.com/andrewnicols/moodle" 
This reverts commit acbcea51013bdf5d0101dc5856d8aca97bf1c036, reversing
changes made to 91f31c097dd46674d8535096e020ffa42536e854.
 2014-08-26 17:18:03 +08:00
Damyon Wiese
112632ed58 Merge branch 'wip_MDL-46235_m28_innodbtext' of https://github.com/skodak/moodle 2014-08-26 12:28:47 +08:00
Damyon Wiese
a564a66efa Merge branch 'MDL-46509' of https://github.com/danielneis/moodle 2014-08-26 11:45:43 +08:00
Brian Barnes
24af352b40 MDL-46875 tinymce: Fixed issue with full screen and spelling 2014-08-26 13:19:43 +12:00
Damyon Wiese
acbcea5101 Merge branch 'MDL-46917-master' of git://github.com/andrewnicols/moodle 2014-08-25 16:54:47 +08:00
Damyon Wiese
a88770d7eb Merge branch 'MDL-46923_master' of git://github.com/markn86/moodle 2014-08-25 16:48:27 +08:00
Damyon Wiese
4da7f20610 Merge branch 'wip_MDL-43918_m28_cm' of https://github.com/skodak/moodle 2014-08-25 16:45:15 +08:00
Marina Glancy
cf2d4159b7 Merge branch 'MDL-46191-master' of git://github.com/FMCorz/moodle 2014-08-25 15:43:29 +08:00
Frederic Massart
07f827acd4 MDL-46191 gradereport_history: Final clean up for integration 2014-08-25 14:53:28 +08:00
Marina Glancy
241d1d42cf Merge branch 'MDL-46904-master' of git://github.com/damyon/moodle 2014-08-25 14:45:05 +08:00
Petr Skoda
a45d54b8cb MDL-46235 ddl: add support for large number of text fields in one database table 2014-08-25 12:40:57 +12:00
Petr Skoda
b6f299bb69 MDL-43918 add more validation to $modulename parameter when fetching cms 2014-08-25 12:09:54 +12:00
Andrew Nicols
1b8f073de3 MDL-46917 atto: Focus on the editor when the form label is selected 2014-08-22 08:58:21 +08:00
Daniel Neis Araujo
b5a289c4e8 MDL-46509 enrol: Require 'enrol/PLUGIN:config' capabilities to show/hide enrollment instances 2014-08-21 19:01:57 -03:00
Eloy Lafuente (stronk7)
52953ff948 MDL-46918 ddl: cover behavior with unit test 2014-08-21 18:33:23 +01:00
Tim Hunt
5dc266d980 MDL-46918 ddl: fix error when renaming table already exists 2014-08-21 18:33:22 +01:00