Commit graph

77681 commits

Author SHA1 Message Date
Rajesh Taneja
5e48383330 MDL-52932 behat: Restart session if it fails because of some reason 2016-01-29 11:59:01 +08:00
John Okely
a057ba5924 MDL-35590 navigation: Remove link from admin node if you have javascript
Also:
* In behat, ensure nav node exists before checking attribute (Credit to
  Rajesh Taneja)
* Remove some unused JS constants
* Fix debugging notice for users without settings block
2016-01-29 11:28:08 +08:00
David Monllao
846cd414bf MDL-46553 admin: Version bump after history rewrite 2016-01-29 10:22:12 +08:00
Eloy Lafuente (stronk7)
fabe7ebd53 MDL-50620 mod_scorm: Preventive (on rewrite) version bump to current. 2016-01-29 10:15:28 +08:00
David Monllao
4bed1fcc7e Merge branch 'MDL-35590-fixes' of git://github.com/ryanwyllie/moodle 2016-01-29 10:15:27 +08:00
Andrew Nicols
ca29dd4e84 Merge branch 'MDL-52825_master-fix' of git://github.com/dmonllao/moodle 2016-01-29 10:15:26 +08:00
Ryan Wyllie
5697de1832 MDL-35590 block_navigation: fix keyboard nav
Fixed up the left/right keyboard navigation to match
the aria specification. Also stopped the root node from
being collapsible.
2016-01-29 10:15:26 +08:00
David Monllao
90902953a8 MDL-52825 atto: Listen to gesturemovestart to discard some events 2016-01-29 10:15:26 +08:00
Andrew Nicols
17cd73b684 Merge branch 'MDL-52826_master-fix' of git://github.com/dmonllao/moodle 2016-01-29 10:15:25 +08:00
Rajesh Taneja
80f37f2739 MDL-35590 behat: Data-loaded is on li node 2016-01-29 10:15:25 +08:00
David Monllao
3e51b0ad7e MDL-52826 forms: Using id attr
Switch from custom id references to the element's id attribute.

Extra fix to get rid of an unnecessary call to getValidationScript().
2016-01-29 10:15:25 +08:00
Eloy Lafuente (stronk7)
3c415f13b8 Merge branch 'MDL-29817' of https://github.com/rushi963/moodle 2016-01-29 10:15:24 +08:00
Eloy Lafuente (stronk7)
6e38f41d8e MDL-52567 Core: amend existing test to new counting rules 2016-01-29 10:15:24 +08:00
Eloy Lafuente (stronk7)
bc269f6782 Merge branch 'MDL-52567_master' of https://github.com/nadavkav/moodle 2016-01-29 10:15:23 +08:00
Eloy Lafuente (stronk7)
89bb268e21 MDL-37739 mod_wiki: test headings being wikilinks (toc and content) 2016-01-29 10:15:23 +08:00
Eloy Lafuente (stronk7)
7b6d50b743 Merge branch 'MDL-37739-malformed-wiki-toc-links' of https://github.com/lucaboesch/moodle 2016-01-29 10:15:23 +08:00
Dan Poltawski
e092a7c3d8 Merge branch 'MDL-48953_m31v4' of https://github.com/sbourget/moodle 2016-01-29 10:15:22 +08:00
Dan Poltawski
758e57499a Merge branch 'MDL-25864' of https://github.com/rushi963/moodle 2016-01-29 10:15:22 +08:00
David Monllao
5ceb208ba7 Merge branch 'MDL-42190-master-workshopdelsub' of git://github.com/mudrd8mz/moodle 2016-01-29 10:15:21 +08:00
David Monllao
25dbed8b9e Merge branch 'MDL-52459-master' of git://github.com/jleyva/moodle 2016-01-29 10:15:20 +08:00
Eloy Lafuente (stronk7)
aeba2257f4 Merge branch 'MDL-52780-mailoriginscript' of https://github.com/brendanheywood/moodle 2016-01-29 10:15:20 +08:00
Eloy Lafuente (stronk7)
94fe0fa02e Merge branch 'wip-mdl-52839' of https://github.com/rajeshtaneja/moodle 2016-01-29 10:15:20 +08:00
Eloy Lafuente (stronk7)
81be5d3456 Merge branch 'MDL-52843-master-paramsignup' of git://github.com/mudrd8mz/moodle 2016-01-29 10:15:19 +08:00
Dan Poltawski
4ce6dac426 Merge branch 'MDL-52791' of git://github.com/timhunt/moodle 2016-01-29 10:15:19 +08:00
Dan Poltawski
4ce63c9ccf Merge branch 'MDL-52835-master' of git://github.com/deraadt/moodle 2016-01-29 10:15:19 +08:00
Dan Poltawski
e23c76d72e Merge branch 'MDL-52826_master' of git://github.com/dmonllao/moodle 2016-01-29 10:15:18 +08:00
Dan Poltawski
1d1c8f6275 Merge branch 'MDL-51702_master' of git://github.com/dmonllao/moodle 2016-01-29 10:15:18 +08:00
Dan Poltawski
760b0a17f1 Merge branch 'MDL-52825_master' of git://github.com/dmonllao/moodle 2016-01-29 10:15:17 +08:00
David Monllao
99e96d83b6 Merge branch 'MDL-52682-master' of git://github.com/andrewnicols/moodle 2016-01-29 10:15:17 +08:00
David Monllao
33854a2968 MDL-52683 mod_scorm: Test for scorm_get_last_completed_attempt 2016-01-29 10:15:17 +08:00
David Monllao
0b8be05caf Merge branch 'MDL-52683-master' of git://github.com/s-cenni/moodle 2016-01-29 10:15:16 +08:00
David Monllao
0e5458f45f Merge branch 'wip-mdl-52799' of git://github.com/rajeshtaneja/moodle 2016-01-29 10:15:16 +08:00
David Monllao
6c3def94fa Merge branch 'MDL-35590-master' of git://github.com/lameze/moodle 2016-01-29 10:15:15 +08:00
David Monllao
9edcfdad4f Merge branch 'MDL-31635-master' of git://github.com/marinaglancy/moodle 2016-01-29 10:15:15 +08:00
Dan Poltawski
1aa454eda4 MDL-49817 grunt: handle multiple watched files changed at once
Includes multiple changes to the shifter task to simplify and
support this:
* Use grunt.file for shifter yui 'module' detection rather than our own
  70 line function
* Use grunt.util.spawn rather than our own exec for shifter
* Improve behaviour on various yui subdirectories

We have to add the 'async' depndency to npm because we are running
multiple async operations in the single task. We use async.eachSeries to
run each shifter job sequentally (else the output would be unreadable
when running async).

We also run shifter in non-recursive mode on the module directory so its
not building everything (thanks to Ryan for pointing this out!)
2016-01-28 08:30:04 +00:00
Dan Poltawski
0b777a069b MDL-49817 grunt: make shifter work watch on right place
We mess around with the cwd to find a shifter path, not ideal but avoids
having to refactor the shifter task.

Also fix jshint errors..

1) The gruntfile runs in a nodejs environment and not a browser
environment.

2) There was an uninitialised variable
2016-01-28 08:27:31 +00:00
Dan Poltawski
8efbb7b1a1 MDL-49817 grunt: add watch task
This allows files to be watched and automatically build when changed.

Thanks to David Monllaó for the initial basis for this patch.
2016-01-28 08:27:31 +00:00
Dan Poltawski
5cc5f31101 MDL-49817 grunt: Refactor the uglify task
This is in preperation for the watch task and doing a few things:

1) Switch away from 'grunt.file.expandMapping' to the declarative syntax
   for doing the same thing, as recommended in docs:
   http://gruntjs.com/api/grunt.file#grunt.file.expandmapping

2) Factor the renaming function into shared function so it can be used
   from the watch task too.

3) Shared the file glob'ing pattern for match AMD js files between
   jshint and uglify task (this removes the node_modules exception..
   we should add it to both if we need it).

4) Rename the task configuration - I am just doing this because it looks
   like 'dynamic_mappings' is some how magic config option when you
   look at the manual:
   http://gruntjs.com/configuring-tasks#building-the-files-object-dynamically

   But in fact, it's just a task confguration name.
2016-01-28 08:27:30 +00:00
AMOS bot
3ccc59d199 Automatically generated installer lang files 2016-01-28 00:04:19 +08:00
Juan Leyva
51d2434cfe MDL-52902 webservice: Send CORS header before params validation 2016-01-27 10:26:04 +01:00
Dani Palou
156de651c7 MDL-51704 survey: Fix display problems in report page 2016-01-26 14:06:57 +01:00
Kenny McCormack
882bf2a54d MDL-48439 tool_capbility: Improve visualisation of capability table cells 2016-01-26 12:52:48 +00:00
Tim Hunt
41f4dabe2b MDL-52899 behat: make PAGE_READY_JS more robust 2016-01-26 11:23:26 +00:00
David Mudrák
ef3cd03876 MDL-52896 moodlelib: Remove APD support relic
The support for Advanced PHP Debugger was dropped in Moodle 2.2
(MDL-29881). This seems to be a forgotten relic no longer used and
needed in moodlelib.
2016-01-26 09:33:35 +01:00
Dani Palou
a69c9abdaf MDL-49612 forum: Fix some external_value creation in params declaration 2016-01-26 08:55:55 +01:00
Clement Smith
4956503b11 MDL-52566 mod/assign: Fix group submission draft records
When group assignments are submitted by the first student in a group,
the logic that saves the submission is not creating a draft
assignment record in mdl_assign_submission. This leads to problems
when other functions are used that depend on these records, such as
marking workflow. This fixes the issue and correctly creates
draft assignment submission records for the non-submitting students
in the group.
2016-01-25 10:06:45 -06:00
David Mudrák
66a3df7f55 MDL-42190 workshop: Add behat tests for the submissions removal feature 2016-01-25 16:10:59 +01:00
David Mudrák
58489e11f1 MDL-42190 workshop: Improve the confirmation of submission removal
I noticed we do not need to list the names of potentially affected
reviewers. If the user (teacher) has the capability to see other
assessments (which they do in 99%), the list of assessments is displayed
at the confirmation page anyway. If for some reason they do not have the
capability, we should not list the names.

The second fix is that the action buttons (such as Delete or Edit) are
not displayed on the removal confirmation page.

And finally, as the output->confirm() wraps the message with implicit
<p>, it is not valid to pass HTML with any block elements. So instead of
concatenating the two messages, we simply define a new string for this
situation.
2016-01-25 15:17:45 +01:00
David Mudrák
3fa22899b6 MDL-42190 workshop: Fix the coding style of the patch 2016-01-25 15:17:44 +01:00
Paul Nicholls
30c52da9be MDL-42190 workshop: Add "sumbission_deleted" event
Add (and trigger) an event for deletion of submissions, so that deletions
are logged.
2016-01-25 15:17:44 +01:00