Commit graph

569 commits

Author SHA1 Message Date
Dan Poltawski
d13f2a6934 Merge branch 'MDL-51683-master' of git://github.com/FMCorz/moodle 2016-06-16 09:04:03 +01:00
Dan Poltawski
3adb62b727 MDL-52127 js: check amd files with eslint grunt task
I have spent quite a lot of time working through the current list of
eslint options and configuring them for Moodle style and I think this is
a very good basis to start us at (as well as taking some of out jshint
options out with https://www.npmjs.com/package/polyjuice ). Thanks to
Andrew Nicols, Mark Johnson and Frédéric Massart for some refinements.

With this configuration the grunt build will fail if errors are present
in the js (though you can of course tell jshint to ignore some errors,
as I have done in admin/tool/lp/amd/src/competency_rule_points.js and
defining the Y global in lib/amd/src/yui.js ).

The grunt task will not report warnings by default, but a new
--show-lint-warnings flag will help achieve that. Editor
integrations/stanadalone eslint tool will surely be a better way of
getting eslint errors rather than using the grunt task.
2016-06-11 10:14:35 +01:00
David Monllao
694d8c4a9e Merge branch 'MDL-54763_master' of git://github.com/markn86/moodle 2016-05-31 12:31:36 +08:00
Barbara Ramiro
000d660fda MDL-51683 design: New icon for competencies 2016-05-31 10:48:18 +08:00
Mark Nelson
e0d60498d8 MDL-54763 tool_lp: fixed typo in HTML tag 2016-05-30 13:31:31 +08:00
Frederic Massart
6e91817178 MDL-54721 report_competency: Do not ignore the first user selection 2016-05-26 17:54:52 +08:00
David Monllao
21eef94436 Merge branch 'MDL-54642-master' of git://github.com/ryanwyllie/moodle 2016-05-23 14:52:54 +08:00
Ryan Wyllie
3fdc542fe4 MDL-54642 tool_lp: Fix learning plan button layout in FF
The learning plan buttons are floating left but the table below it wasn't
clearning floating elements so it was appearing on the same line.
2016-05-20 02:35:11 +00:00
Eloy Lafuente (stronk7)
1abca11e0a MDL-54638 versions: bump all versions and requires near release
version = 2016052300 release version
requires= 2016051900 current rc1 version
2016-05-19 02:16:15 +02:00
David Monllao
d7256f3a49 Merge branch 'MDL-54119-master-with_progress_bar_template' of git://github.com/junpataleta/moodle 2016-05-18 11:33:04 +08:00
David Monllao
98c3f736bb Merge branch 'MDL-54595-master' of git://github.com/junpataleta/moodle 2016-05-18 11:30:25 +08:00
Dan Poltawski
7b09be79d6 Merge branch 'MDL-54545-master' of git://github.com/junpataleta/moodle 2016-05-17 17:16:09 +08:00
Dan Poltawski
76943644d4 Merge branch 'MDL-54593_master' of git://github.com/markn86/moodle 2016-05-17 17:16:09 +08:00
Jun Pataleta
9698f2dcce MDL-54119 tool_lp: Modifications for progress bars
Changes made in this patch include:
* Reverting to the original look of having the percentage label of the
  progress bar inside it.
* Setting a minimum width for the progress bar so the percentage label
  will still be visible even at 0%.
* Replaced the blank space between the percent text and the percent
  sign with a non-breaking space.
* Added relevant aria attributes for the progress bars.
* I think that this is a good opportunity to use a single template for the
  progress bars so I created one that is basically based from the core
  template columns-1to2. Column 1 contains the progress text, while column2
  contains the progress bar itself.
2016-05-17 16:01:30 +08:00
Jun Pataleta
912a183033 MDL-54595 tool_lp: Remove btn-group classes 2016-05-17 11:52:11 +08:00
Mark Nelson
beb3441b68 MDL-54593 tool_lp: added missing 'alert' CSS class 2016-05-16 14:49:27 +08:00
Mark Nelson
c7e4417533 MDL-54566 tool_lp: added message when no competencies present 2016-05-16 13:59:30 +08:00
Jun Pataleta
c89ba86342 MDL-54073 tool_lp: Unescape additional properties
* LP Blocks (Competency name)
* User evidence competency picker (User learning plan name)
* Template competencies (Course full name)
2016-05-13 18:12:32 +08:00
Dan Poltawski
6967b71a34 Merge branch 'MDL-54546-master' of git://github.com/junpataleta/moodle 2016-05-13 18:11:29 +08:00
Andrew Nicols
07d4b49760 Merge branch 'MDL-54073-master' of git://github.com/junpataleta/moodle 2016-05-13 18:11:28 +08:00
Jun Pataleta
e5336562db MDL-54546 tool_lp: Use correct property types for user/course exporters 2016-05-12 19:04:58 +08:00
Jun Pataleta
010a00db60 MDL-54545 tool_lp: Make selected items stick to the container's bounds
Set the selection's width for the user and/or competency selector fields
stick within the panel's bounds.
2016-05-12 12:40:22 +08:00
Jun Pataleta
32cf4bcb93 MDL-54073 tool_lp: Unescape PARAM_TEXT properties in templates
Use triple-curly brackets to unescape the PARAM_TEXT properties in
templates.
Changed idnumber's type to PARAM_RAW for frameworks and competencies.
2016-05-12 11:24:51 +08:00
Andrew Nicols
2239883b56 MDL-53293 tool_lp: Destroy dragdrop instance before re-creating 2016-05-11 08:19:39 +08:00
David Monllao
8ec64e757e Merge branch 'MDL-53989-master' of git://github.com/ryanwyllie/moodle 2016-05-09 07:37:09 +08:00
David Monllao
729738d14c Merge branch 'MDL-54058-master' of git://github.com/junpataleta/moodle 2016-05-06 13:53:07 +08:00
Ryan Wyllie
fd83879728 MDL-53989 cbe: CMD + click selection for competency picker 2016-05-06 04:40:02 +00:00
Jun Pataleta
2cf9e3f0ca MDL-54058 tool_lp: Set framework select's width in competency picker 2016-05-06 10:34:29 +08:00
Andrew Nicols
1c693f7226 MDL-53730 JavaScript: Build form-autocomplete 2016-05-06 09:27:33 +08:00
Adrian Greeve
be8b9189c4 MDL-53730 JavaScript: Fix for competency autoselect issue.
When trying to select a user or competency the first select
would not work. Worked fine on the second select. This fixes
that problem and tidies up the code.
2016-05-06 09:27:32 +08:00
Frederic Massart
043ae97239 MDL-54053 competencies: Teachers can rate competencies from a course 2016-05-06 09:27:30 +08:00
Juan Leyva
3123c2cff5 MDL-53993 competency: Add CBE external functions to the Mobile service 2016-05-06 09:27:29 +08:00
Andrew Nicols
d0ec347a76 Merge branch 'MDL-53982-master' of https://github.com/FMCorz/moodle 2016-05-03 14:26:50 +08:00
David Monllao
c6d1eb5f51 Merge branch 'MDL-53925-master' of https://github.com/StudiUM/moodle 2016-05-03 09:54:59 +08:00
Serge Gauthier
cb22606ce7 MDL-53925 competency: Plan and template descriptions are not displayed 2016-05-02 10:22:13 -04:00
Frederic Massart
60011d9a8a MDL-53982 competency: Javascript error due to string injection 2016-05-02 16:59:09 +08:00
Andrew Nicols
7b9cf51ad2 Merge branch 'MDL-53982-master' of git://github.com/FMCorz/moodle 2016-05-02 13:04:20 +08:00
Frederic Massart
ba7f6eeaee MDL-53982 competency: Javascript error due to string injection 2016-05-02 12:57:03 +08:00
David Monllao
f74e3ace69 Merge branch 'MDL-53980-master-enfix' of git://github.com/mudrd8mz/moodle 2016-05-02 10:46:50 +08:00
David Monllao
b4dfe61bdb Merge branch 'MDL-53877-master' of git://github.com/junpataleta/moodle 2016-05-02 10:22:25 +08:00
Serge Gauthier
3cd9461e77 MDL-53877 competency: Help and better validation text for evidence URL 2016-05-02 10:01:24 +08:00
David Monllao
3166be0831 Merge branch 'MDL-53917-master' of git://github.com/junpataleta/moodle 2016-05-02 10:00:29 +08:00
Eloy Lafuente (stronk7)
b22692d740 Merge branch 'MDL-53955-master' of git://github.com/junpataleta/moodle 2016-04-30 09:39:16 +02:00
Dan Poltawski
f6ab2b87e6 Merge branch 'MDL-53879-master' of git://github.com/FMCorz/moodle 2016-04-29 12:18:05 +01:00
Jun Pataleta
0bb7552429 MDL-53494 tool_lp: Set correct competency and user ID attributes
Sets the correct competency and user ID data attributes for the list of
user competencies in the plan.
2016-04-29 12:18:04 +01:00
Jun Pataleta
e9b4bca0f8 MDL-53917 tool_lp: Show course competency notice appropriately
Show course competency notice only if the user has a
moodle/competency:competencygrade capability.
2016-04-29 15:23:44 +08:00
David Mudrák
c1d44340a5 MDL-53980 lang: Fix the reworded strings in Behat tests 2016-04-28 18:39:59 +02:00
Helen Foster
a5061bf7b7 MDL-53980 lang: Merge English strings from the en_fix language pack 2016-04-28 18:32:03 +02:00
Frederic Massart
8ea0f17ae9 MDL-53879 competency: Remove limit on framework depth 2016-04-28 16:41:24 +08:00
Jun Pataleta
9031371211 MDL-53955 tool_lp: Remove the use of chained steps in tool_lp 2016-04-28 14:57:54 +08:00