482 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
777361983c Merge branch 'wip-mdl-56519-m' of https://github.com/rajeshtaneja/moodle 2017-01-11 02:42:29 +01:00
Rajesh Taneja
57bee542ab
MDL-56519 behat: Fixed lint errors 2017-01-03 09:12:54 +08:00
Rajesh Taneja
3b7a351d69
MDL-57494 behat: Fixed tags and removed reset in after_scenario
1. Added missing switch_window tags
2. Fixed switch_frame tags to use switch_iframe
3. Removed reset from after_scenario.
2016-12-22 12:42:39 +08:00
Eloy Lafuente (stronk7)
75c57a08fb MDL-57266 upgrade: add 3.2.0 separation line to all upgrade scripts 2016-12-05 17:10:20 +01:00
Eloy Lafuente (stronk7)
e7a1eed154 MDL-56240 upgrade: delete incorrect lines, manually added
Note that, with MDL-57266, we are changine the comment to be:

// Automatically generated Moodle v3.2.0 release upgrade line

in order to make to make to make it clearer that it's an
automatic (part of the release process) comment and should not
be added manually ever.
2016-12-05 16:47:33 +01:00
Dan Poltawski
10461a04c6 Merge branch 'MDL-57207-master' of git://github.com/cameron1729/moodle 2016-11-30 09:51:21 +00:00
Cameron Ball
9a22c99ea9
MDL-57207 mod_lti: Remove redundant popover() call
Since MDL-56748 popovers are properly delegated. Making manual calls
to .popover redundant.
2016-11-30 17:45:41 +08:00
Eloy Lafuente (stronk7)
04649747a4 MDL-57197 versions: bump all versions and requires near release
version = 2016120500 release version
requires= 2016112900 current rc4 version
2016-11-29 22:57:05 +01:00
Andrew Nicols
9a102866be Merge branch 'MDL-56564-master-2' of git://github.com/junpataleta/moodle 2016-11-24 15:22:12 +08:00
Jun Pataleta
144c149704 MDL-56564 mod_lti: Reset fields before updating tool matches 2016-11-24 11:09:03 +08:00
Dan Poltawski
68153d5cbc Merge branch 'MDL-56564-master-2' of git://github.com/junpataleta/moodle 2016-11-23 11:27:20 +00:00
Jun Pataleta
1b669ebeba MDL-56564 mod_lti: External tool form fixes
* Revert disabling of the Preconfigured tool field on edit mode
* Reset LTI tool configuration fields when selecting a different
  preconfigured tool.
* Behat fixes for UI changes.
2016-11-23 13:10:51 +08:00
Frederic Massart
6b7e523b5d
MDL-56182 mod_lti: Include the query string when comparing type URLs 2016-11-23 10:16:50 +08:00
gabrielrosset
d030347bce MDL-33960 mod_lti: fix page scroll 2016-11-15 14:40:21 +01:00
Damyon Wiese
9280f62e38 MDL-56196 mod_lti: Fix popups and secret form in boost 2016-11-08 14:27:26 +08:00
Frédéric Massart
3d979f9676 MDL-56196 mod_lti: Adapt templates for both Boost and Clean 2016-11-08 14:11:14 +08:00
Dan Poltawski
56f763b1f9 Merge branch 'MDL-55841-master' of https://github.com/xow/moodle 2016-11-02 15:24:33 +00:00
Dan Poltawski
f2263f7c06 Merge branch 'MDL-56542-master-enfix' of git://github.com/mudrd8mz/moodle 2016-10-31 15:15:09 +00:00
John Okely
3a5e14a5d0 MDL-55841 mod_lti: Improve interface usability & consistency
* Always say "Tool URL"
* Add help strings to cartridge interface
2016-10-27 17:13:22 +08:00
Helen Foster
c9636ddd51 MDL-56542 lang: Merge English strings from the en_fix language pack 2016-10-25 20:12:52 +02:00
Juan Leyva
65b2669d98 MDL-56307 course: Return time updated and times updated 2016-10-25 10:10:55 +01:00
Juan Leyva
02a73d767c MDL-56307 course: New course_check_module_updates_since method 2016-10-25 10:10:52 +01:00
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