460 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
6bf8e9b021 Merge branch 'MDL-55835-master' of git://github.com/danpoltawski/moodle 2016-10-11 01:21:14 +02:00
Jun Pataleta
2d3130532c MDL-56232 mod_lti: Fix logic for disabling mod_form fields
* Disable tool "Select content" button if selected preconfigured tool
  does not support Content-Item, and if the selected option is set to
  "Automatic, based on launch URL".
* Disable tool configuration form fields if selected preconfigured tool
  does not support Content-Item, but enable these fields if the selected
  option is set to "Automatic, based on launch URL".
* Behat tests also updated to check disabling/enabling of launch url field.
2016-10-10 13:16:25 +08:00
Dan Poltawski
e4edbce35d MDL-55835 js: fix lint issues
Some caused by eslint checks being better, some just not detected
because we don't show warnings well (MDL-54930).
2016-10-07 10:03:43 +01:00
Rajesh Taneja
86ebbed6ca
MDL-56210 behat: Test for disabled button later
With phantomjs, dom is not updated by the time
next step is executed, so suffle it to ensure
this scenario pass
2016-10-05 15:45:22 +08:00
David Monllao
c41132f075 Merge branch 'MDL-55168-master' of git://github.com/danpoltawski/moodle 2016-10-03 14:33:24 +08:00
Rajesh Taneja
24c2dcada5
MDl-56210 behat: Ensure page is loaded, before checking button 2016-10-03 13:03:51 +08:00
Dan Poltawski
aea8eaecde MDL-55168 css: use shorthand colour props when possible 2016-09-30 09:25:24 +01:00
Dan Poltawski
bc33e9bd3f MDL-55168 css: reformat plain css with stylefmt 2016-09-30 09:25:23 +01:00
Jun Pataleta
6c43d831f0 MDL-49609 mod_lti: Fixes for problems found in testing
* Load contentitem_return doc before processing
* Also use new AMD modal instead of the YUI one.
* Remove conversion of text columns in union queries
  - Since the value column in lti_types_config was changed to a
    text type, there is no need to use $DB->sql_compare_text()
    for the lti_types columns involved in the union queries in
    lti_get_type_config().
2016-09-29 11:13:50 +08:00
Rajesh Taneja
71ee163664
MDL-49609 behat: Replace deprecated step 2016-09-29 07:06:26 +08:00
Eloy Lafuente (stronk7)
b3823c4365 Merge branch 'MDL-56019-master' of git://github.com/dpalou/moodle 2016-09-28 20:08:31 +02:00
David Monllao
d830f1518a MDL-49609 mod_lti behat: Removing unexisting components 2016-09-28 09:03:09 +08:00
David Monllao
f747e45411 Merge branch 'MDL-49609-master-5' of git://github.com/junpataleta/moodle 2016-09-28 08:59:22 +08:00
Damyon Wiese
63e4df60f6 MDL-55839 behat: Behat fixes for theme_noname
This is a squash of many small fixes.
The list of changes are:

Initial set of behat selectors overrides required for new theme.

set core behat selectors if not overridden by theme

Remove pause

Fix for checkboxes not saving properly

Custom override for click in the user menu

Fix for behat guessing the field type.

Behat fix for guessing the correct field type.

Fix for missing closeElementBefore mforms mess.

Fix for textareas not displaying their contents.

Fix availability form element

Fix action menu selectors for activities in a course page

Fix textareas not retaining their values

Fix selector for blocks

I had to change the single select template to use an input instead of a button because of a
behat bug we have not tracked down yet.

Fix for frozen attribute in form elements

Use input instead of button while behat is still broken

Fix for navigation selector override

Behat selector fixes and multi-select fixes for templated select

Fix for configure blocks selector + booleans for autocomplete

Fixes for course_summary behat tests

Allow optgroups in single_select

Behat fixes for block_navigation

Fixes for url form element and activity chooser selectors

blocks_social - fix specific selector for behat

Fix export_for_template for selectgroups element.

Dont set empty id on the form

Fix direct call to behat_navigation in backup context

Checkbox empty value fix

Fix for assign grading panel popouts

file picker overrides to find a file manager in the page

Fix chat tests to use element name

Make selectors in mod_data behat less specific

MDL-55839: recent activity behat test relies on time()

SQUASH Honour mform element "class" attribute on the container

SQUASH Fixes for behat in mod_forum

SQUASH search form template showing value as text next to the button

SQUASH undo double selectgroup fix

SQUASH - The slightly different structure to action menus breaks course drag and drop

SQUASH Wrap loading icon in a span so the selector still works.

SQUASH Fix fragile javascript in report_loglive

SQUASH Fix tabtree, and selectgroups for mod_feedback

Also - do-not enhance the action menu - we are dropping support for this.

SQUASH Fix filemanager selector and pix_icon template for mod_forum tests.

SQUASH Fixes to breadcrumb and add formid to single select (fixes mod_glossary tests)

SQUASH lesson behat fixes. 95% of lesson styles were rubbish so they were disgarded.

SQUASH Fix lti behat tests - they were cheating and using a context step from quiz

SQUASH Behat fixes for quiz with new theme

SQUASH behat fixes for mod_wiki

SQUASH Workshop behat fixes

SQUASH Frozen form elements cannot use a readonly form element because it screws with the form JS "disabledIf" stuff.

SQUASH Fixes for grades behat tests

SQUASH behat fixes for groups

SQUASH blacklist action menu tests

SQUASH Fix for tag form element missing "manage standard tags" link

SQUASH Incomplete fixes for course behat tests

SQUASH behat fixes for badges

SQUASH Tags fixes for behat

SQUASH filepicker fixes for behat

SQUASH Abort guessing field type when we hit 'html'

SQUASH Fix for admin/tool/behat tests

SQUASH fix for admin tool behat tests

SQUASH fix for availabilty conditions hiding "aria-hidden" elements

SQUASH give the blocks more room. We get behat files because nav tree nodes are not in view

SQUASH Blocks fixed

Fix behaviour of unchecked checkboxes

SQUASH Remove incorrect step in user test

SQUASH behat fixes for course tests

Part of MDL-55071
2016-09-23 10:55:16 +01:00
Frederic Massart
525ef9c8b4 MDL-51948 core: Patch core areas for LTR forms
Part of MDL-55071
2016-09-23 10:55:14 +01:00
Frederic Massart
ed7844b5f4 MDL-55224 theme_noname: RTL adjustments for auto-flipping era
Part of MDL-55071
2016-09-23 10:49:49 +01:00
Jun Pataleta
1e7490ad9a MDL-49609 mod_lti: Content-Item message type-related unit tests 2016-09-23 16:29:27 +08:00
Jun Pataleta
6696cdab8f MDL-49609 mod_lti: Content-Item message type-related Behat tests 2016-09-23 16:29:27 +08:00
Jun Pataleta
c1fae2b928 MDL-49609 mod_lti: Refactor content-item and make it work using JS
* Rebase and resolve conflicts from initial patch.
* Reorganise contentitem and contentitem_return pages.
* Add capability checks for contentitem and contentitem_return pages.
* Move the building of Content-Item selection request to a local
  lib function.
* Move contentitem_return processing logic to a local lib function.
* Fix type settings update. Content-item checkbox does not get
  checked/unchecked on load.
* Fix  tool settings update. Disabled content-item checkbox gets unchecked when
  tool settings form is submitted.
* Add "Select content" button on load which launches the content item
  selection dialogue.
* Move hardcoded HTML and JS to mustache templates and AMD modules.
* Use standard YUI dialog for displaying the Content-Item selection page.
* Added processing for the following Content-Item properties:
  - text
  - icon
* On ContentItem selection, fill out form with the configuration data retrieved,
  instead of automatically saving the tool and redirecting to the course page.
* Removed section- and sectionreturn-related code since we're not automatically
  adding the tool on ContentItem selection.
* On mod_lti_mod_form, enable configuration fields if they support ContentItem
  selection.
* New form-field module for setting fields using JS
* Change types_config table's 'value' column from char(255) to text
2016-09-23 16:29:19 +08:00
Dani Palou
d33c67bc47 MDL-56019 ws: Use itemid null when getting modules intro 2016-09-19 11:33:55 +02:00
spvickers
d8f9109a12 MDL-49609 mod_lti: Add Content-Item message
Added option for tools to support Content-Item message and redirect
to/from tool provider when creating an instance.
2016-09-18 22:16:10 +08:00
Dan Poltawski
dca4a87101 Merge branch 'MDL-55742-master' of https://github.com/xow/moodle 2016-09-05 10:50:47 +01:00
John Okely
d51757a729 MDL-55457 mod_lti: Support object icon_info in tool proxy 2016-09-02 09:39:31 +08:00
John Okely
3b4491e8aa MDL-55742 mod_lti: Remove support for get_magic_quotes_gpc
Thanks to Bishop Bettini for the original patch.
2016-09-01 14:58:29 +08:00
Helen Foster
b61b927356 MDL-55661 lang: Merge English strings from the en_fix language pack 2016-08-25 14:38:07 +02:00
Eloy Lafuente (stronk7)
e0519d032d Merge branch 'MDL-55314-master' of https://github.com/mrmark/moodle 2016-08-02 17:16:07 +02:00
Eloy Lafuente (stronk7)
8a78cb42da Merge branch 'MDL-55315-master' of https://github.com/mrmark/moodle 2016-08-02 17:07:16 +02:00
Jun Pataleta
653b8ef24b MDL-54879 mod_lti: Add fallback options for error message upon failure 2016-07-28 14:38:29 +08:00
Mark Nielsen
123cc912ec MDL-55314 mod_lti: Several fixes to lti_load_cartridge
* Fixed XML loading when there is an error
* Fixed exception thrown by lti_load_cartridge
* By default, don't allow LTI mod generator to
  use a toolurl as that results in a cURL call.
2016-07-27 09:08:21 -07:00
Dan Poltawski
773a11519d Merge branch 'MDL-55278_master' of https://github.com/dmonllao/moodle 2016-07-26 11:57:09 +01:00
David Monllao
72e92d0ac2 Merge branch 'MDL-55325-master' of https://github.com/xow/moodle 2016-07-26 10:33:21 +08:00
Rajesh Taneja
52f3e060e4
MDL-55091 phpunit: Following has been deprecated.
1. getMock()
2. setExpectedException()
3. checkForUnintentionallyCoveredCode renamed to beStrictAboutCoversAnnotation
4. beStrictAboutTestSize renamed to enforceTimeLimit
5. UnitTestCase class is now fully removed.
2016-07-26 10:11:30 +08:00
John Okely
4c3472a55c MDL-55325 mod_lti: Use .on('load') instead of .load()
Necessary after MDL-50937 JQuery upgrade to 3.1
2016-07-25 17:31:41 +08:00
Mark Nielsen
3077ae6004 MDL-55315 mod_lti: Fix Nginx 405 error
It appears that Nginx doesn't allow POST
to static files.  So rename the fixture from
a HTML file to a PHP file.
2016-07-22 11:39:42 -07:00
David Monllao
0bd8383a8b MDL-55278 search: Updating references to area namespace 2016-07-21 18:38:18 +02:00
Dan Poltawski
9b62a3eb71 MDL-55048 js: rebuilt files with new version of uglifyjs 2016-07-11 15:53:10 +01:00
Dan Poltawski
6e304922fb MDL-54944 js: built files after changes 2016-07-07 12:11:07 +01:00
Dan Poltawski
5602dc1735 MDL-54944 js: ensure functions are consistent in return val
Mostly we are being incosnistent when giving an early-exit shortcut.

Detected by http://eslint.org/docs/rules/consistent-return
2016-07-07 12:11:07 +01:00
Dan Poltawski
c905cd233d MDL-54944 js: fix quoting of object properities coding style
Detected by http://eslint.org/docs/rules/quote-props
2016-07-07 12:11:05 +01:00
Andrew Nicols
5e47d5aee5 Merge branch 'MDL-54951-master' of git://github.com/jleyva/moodle 2016-07-05 09:41:31 +08:00
Juan Leyva
7ef49bd393 MDL-54951 webservice: Return intro text files in modules 2016-07-04 09:24:28 +01:00
Andrew Nicols
91e46852fc Merge branch 'MDL-54877-master-clean-on-output' of git://github.com/junpataleta/moodle 2016-07-04 11:52:05 +08:00
Andrew Nicols
48d1322527 Merge branch 'MDL-54610_master' of https://github.com/snake/moodle 2016-06-30 09:24:58 +01:00
Eloy Lafuente (stronk7)
47d986828e Merge branch 'wip-MDL-47113-master' of git://github.com/abgreeve/moodle 2016-06-30 09:24:58 +01:00
Dan Poltawski
ab8ef75406 Merge branch 'MDL-55022-master' of git://github.com/junpataleta/moodle 2016-06-30 09:24:56 +01:00
Jun Pataleta
5c1b749d55 MDL-54877 mod_lti: Clean LTI tool type name and description on output
* Use clean_param() for name and description when displaying the tool type.
    Basically in the following functions:
    - serialise_tool_type()
    - lti_get_configured_types()
* Changed name and description's type from PARAM_TEXT to PARAM_RAW
    in tool update parameters.
* Changed name and description's type from PARAM_TEXT to PARAM_RAW
   in mod_lti_external::tool_type_return_structure()
2016-06-30 15:55:43 +08:00
David Mudrák
46994de566 MDL-55002 lang: Fix behat scenarios using modified strings 2016-06-27 22:57:34 +02:00
Helen Foster
25558b808e MDL-55002 lang: Merge English strings from the en_fix language pack 2016-06-27 22:03:40 +02:00
Jun Pataleta
eb55f72d63 MDL-55022 mod_lti: Fix undefined variable 2016-06-27 11:40:03 +08:00
Jake Dallimore
f56cbd3bbf MDL-54610 mod_lti: Fix cartridge support for admin tool add/edit forms 2016-06-24 14:14:28 +08:00