21044 Commits

Author SHA1 Message Date
Andrew Nicols
887785db42 Merge branch 'wip-mdl-51881' of https://github.com/rajeshtaneja/moodle 2016-01-05 14:08:18 +08:00
Rajesh Taneja
66fe88db93 MDL-51881 behat: Set navbar to be absolutely positioned
All behat drivers are now replicating human behavior
so when the browser scrolls something into view it doesn't account
for fixed positioned elements that end up obscuring the item thus
leading to errors that could be avoided by scrolling an additional amount.
2016-01-05 13:59:45 +08:00
Andrew Nicols
8b198577e2 Merge branch 'MDL-52078-master' of git://github.com/cameron1729/moodle 2016-01-05 13:53:58 +08:00
Dan Poltawski
5a0331e2d8 Merge branch 'MDL-49231-master' of git://github.com/jleyva/moodle 2016-01-04 10:51:05 +00:00
Peter Miller
f3460b0fc6 MDL-52078 gradebook: Stop totals including hidden items.
This patch fixes a problem where the course and user reports, when viewed by
a student, were incorrectly including hidden grade items in the course totals,
making the percentages lower than they should be.
2016-01-04 17:53:06 +08:00
Andrew Nicols
23079c2941 Merge branch 'MDL-49566_master' of git://github.com/markn86/moodle 2016-01-04 13:53:40 +08:00
Frederic Massart
bca824f7a8 MDL-49231 mod_glossary: Update service definition 2015-12-31 15:18:40 +01:00
Frederic Massart
fe11f9a4f6 MDL-49231 mod_glossary: External function get_entries_by_letter 2015-12-31 15:18:36 +01:00
Frederic Massart
61fce28459 MDL-49231 mod_glossary: External function view_entry 2015-12-31 15:18:36 +01:00
Frederic Massart
d0d4372ce7 MDL-49231 mod_glossary: External function view_glossary 2015-12-31 15:18:13 +01:00
Dan Poltawski
53a2405c9c MDL-50357 groups: remove pointless option of groups_delete_group_members 2015-12-30 09:19:22 +00:00
Mark Nelson
be5e0110ff MDL-49566 core: used reflection in unit tests
Also split the tests into multiple functions for each scenario.
2015-12-29 17:42:43 +08:00
David Monllao
1c042d38ea Merge branch 'MDL-52530' of git://github.com/eugeneventer/moodle-fixes 2015-12-29 14:05:42 +08:00
Ankit Agarwal
bef0d6b052 MDL-49566 core: Write unittests for MDL-45898 2015-12-29 11:22:42 +08:00
Ankit Agarwal
d955a20926 MDL-49566 myprofile: Fix bugs in myprofilelib 2015-12-29 11:22:42 +08:00
David Monllao
97f4eb11a5 Merge branch 'MDL-50428-master' of git://github.com/jleyva/moodle
Conflicts:
	mod/scorm/version.php
	version.php
2015-12-29 10:46:52 +08:00
Andrew Nicols
3dc5cdf543 Merge branch 'MDL-52060-master-arn' of https://github.com/andrewnicols/moodle 2015-12-23 09:08:48 +08:00
Andrew Nicols
46c18e0dd2 MDL-52060 phpunit: Add tests for test_set_table_modified_by_sql 2015-12-23 09:08:06 +08:00
Eugene Venter
8ef4fbc64f MDL-52530 unittest: more robust capability assignments for guest
for core_files_file_storage_testcase and core_repositorylib_testcase
2015-12-23 09:24:53 +13:00
Eloy Lafuente (stronk7)
c38bdd62c7 Merge branch 'MDL-51719-master' of git://github.com/danpoltawski/moodle 2015-12-22 13:07:01 +01:00
David Monllao
febc314895 Merge branch 'MDL-51886-master' of git://github.com/dpalou/moodle
Conflicts:
	version.php
2015-12-22 16:28:18 +08:00
David Monllao
a96bf448b8 Merge branch 'MDL-52073-master' of git://github.com/jleyva/moodle
Conflicts:
	version.php
2015-12-22 16:23:33 +08:00
Rajesh Taneja
e487a51db3 MDL-52060 phpunit: Keep track of modified database for reset
Keep list of modified tables, so they can be reset
without any guess work
2015-12-22 15:37:40 +08:00
Mark Nielsen
e61a9638f1 MDL-52060 phpunit: Improve get_message_processors reset 2015-12-22 13:40:39 +08:00
Mark Nielsen
d494306de7 MDL-52060 phpunit: Prevent querying database metadata 2015-12-22 13:40:38 +08:00
Rajesh Taneja
22d55b3950 MDL-52060 phpunit: Check file only if needed 2015-12-22 13:19:06 +08:00
Rajesh Taneja
44121fbdc9 MDL-52060 phpunit: Keep track of initial reset sequence 2015-12-22 13:19:06 +08:00
David Monllao
39604f212e Merge branch 'MDL-52558-master' of git://github.com/sammarshallou/moodle 2015-12-22 11:16:36 +08:00
Rajesh Taneja
c2df9b3b90 MDL-52427 behat: Fixed question selectors
As class is changed, we need to convert selector
to check if class is contained, rather then checking
selecting with specific class.
2015-12-22 10:43:22 +08:00
Dan Poltawski
bf47ce5050 Merge branch 'MDL-52380-master' of git://github.com/junpataleta/moodle 2015-12-21 16:47:18 +00:00
Dan Poltawski
43fcd55e0c Merge branch 'MDL-52354-master' of git://github.com/junpataleta/moodle 2015-12-21 16:45:15 +00:00
Dan Poltawski
07f8dd4314 Merge branch 'MDL-52399-master' of git://github.com/jleyva/moodle 2015-12-21 12:45:30 +00:00
David Monllao
a49fd98349 MDL-52226 tests: Fix behat phpunit naming conflict 2015-12-21 16:27:23 +08:00
Dani Palou
557b58b099 MDL-51886 wiki: New WS mod_wiki_view_wiki and mod_wiki_view_page 2015-12-21 08:19:24 +01:00
David Monllao
f08d1590c8 Merge branch 'MDL-52226-master' of git://github.com/sammarshallou/moodle 2015-12-21 14:41:21 +08:00
sam marshall
92cce140ed MDL-52558 Data generator: enrol_user should allow shortname 2015-12-18 11:01:15 +00:00
Shamim Rezaie
e83bcc1050 MDL-52380 mod_forum: Non-Gregorian dates in forum advance search
Convert the fromdate and todate date parts to Gregorian before passing them to make_timestamp
2015-12-17 18:00:57 -06:00
Shamim Rezaie
40a6393ea5 MDL-52354 select_time: Make select_time respect the set calendar type
The select_time method updated to display form elements in accordance
to the calendar type plugin that is in use.
2015-12-17 17:58:39 -06:00
Shamim Rezaie
2bb196ebe3 MDL-52354 select_time: Make select_time respect the set calendar type
The select_time method updated to display form elements in accordance
to the calendar type plugin that is in use.
2015-12-17 15:48:27 -06:00
Marina Glancy
8638b3f144 MDL-52286 core: mute erros in adodb destructor 2015-12-15 12:36:02 +08:00
Dan Poltawski
99436d38ff Merge branch 'MDL-52451-master' of git://github.com/marinaglancy/moodle 2015-12-14 10:46:29 +00:00
Marina Glancy
6d9641f5b0 MDL-52286 core: corrected version of adodb to 5.20.1 2015-12-14 18:10:24 +08:00
Marina Glancy
cc3048eb41 MDL-52286 core: several fixes to ADOdb 2015-12-14 18:06:22 +08:00
Dan Poltawski
bca69f937c Merge branch 'MDL-52499-master' of git://github.com/marinaglancy/moodle 2015-12-14 09:44:16 +00:00
Dan Poltawski
e42b60351e Merge branch 'MDL-52487_master' of git://github.com/dmonllao/moodle 2015-12-14 09:23:03 +00:00
David Monllao
abc4e1efed MDL-52487 rss: PHP 7 compatible error supression
PHP5 used to update error_reporting to 0 on functions called with the
suppress errors operator (@). In PHP7 it is not updated.

Credit to Rajesh Taneja.
2015-12-14 15:28:37 +08:00
Marina Glancy
479950d431 MDL-52499 core: link to php7 documentation 2015-12-14 12:51:20 +08:00
Marina Glancy
e6ee56a0e4 MDL-52451 forms: replace deprecated function 2015-12-14 12:43:03 +08:00
Dan Poltawski
b12b03de85 Merge branch 'wip-MDL-52286-master' of https://github.com/marinaglancy/moodle 2015-12-11 08:57:57 +00:00
David Monllao
3e702b5855 Merge branch 'MDL-52361-master' of git://github.com/marinaglancy/moodle 2015-12-11 14:49:15 +08:00