mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-26 18:42:40 +01:00
Code Issues Projects Releases Wiki Activity
82,508 Commits 36 Branches 527 Tags
Commit Graph

1743 Commits

Author SHA1 Message Date
Andrew Nicols
64ad7319ab Merge branch 'MDL-57278-master-5' of https://github.com/xow/moodle 2016-12-08 10:44:49 +08:00
John Okely
a6db4a68e2 MDL-57278 signup: Unit tests covering confirmation link generation 2016-12-08 10:16:29 +08:00
Dan Poltawski
eec60baeca Merge branch 'MDL-56674-master' of https://github.com/kenneth-hendricks/moodle 2016-12-07 08:45:16 +00:00
Marina Glancy
c0ad000f46 MDL-56614 behat: corrections to new steps 2016-12-07 13:37:49 +08:00
Dan Poltawski
369382f7bf Merge branch 'MDL-56233-32-mocksubmit' of https://github.com/roperto/moodle 2016-12-06 12:42:00 +00:00
Andrew Nicols
3bb4ad7521 Merge branch 'MDL-57137_question_category_with_parent_category' of https://github.com/melihovv/moodle 2016-12-06 14:52:32 +08:00
Marina Glancy
ebcff7e256 MDL-56614 behat: new steps for navigation without blocks 2016-12-06 11:49:11 +08:00
Daniel Thee Roperto
518eb19337 MDL-56233 forms library: Fixed form identifier when mocking a form. 
If the plugin is using namespaces instead of frankenstyle class name,
get_called_class() will return 'type\name' instead of 'type_name'.

Added code to replace backslashes to underscores and fix that issue.
 2016-12-05 11:27:05 +11:00
David Monllao
76e337ab96 Merge branch 'MDL-57232-master' of git://github.com/damyon/moodle 2016-12-02 14:20:17 +08:00
Damyon Wiese
9d1402abd8 MDL-57232 blocks: Split undeletableblocktypes 
There are 2 kinds of blocks that are undeletable. Those required by the
theme and those protected via the admin page ui. We only want the theme
ones to be auto created site wide if they don't exist - so we need to
rename the theme ones and split the logic.
 2016-12-02 12:32:03 +08:00
Frederic Massart
36e6789b27
MDL-57101 filter: Load globally available filters on every page 
Previous commits were overlooked, they should have passed the
system context to filter_manager::setup_page_for_fitlers(), the
page context was passed instead. Regardless, the processing of
the latter is too excessive for what we need, but, more importantly,
it does not return "Off, but available" filters which we also need.
 2016-12-01 14:51:40 +08:00
Frederic Massart
e37c128686
MDL-57101 filter: Always set-up the page for filters 2016-11-29 12:36:28 +08:00
Alexander Melihov
834cc0ed66 MDL-57137 quiz: Create question category with specified parent category 
Fix question category generator bug. Now it is possible to specify parent category of subcategory, supply only name of parent category
 2016-11-25 08:59:32 +03:00
David Monllao
4de871f4ca Merge branch 'MDL-57001-master' of git://github.com/damyon/moodle 2016-11-24 15:29:04 +08:00
Damyon Wiese
22b8c5b842 MDL-57001 user_menu: Fixes for unit tests 
We added a link to the user menu so we have to adjust the tests.
 2016-11-24 15:11:19 +08:00
Rajesh Taneja
8c35e49b37
MDL-56898 behat: No need to trigger error, as it sometimes hangs behat 2016-11-24 07:31:38 +08:00
Damyon Wiese
1ac36fa9f7 MDL-56902 blocks: No theme blocks if fake blocks only 
When showing only fake blocks, never auto create the blocks for the
theme. This would give you double blocks.
 2016-11-23 11:07:32 +08:00
David Monllao
44c3d0775c Merge branch 'MDL-56902-master' of git://github.com/damyon/moodle 2016-11-23 08:29:41 +08:00
Damyon Wiese
51718b752d MDL-56902 blocks: Prevent blocks returning when switching themes. 
Now if the current theme requires some blocks that don't exist, they
will be created - but with a new flag that indicates this block should
only be returned if the current theme requires it. This allows flipping back
and forth between boost and clean without restoring the nav and settings blocks
in boost.
 2016-11-22 14:53:24 +08:00
Rajesh Taneja
26fef01b6b
MDL-56898 behat: Go to a non html page to avoid any unwanted ajax calls 
After scenario is finished, go to README.txt, so
there is no JS/AJAX calls pending and site is ready
for reset before next scenario
 2016-11-21 14:16:49 +08:00
Rajesh Taneja
1bce723292
MDL-56898 behat: Try data reset if it fails because of pending process 2016-11-21 09:25:35 +08:00
Andrew Nicols
6aefea74a4 Merge branch 'MDL-55209' of https://github.com/NeillM/moodle 2016-11-16 08:24:39 +08:00
Matteo Scaramuccia
ade30c673c MDL-56917 core_upgrade: Do not use the raw version to check cURL caps. 
Some Linux distros can backport features due to security issues
while keeping the same (old) version. See e.g.:
- RHEL 7, https://rhn.redhat.com/errata/RHSA-2015-2159.html
- RHEL 6, https://rhn.redhat.com/errata/RHBA-2016-0842.html
- Remi PHP 7.0.x, https://github.com/remicollet/remirepo/commit/87954ef9ca41
 2016-11-15 21:50:07 +01:00
Andrew Nicols
ea10a0319b MDL-56602 core: Lock themerev during upgrade 
This also changes install to use a fixed themerev.
 2016-11-11 14:15:00 +08:00
Dan Poltawski
d5d6eda93c Merge branch 'MDL-55777-master' of git://github.com/ankitagarwal/moodle 2016-11-10 13:46:10 +00:00
Dan Poltawski
f670b39e69 Merge branch 'MDL-56602-master-2' of git://github.com/andrewnicols/moodle 2016-11-10 11:26:14 +00:00
Ankit Agarwal
f2330472f0 MDL-55777 installation: Check libcurl version on install 2016-11-10 10:16:19 +05:30
Andrew Nicols
9d75a519f3 MDL-56602 themes: Use version number as base themerev 2016-11-10 08:02:31 +08:00
Jake Dallimore
605bab84ce MDL-48498 core_files: Add security helper to curl class 
Allow injection of security_helper objects into curl, but default
to a core helper tied to http security settings values.
 2016-11-08 15:11:15 +08:00
Jake Dallimore
f6d9efefaa MDL-48498 core_files: curl_security_helper_base and implementation 
Base class and core implementation providing a means to check URLs
against the curl security admin settings entries.
 2016-11-08 15:11:15 +08:00
Marina Glancy
fbb36ed1e6 MDL-38158 media: some players do not want fallback to other players 
there is already logic to determine whether html5 is supported;
otherwise we may end up with nested <audio> or <video> tags
 2016-11-07 11:55:05 +08:00
David Monllao
90abff01b3 Merge branch 'MDL-54751-master-v5' of https://github.com/snake/moodle 2016-11-07 08:55:44 +08:00
Jake Dallimore
ff4230d88e MDL-54751 behat: Support for adhoc module and section deletion in behat 
Introduced new behat step for running all pending adhoc tasks and
modified the relavant behat tests.
 2016-11-07 07:41:59 +08:00
Marina Glancy
fab11235d8 MDL-38158 core_media: Convert media players to new plugin type 
AMOS BEGIN
  MOV [siteyoutube,core_media],[pluginname,media_youtube]
  MOV [siteyoutube_desc,core_media],[pluginname_help,media_youtube]
  MOV [sitevimeo,core_media],[pluginname,media_vimeo]
  MOV [sitevimeo_desc,core_media],[pluginname_help,media_vimeo]
  MOV [html5audio,core_media],[pluginname,media_html5audio]
  MOV [html5audio_desc,core_media],[pluginname_help,media_html5audio]
  MOV [html5video,core_media],[pluginname,media_html5video]
  MOV [html5video_desc,core_media],[pluginname_help,media_html5video]
  MOV [flashanimation,core_media],[pluginname,media_swf]
  MOV [flashanimation_desc,core_media],[pluginname_help,media_swf]
AMOS END
 2016-11-04 17:30:40 +08:00
Andrew Nicols
bc378b50ec Merge branch 'wip-MDL-44467-master' of git://github.com/abgreeve/moodle 2016-11-03 14:08:21 +08:00
Neill Magill
c10bfee49f MDL-55209 coursecat: Should be able to remove category idnumber test 
A user should be able to remove an idnumber from a category, also 0
should not be allowed multiple times.
 2016-11-02 09:50:30 +00:00
Kenneth Hendricks
c213a30670 MDL-56674 core: Fix test_get_all_observers 2016-11-02 13:29:07 +11:00
Adrian Greeve
e0789335ee MDL-44467 lib: Unit test updates. 2016-10-28 13:27:00 +08:00
Simey Lameze
253ae23058 MDL-44467 core: always send email from noreplyaddress 2016-10-28 13:04:09 +08:00
Amanda Doughty
cc350fd9c8 MDL-47162 core_message: Add course id to message eventdata 2016-10-27 18:11:27 +02:00
Dan Poltawski
add9db49f4 MDL-56334 tests: add some trivial cases to domain tests 
This gets us to 100% code coverage.
 2016-10-26 09:58:05 +01:00
Dan Poltawski
e376b4bd64 Merge branch 'MDL-56334-master-v2' of git://github.com/snake/moodle 2016-10-26 09:57:50 +01:00
Adrian Greeve
020c98e373 MDL-56334 libraries: Addition of domain checker. 
Added a function for checking if a domain is allowed
against a list of domains that could contain wildcards.
 2016-10-26 15:51:32 +08:00
Jake Dallimore
6d6e36923b MDL-56334 libraries: Add new internet protocol library to core 
New library providing utilities for IP addresses, DNS and other
internet-protocol-related information.
 2016-10-26 15:49:03 +08:00
Andrew Nicols
8d3c33c693 Merge branch 'MDL-50888-master' of https://github.com/lucisgit/moodle 2016-10-26 08:19:23 +08:00
Eloy Lafuente (stronk7)
0d80f6984b Merge branch 'MDL-56250-32-formvalidation' of https://github.com/roperto/moodle 2016-10-25 20:23:12 +02:00
David Monllao
bf91437d25 Merge branch 'wip-mdl-55074' of https://github.com/rajeshtaneja/moodle 2016-10-25 15:09:24 +08:00
Rajesh Taneja
c99dffb69c
MDL-55074 behat: Fixed new theme related changes 2016-10-25 13:48:51 +08:00
Rajesh Taneja
4422ffc55e MDL-56006 behat: Get proper feature and context for default theme 
No matter which theme is default theme, overridden
context and blacklisted features should be respected
 2016-10-25 10:15:20 +08:00
Damyon Wiese
e56b58e3c9 MDL-56006 theme: Set Boost as the default theme 
Units tests have been adjusted e.g. 'boost' instead of 'clean' in pix urls.

Some places I didn't update the test to reflect the boost markup and reset
the theme to clean. This is because the test was not testing the markup - but the
functionality (e.g. looking for specific structures to indicate an error in a form element).
 2016-10-25 10:15:20 +08:00