mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-03 07:22:39 +02:00
Code Issues Projects Releases Wiki Activity
79,773 Commits 36 Branches 528 Tags
Commit Graph

1432 Commits

Author SHA1 Message Date
Dan Poltawski
16d7b6b133 Merge branch 'MDL-55196_master' of https://github.com/andrewhancox/moodle 2016-08-15 12:00:47 +01:00
Andrew Nicols
0b490a1091 Merge branch 'MDL-41126_master' of git://github.com/dg711/moodle 2016-08-10 12:25:45 +08:00
Devang Gaur
2ac7ea8670 MDL-41126 mod_data: optimised data entry generator 2016-08-10 07:58:12 +05:30
Rajesh Taneja
b68de8cfe7
MDL-52230 mod_data: Fixed fieldname key for number field 
AMOS BEGIN
 MOV [namedate, mod_data],[fieldtypelabel, datafield_date]
 MOV [namefile, mod_data],[fieldtypelabel, datafield_file]
 MOV [namecheckbox, mod_data],[fieldtypelabel, datafield_checkbox]
 MOV [namelatlong, mod_data],[fieldtypelabel, datafield_latlong]
 MOV [namemenu, mod_data],[fieldtypelabel, datafield_menu]
 MOV [namemultimenu, mod_data],[fieldtypelabel, datafield_multimenu]
 MOV [namenumber, mod_data],[fieldtypelabel, datafield_number]
 MOV [namepicture, mod_data],[fieldtypelabel, datafield_picture]
 MOV [nameradiobutton, mod_data],[fieldtypelabel, datafield_radiobutton]
 MOV [nametext, mod_data],[fieldtypelabel, datafield_text]
 MOV [nametextarea, mod_data],[fieldtypelabel, datafield_textarea]
 MOV [nameurl, mod_data],[fieldtypelabel, datafield_url]
AMOS END
 2016-08-10 09:50:21 +08:00
Andrew Hancox
be8c6766fd MDL-55196 mod_data: Refactor import to use update_content function 2016-08-09 09:57:27 +01:00
Dan Poltawski
c728048846 Merge branch 'wip-MDL-52230-master' of git://github.com/abgreeve/moodle 2016-08-09 09:49:38 +01:00
Andrew Hancox
421b2d44fe MDL-52230 mod_data: Take fieldname from field:name() 
AMOS BEGIN
 CPY [namedate, mod_data],[fieldtypelable, datafield_date]
 CPY [namefile, mod_data],[fieldtypelable, datafield_file]
 CPY [namecheckbox, mod_data],[fieldtypelable, datafield_checkbox]
 CPY [namelatlong, mod_data],[fieldtypelable, datafield_latlong]
 CPY [namemenu, mod_data],[fieldtypelable, datafield_menu]
 CPY [namemultimenu, mod_data],[fieldtypelable, datafield_multimenu]
 CPY [namenumber, mod_data],[fieldtypelable, datafield_number]
 CPY [namepicture, mod_data],[fieldtypelable, datafield_picture]
 CPY [nameradiobutton, mod_data],[fieldtypelable, datafield_radiobutton]
 CPY [nametext, mod_data],[fieldtypelable, datafield_text]
 CPY [nametextarea, mod_data],[fieldtypelable, datafield_textarea]
 CPY [nameurl, mod_data],[fieldtypelable, datafield_url]
AMOS END
 2016-08-09 16:22:00 +08:00
Andrew Nicols
8173c3ef7f Merge branch 'wip-mdl-55329' of https://github.com/rajeshtaneja/moodle 2016-08-09 14:26:09 +08:00
Rajesh Taneja
e259795c4f
MDL-55329 behat: PyStrings should end with : (colon) 2016-08-09 14:22:21 +08:00
Andrew Nicols
19491e68fe MDL-41126 mod_data: Add type hinting 2016-08-09 12:49:01 +08:00
Andrew Nicols
d5bd76f4e5 MDL-41126 mod_data: Styling fixes 2016-08-09 12:49:01 +08:00
Rajesh Taneja
9f2b916dee
MDL_41126 phpunit: Timestamp should be less than 2038 
http://php.net/manual/en/datetime.gettimestamp.php#114590
In 32-bit system the unix timestamp will overflow if the date goes beyond year 2038
and this method will return false.
 2016-08-09 10:50:07 +08:00
Devang Gaur
400eb2d0e5 MDL-41126 mod_data: added field and entry generator 2016-08-05 04:08:50 +05:30
Dan Poltawski
773a11519d Merge branch 'MDL-55278_master' of https://github.com/dmonllao/moodle 2016-07-26 11:57:09 +01:00
David Monllao
fa2e488520 Merge branch 'MDL-55254_m32v3' of https://github.com/sbourget/moodle 2016-07-26 04:27:48 +08:00
Stephen Bourget
c4b70cfc61 MDL-55255 mod_data: prevent direct script access to lib files. 2016-07-25 09:39:57 +01:00
Stephen Bourget
12306a9f0f MDL-55254 mod_data: Add view permissions 2016-07-24 21:00:57 -04:00
David Monllao
0bd8383a8b MDL-55278 search: Updating references to area namespace 2016-07-21 18:38:18 +02:00
David Monllao
2f8da1e814 Merge branch 'MDL-55158_m32v3' of https://github.com/sbourget/moodle 2016-07-19 00:50:41 +02:00
Stephen Bourget
87d6e85a9a MDL-55158 mod_data: Add calendar events for database activities 2016-07-18 18:35:37 -04:00
Adrian Greeve
d58f3a4d2a MDL-54962 mod_data: Approval status is now translated. 
It was using hardcoded English. Now it uses get_string.
 2016-07-08 10:53:39 +08:00
Juan Leyva
7ef49bd393 MDL-54951 webservice: Return intro text files in modules 2016-07-04 09:24:28 +01:00
Stephen Bourget
316f20a0b6 MDL-54910 mod_data: Open dates should be before close dates 2016-06-23 17:32:19 -04:00
Dan Poltawski
c6eddafcad MDL-54654 mod_data: fix invalid css for image gallery preset 2016-06-16 20:52:04 +01:00
Dan Poltawski
0fd08fc7e5 Merge branch 'MDL-35628' of https://github.com/mr-russ/moodle 2016-06-16 09:04:12 +01:00
Dan Poltawski
88b0045106 Merge branch 'MDL-54562_master' of git://github.com/dmonllao/moodle 2016-06-13 09:17:49 +01:00
Russell Smith
1fcf0ca8a5 MDL-35628 performance: Remove dirname() where possible. 
dirname() is a slow function compared with __DIR__ and using
'/../'.  Moodle has a large number of legacy files that are included
each time a page loads and is not able to use an autoloader as it is
functional code.  This allows those required includes to perform as
best as possible in this situation.
 2016-06-10 08:06:49 +10:00
David Monllao
0196f0101c Merge branch 'wip-MDL-45427-master' of git://github.com/abgreeve/moodle 2016-05-30 10:19:24 +08:00
Adrian Greeve
43c762ef10 MDL-45427 mod_data: Inserting tags into templates. 
Allows tags to be inserted into the editor without
having to touch Atto at all.
 2016-05-25 15:24:41 +08:00
David Monllao
e5fa1c5781 MDL-54562 mod_data: Add activities info to search 2016-05-23 16:06:00 +08:00
Eloy Lafuente (stronk7)
4da854a68b MDL-54677 upgrade: add 3.1.0 separation line to all upgrade scripts 2016-05-23 01:31:34 +02:00
Eloy Lafuente (stronk7)
1abca11e0a MDL-54638 versions: bump all versions and requires near release 
version = 2016052300 release version
requires= 2016051900 current rc1 version
 2016-05-19 02:16:15 +02:00
Mark Nelson
2c216a6c39 MDL-54125 mod_data: fixed PHP notice 
Also removed unused variables.
 2016-05-11 13:01:24 +08:00
Adrian Greeve
4937a0616f MDL-53402 mod_data: field values of 0 are now displayed. 2016-05-03 14:22:16 +08:00
Adrian Greeve
9b5cf165b4 MDL-53402 mod_data: Added custom validation code for data fields. 
Added custom validation to radiobutton, menu, and checkbox.
 2016-05-03 12:48:00 +08:00
Adrian Greeve
3829d1e2c8 MDL-53402 mod_data: Behat test for entering zero in required fields. 2016-05-02 13:24:01 +08:00
Adrian Greeve
8611d1dfc7 MDL-53402 mod_data: Required fields can contain 0. 
The number and text field would not accept 0 as a
valid response.
 2016-05-02 13:24:01 +08:00
Rajesh Taneja
eb9ca848fa MDL-53381 behat: Replaced chained steps with api. 
Behat 3.x doesn't support chained steps and hence
this is first step to get rid of chained steps in core.
 2016-04-06 11:32:49 +08:00
Dan Poltawski
93c9c9a86b Merge branch 'wip-MDL-49861-master' of git://github.com/abgreeve/moodle 2016-04-04 12:10:17 +01:00
Adrian Greeve
f27ca9451f MDL-49861 mod_data: Behat step to test adding records. 
Clicking 'Save and add another' should clear the form.
 2016-03-30 16:22:49 +08:00
Adrian Greeve
c18ad4afd6 MDL-49861 mod_data: Save and add another button clears fields. 2016-03-30 16:18:50 +08:00
Adrian Greeve
85974a83ba MDL-53538 mod_data: Unit test for data_get_advance_search_ids 2016-03-22 14:22:27 +08:00
Adrian Greeve
53934bd0a9 MDL-53538 mod_data: Show no records message instead of error. 
When there are no records in the database module and a user
does an advanced search. Show a message that there are no entries
in the database.
 2016-03-22 14:22:26 +08:00
Dan Poltawski
4539892cda MDL-53149 mod_data: update backup and webservices for timemodified 
Amended to add support for standard restore apply_date_offset().
 2016-03-15 23:41:55 +01:00
Dan Poltawski
b174e9efa6 MDL-53149 mod_data: add timemodified field to db schema 2016-03-15 23:31:32 +01:00
Rajesh Taneja
e01012e96d MDL-46891 behat: Driver specific fixes. 
1. Browserkit doesn't handle [] in name
2. Grades are not visible in viewport and might fail
   with few drivers, increasing size of window to ensure
   grades are visible and can be modified.
3. Click edit first to see grade link
4. Expand fields before setting value
5. Updated xpath, as crawler update it.
6. Hover fails to show icon
 2016-03-11 10:51:16 +08:00
Rajesh Taneja
42ad096fdb MDL-46891 Behat: Added support for behat 3 2016-03-11 10:51:15 +08:00
David Monllao
c17e0034a1 Merge branch 'MDL-50032-master' of git://github.com/jleyva/moodle 2016-03-09 10:55:18 +08:00
Cameron Ball
1688564a6e MDL-52651 htmlpurifier: Append rel=noreferrer to links. 
Thank you to Zachary Durber for originally working on this issue.
 2016-03-08 02:05:55 +01:00
David Mudrák
a5fae3b0d2 MDL-52727 mod_data: Improve output of the form fields values 
This issue mostly affects the search form fields. Submitted values for
these fields are typically obtained via optional_param() with
PARAM_NOTAGS specified as the parameter type - see parse_search_field()
methods. Such values themselves are not safe enough to be printed back
directly into the HTML as they might contain malicious code.

While working on the patch, some other places with weak protection were
detected and fixed.

In case of the itemid parameters, explicit clean_param() is added to
make sure we cast the value as an integer. That should make the s()
unnecessary but it was added anyway as an extra protection (just in case
the code flow changes or the parts of the code are re-used elsewhere).
 2016-03-07 22:08:46 +01:00