Commit graph

76812 commits

Author SHA1 Message Date
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
Dani Palou
156de651c7 MDL-51704 survey: Fix display problems in report page 2016-01-26 14:06:57 +01:00
Tim Hunt
41f4dabe2b MDL-52899 behat: make PAGE_READY_JS more robust 2016-01-26 11:23:26 +00: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
Paul Nicholls
deabe48bc5 MDL-42190 workshop: Add the ability to delete submissions
A new capability is introduced to control this, granted to teacher/admin
roles by default: mod/workshop:deletesubmissions.  Additionally, students
can delete their own submissions if they are currently able to edit them.
2016-01-25 15:17:44 +01:00
Marina Glancy
5824335f80 MDL-31635 completion: do not show % for the grade
Also show grades with the configured number of decimal points
2016-01-25 10:22:58 +08:00
AMOS bot
895d5aad79 Automatically generated installer lang files 2016-01-25 00:04:02 +08:00
Nadav Kavalerchik
5200054dc2 MDL-52567 Core: remove quotation marks, for proper word count 2016-01-24 00:47:13 +02:00
AMOS bot
97f26506f6 Automatically generated installer lang files 2016-01-23 00:04:07 +08:00
David Mudrák
d84c64b7d6 MDL-52873 forms: Generate unique id attributes for modgrade elements
The previous method of generating the id attribute of the elements
within the modgrade group did not take the name of the modgrade field
into account. So if there were multiple fields of the modgrade type
added into a form (not a common case yet still valid), elements created
within the group were assigned same id attributes.

The patch introduces a new method for generating the id attribute of
modgrade elements. The new method takes the name of the modgrade group
into account and returns the id in the format similar to the default one
returned by HTML_QuickForm_element::_generateId().

The patch changes the generated id attribute. Apart from the
block_activity_results' behat feature files, not other places seem to
rely on the exact value.
2016-01-22 14:24:53 +01:00
Simey Lameze
6759dc35fe MDL-35590 block_navigation: fix remaining issues 2016-01-22 18:48:04 +08:00
Rajesh Taneja
10ac8baf6e MDL-35590 behat: Fixed navigation steps to support aria attributes 2016-01-22 17:53:44 +08:00
Sara Cenni
ee8a2e2ed9 MDL-52683 mod_scorm: Fix for Last completed attempt error with Oracle 2016-01-22 10:16:05 +01:00
David Monllao
2edb12ec30 MDL-52826 forms: Move global functions to self-contained 2016-01-22 15:43:08 +08:00
Andrew Nicols
fa544b236d MDL-52137 mod_forum: Move digest body to shared template 2016-01-22 10:09:32 +08:00
Andrew Nicols
61937f48f7 MDL-52682 mod_forum: Correct redirect URL when marking posts as read 2016-01-22 08:04:05 +08:00
Michael de Raadt
acc9fed2ee MDL-52835 mod_data: Correct MIME type for JS template 2016-01-22 09:51:08 +11:00
Rushikesh
32f2116b08 MDL-29817 Form : advcheckbox allows attributes even without group key 2016-01-21 22:37:43 +05:30
Dan Poltawski
dbf6b40782 MDL-49817 grunt: jslint rename task config and make explict src
Two reasons for this change:
1) The configuration here is confusing, it seems like we are setting the
   'files' option, but in fact we are just generating a task configuration
    called 'files'. Lets try and avoid confusion.

2) It makes it possible for 'watch' to override the src
2016-01-21 15:13:45 +00:00
Rushikesh
f07e428c26 MDL-25864 Blog: Confirmation dialog before unregistering 2016-01-21 19:24:47 +05:30
Rajesh Taneja
380ab95f20 MDL-52839 behat: Fixed xpath and wait to ensure element is visible 2016-01-21 15:50:44 +08:00
Andrew Nicols
eddec36d49 weekly release 3.1dev 2016-01-21 13:43:35 +08:00
Andrew Nicols
79fbb28c37 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2016-01-21 13:43:32 +08:00