b70c6fcf87
Merge branch 'MDL-49008_lang_vanish_27' of https://github.com/andyjdavis/moodle into MOODLE_27_STABLE
2015-02-24 16:55:08 +08:00
e742ba8b7e
MDL-49008 lang: dont preemptively delete lang packs when updating
2015-02-24 09:18:06 +01:00
8bcfbda511
Merge branch 'MDL-49198_m27' of https://github.com/markn86/moodle into MOODLE_27_STABLE
2015-02-23 16:29:27 +00:00
fd77d51e5d
MDL-48841 admin: Fixed changed string
2015-02-18 16:33:38 +08:00
992a8a42d5
MDL-48841 admin: Behat table row should start with first row
2015-02-18 15:47:46 +08:00
bd3332ff6e
MDL-49198 core_webservice: Fix error when using existing service name
2015-02-17 23:14:29 -08:00
0df2edf254
Merge branch 'MDL-48841-MOODLE_27_STABLE' of git://github.com/lucisgit/moodle into MOODLE_27_STABLE
2015-02-17 14:25:22 +08:00
46471489f5
MDL-48841 admin: Fix scheduled task reset to defaults finctionality.
...
It is safe to make fields as non-required, because form validation will not
pass through any empty field anyway.
2015-02-11 11:13:50 +00:00
19e7fb0ca0
Merge branch 'MDL-48294-27' of git://github.com/jleyva/moodle into MOODLE_27_STABLE
2015-02-09 11:28:22 +00:00
af5f6b7300
MDL-48294 settings: enablemobilewebservice appears twice
2015-02-04 10:26:49 +01:00
d9985cf497
MDL-48920 tool_generator: fix unit tests
2015-02-03 12:39:34 +00:00
cb4f747758
Merge branch 'MDL-48920-27' of git://github.com/FMCorz/moodle into MOODLE_27_STABLE
2015-02-03 16:12:22 +08:00
1ffc405936
Merge branch 'MDL-48914-27' of git://github.com/rtcn2/moodle into MOODLE_27_STABLE
2015-01-28 17:45:01 +08:00
f321e5a222
MDL-48920 tool_generator: Use 'real' names during course generation
2015-01-27 11:27:37 +08:00
4cd289ae45
Merge branch 'MDL-48921-27-2nd' of git://github.com/FMCorz/moodle into MOODLE_27_STABLE
2015-01-27 01:02:58 +01:00
73841c3908
MDL-48914 admin: check maxuserperpage in existingroleholders->find_users
2015-01-23 16:01:46 +00:00
5634dcb828
MDL-48921 admin: Keep the search string in the URL after form submission
2015-01-21 15:50:34 +08:00
90ef484cec
MDL-48823 admin: Just one admin tree reload after settings changes
2015-01-21 10:42:09 +08:00
b5e6324f77
Merge branch 'MDL-48748-27-enfix' of git://github.com/mudrd8mz/moodle into MOODLE_27_STABLE
2015-01-07 17:24:29 +01:00
bdc83459f7
MDL-48748 lang: Merge English strings from the en_fix language pack
2015-01-06 22:01:57 +01:00
7e025d62a0
Merge branch 'MDL-44393-27' of git://github.com/ankitagarwal/moodle into MOODLE_27_STABLE
2015-01-06 12:21:05 +00:00
0b3ae20700
Merge branch 'MDL-48644_restoreLegacyLogs27' of https://github.com/moodlerooms/moodle into MOODLE_27_STABLE
2015-01-05 14:33:04 +08:00
36d4f2016a
MDL-44393 tasks: Add unit tests for cron field validations
2015-01-02 11:02:47 +05:30
a6bd69bb6e
MDL-44393 tasks: Validate cron fields
2015-01-02 11:02:47 +05:30
a4bdf85e8a
MDL-48644 backup tool_log: Fixing coding style
...
Wrap long function definition
to next line.
2014-12-29 11:27:04 -08:00
9549cd267e
Merge branch 'MDL-48224-27' of git://github.com/xow/moodle into MOODLE_27_STABLE
2014-12-22 14:04:29 +00:00
1463260443
MDL-48644 backup: Preserve log IP and time during restore
2014-12-18 11:38:22 -08:00
23fdeb32a5
MDL-48224 cron: Buffer SMTP connections around tasks
2014-12-12 10:39:26 +08:00
f051bed3bc
MDL-48532 core_roles: Set correct heading on user roles page
2014-12-09 14:21:08 +13:00
d9717a12a0
MDL-46618 tool_xmldb: added styles_bootstrapbase.css
2014-11-20 10:50:36 +01:00
52184908fa
MDL-47883 admin: Fix missing string in the plugin validation
2014-10-31 12:59:26 +01:00
5776292b94
MDL-47227 admin: Fix user bulk selection over 1000
2014-10-28 08:52:00 +01:00
9c630abcd7
MDL-47675 phpunit: Update unit tests to pass on MSSQL
...
Unit tests were failing on MSSQL. gc_collect_cycles() was
removed from the phpunit utils.php file to save time in running
the tests, but MSSQL doesn't clean up open files as well as
other databases.
This patch includes the garbage collection for the unit tests
that require it.
2014-10-23 08:54:35 +08:00
a58d2935dd
MDL-46235/MDL-46971 mysql_compress_rows: fix typo
2014-10-14 15:12:01 +01:00
7252078d48
Merge branch 'wip_MDL-46235_m27_innodbtext' of github.com:skodak/moodle into MOODLE_27_STABLE
2014-10-14 12:27:03 +01:00
0914be8afe
MDL-46235 Admin: Fix typos in mysql_compressed_rows.php cli script
2014-10-14 10:04:41 +13:00
8669550962
Merge branch 'MDL-45504_27' of git://github.com/stronk7/moodle into MOODLE_27_STABLE
2014-10-06 15:48:11 +01:00
2e261e4a88
MDL-45504 environment: define 2.8 requirements
...
No changes from 2.7, so this is a simple copy of them.
The MyISAM case (MDL-46064) will be considered for 2.9.
2014-10-06 01:16:28 +02:00
25a487b90a
MDL-47426 assign local roles: rewrite query for better performance.
...
This is an extremely dangerous query, because it includes the user
table twice, along-side two other potentially large tables,
role_assignments and user_enrolments.
The solution is to rewrite the query so that:
1. The subquery is JOINed, not WHERE ... INed. Typically query
optimisers handle the JOIN case better.
2. Before the join was role-assignments <-> users <-> subquery.
That is, everything was linked to u.id.
Now the linking is role-assignments <-> subquery <-> users,
so the SELECT DISTINT eu1_u.id FROM {enrolled users} is central.
That seems to send a strong hint to the query optimiser about
a good order to execute the query.
2014-10-02 17:10:57 +01:00
4a3dd577a9
MDL-47069 admin: Add option to upload required ZIP at the check page
...
The plugins check page displays other plugins that the current one
depends on. Previously, we always displayed the other plugin as a link
to the plugins directory. This did not work well in two scenarios:
* The admin wants/needs to upload the other plugin from the ZIP file
(e.g. it is not available in the plugins directory),
* the other plugin is actually a standard plugin that is not supposed to
be registered with the plugins directory.
This patch displays the Install or Upload or Check for updates links
next to the required plugin instead, as appropriate.
2014-09-25 16:49:05 +02:00
d56c53c90e
Merge branch 'MDL-46811-27' of git://github.com/danpoltawski/moodle into MOODLE_27_STABLE
2014-09-23 16:36:14 +12:00
1d4b21c07d
Merge branch 'MDL-47182-27' of git://github.com/danpoltawski/moodle into MOODLE_27_STABLE
2014-09-23 01:52:21 +02:00
9efa6cf36d
MDL-47182 admin: warn about delayed scheduled tasks
...
Rather than using module cron, use scheduled tasks to work out
if cron has been running recently.
This is not perfect, the admin could disble all tasks, or reschedule
them - but its not complex to compute.
2014-09-16 17:52:10 +01:00
8693c8f373
Merge branch 'MDL-47143_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE
2014-09-15 16:14:02 +08:00
5101f9b131
MDL-46811 update download.moodle.org url to https
...
https is now the prefferd protocol for this site
2014-09-09 16:37:28 +01:00
b5415ecd9d
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.
Conflicts:
admin/tool/behat/tests/behat/data_generators.feature
grade/tests/behat/grade_aggregation.feature
lib/tests/behat/behat_data_generators.php
2014-09-09 14:02:06 +08:00
309c82bf0e
Merge branch 'm27_MDL-47054' of git://github.com/totara/moodle into MOODLE_27_STABLE
2014-09-09 02:19:42 +02:00
55111d2bf4
MDL-45602 behat: add members to cohorts
2014-09-08 13:56:46 +08:00
16ebf7a574
MDL-47143 questions: fix default for question_preview/marks setting.
2014-09-07 12:58:30 +01:00
5c779defab
MDL-47054 theme: fixed issue with the user rtl table
2014-09-04 09:38:42 +12:00
Andrew Nicols