moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
79931 commits 37 branches 540 tags 1.3 GiB
Commit graph

6217 commits

Author SHA1 Message Date
Frederic Massart
7c9968bd9f MDL-24064 admin: Remove unused code to bulk enrol users 2016-05-24 18:48:06 +08:00
David Monllao
21eef94436 Merge branch 'MDL-54642-master' of git://github.com/ryanwyllie/moodle 2016-05-23 14:52:54 +08:00
Eloy Lafuente (stronk7)
4da854a68b MDL-54677 upgrade: add 3.1.0 separation line to all upgrade scripts 2016-05-23 01:31:34 +02: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)
536c4e920a Merge branch 'MDL-54643-master' of git://github.com/jleyva/moodle 2016-05-19 13:50:47 +02:00
Juan Leyva
b4baee42e2 MDL-54643 tool_mobile: Fix dependencies check 2016-05-19 11:55:14 +02: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
Dan Poltawski
27bdd818f6 Merge branch 'MDL-54549-master-en_fix' of git://github.com/mudrd8mz/moodle 2016-05-18 10:28:08 +01: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
Helen Foster
75a22eb9fb MDL-54549 lang: Merge English strings from the en_fix language pack 2016-05-17 18:26:15 +02: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
Dan Poltawski
5a2283cdc0 Merge branch 'wip-MDL-53923-master' of git://github.com/abgreeve/moodle 2016-05-17 17:16:08 +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
Vadim Dvorovenko
7025aeed03 MDL-54599 Navigation: Sorting plugins by visible name 
Sorting plugins name in admin settings tree by visible (localized) name.
 2016-05-16 23:08:05 +07:00
Mark Nelson
beb3441b68 MDL-54593 tool_lp: added missing 'alert' CSS class 2016-05-16 14:49:27 +08:00
Simey Lameze
c4d692285f MDL-53923 mod_assign: test unoconv path 2016-05-16 14:08:09 +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
Andrew Nicols
e53d7e7c04 Merge branch 'MDL-50063' of git://github.com/stronk7/moodle 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
Eloy Lafuente (stronk7)
07a069f1c0 MDL-50063 unittests: Remove some unnecesary gc_collect_cycles() 
Now backup and restore operations free logger resources calling
to the destroy() method. This commit ensures:

1) That gc_collect_cycles() is not used anymore in backup-related tests.
2) That all backup and restore controllers in test do always call
   to the detroy() method.
3) Some unset() calls, needed to make gc_collect_cycles() are not used
   anymore.
 2016-05-13 02:50:45 +02:00
Eloy Lafuente (stronk7)
da322ad078 MDL-54205 tool_recyclebin: Adding missing destroy() calls. 
This was causing controller references not cleaned till gc
and loggers to remain open, leading to problems under windows.
 2016-05-13 01:54:37 +02: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
Andrew Nicols
bbdef8886f Merge branch 'MDL-52708' of https://github.com/ramdesh/moodle 2016-05-09 15:49:48 +08:00
Andrew Nicols
cc47c7174b Merge branch 'MDL-54072' of git://github.com/aolley/moodle 2016-05-09 15:14:27 +08:00
David Monllao
8ec64e757e Merge branch 'MDL-53989-master' of git://github.com/ryanwyllie/moodle 2016-05-09 07:37:09 +08:00
Joshua Todd Cowper
78c2c3bb42 MDL-51978 admin: default course format to topics 
Change default setting for default course format to topics, and also fix
coding style issue on same line (75) by adding a space after comma
Change default setting for default number of sections to 4
 2016-05-08 22:38:00 +10:00
David Monllao
729738d14c Merge branch 'MDL-54058-master' of git://github.com/junpataleta/moodle 2016-05-06 13:53:07 +08:00
Adam Olley
4ec4b2b65c MDL-54072 tool_recyclebin: Avoid hardcoded course_modules count 
One of the unit tests for tool_recyclebin makes an assumption that a
fresh install of Moodle has no course modules, which is true for vanilla
moodle.

However there are some third party plugins (mod_oublog and
mod_respondusws are the ones I've run into) that have a course module
added to the frontpage course on install.

So this change alters the test from comparing the count of modules in
the test course with a hardcoded value to first getting the existing
count of values before performing the actions that affect the count and
then using that value to compare with.
 2016-05-06 15:04:16 +09:30
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
David Monllao
2df5ede635 Merge branch 'MDL-54006-master' of git://github.com/lameze/moodle 2016-05-02 14:20:11 +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
Simey Lameze
0de3caf616 MDL-54006 tool_uploaduser: check validation result before display warning 2016-05-02 11:45:59 +08:00