mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-29 03:52:33 +01:00
Code Issues Projects Releases Wiki Activity
78,547 Commits 36 Branches 527 Tags
Commit Graph

6082 Commits

Author SHA1 Message Date
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
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
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
David Monllao
a43c1ca7d4 Merge branch 'MDL-53918-master' of git://github.com/junpataleta/moodle 2016-05-02 09:54:52 +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
David Monllao
d4a41aa252 Merge branch 'MDL-53943-master' of git://github.com/junpataleta/moodle 
Conflicts:
	admin/tool/cohortroles/settings.php
 2016-04-29 12:19:39 +01: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
David Monllao
7cbb29e264 Merge branch 'MDL-49414-master' of git://github.com/cameron1729/moodle 2016-04-29 12:18:00 +01:00
Dan Poltawski
48715140a3 Merge branch 'MDL-53915-master' of git://github.com/junpataleta/moodle 2016-04-29 12:17:50 +01:00
Jun Pataleta
d238016e0d MDL-53918 tool_cohortroles: Assign role on non-empty user and cohort IDs 2016-04-29 15:43:56 +08: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
Jun Pataleta
782fc43bd8 MDL-53943 tool_cohortroles: Require 'moodle/cohort:view' capability 
tool_cohortroles not just needs the 'moodle/role:manage' capability,
but the 'moodle/cohort:view' capability as well since the cohorts
selector field will not work without it.
 2016-04-28 16:47:56 +08: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
Jun Pataleta
60a9993bce MDL-53494 tool_lp: Fix dialogue display when plan is completed 2016-04-27 09:09:52 +01:00
Cameron Ball
f23e9b6ba4 MDL-49414 webservices: Remove deprecated functions 2016-04-27 15:54:38 +08:00
Jun Pataleta
147427ee7b MDL-53915 tool_cohortroles: Change setting URL to a proper moodle_url 2016-04-27 13:13:50 +08:00
Dan Poltawski
667589d05f MDL-53698 admin_lp: trailing whitespace 2016-04-26 16:42:34 +01:00
Dan Poltawski
604d5d4730 Merge branch 'MDL-53698_master' of https://github.com/StudiUM/moodle 2016-04-26 16:42:00 +01:00
Dan Poltawski
9312c9c4ee Merge branch 'MDL-53629_master2' of https://github.com/StudiUM/moodle 2016-04-26 13:33:39 +01:00
Dan Poltawski
587580a0df Merge branch 'MDL-53494_master' of https://github.com/StudiUM/moodle 2016-04-26 11:31:55 +01:00
Dan Poltawski
23f1dbde67 Merge branch 'MDL-53859_master' of https://github.com/StudiUM/moodle 2016-04-26 10:31:00 +01:00
Dan Poltawski
11ec31188a Merge branch 'MDL-53924-master' of git://github.com/FMCorz/moodle 2016-04-26 10:28:37 +01:00
Frederic Massart
f1a9fcd96a MDL-53924 competency: Relax strictness of default capabilities 2016-04-26 12:12:46 +08:00
David Monllao
6e233df58e Merge branch 'MDL-53667-master' of git://github.com/FMCorz/moodle 2016-04-26 11:38:00 +08:00
David Monllao
e7c979dff8 Merge branch 'MDL-53632-master' of git://github.com/FMCorz/moodle 2016-04-26 11:29:51 +08:00
David Monllao
29752d05ae Merge branch 'MDL-53733_master' of https://github.com/StudiUM/moodle 2016-04-26 10:55:03 +08:00
David Monllao
e9eb7ca21f Merge branch 'MDL-53878_master' of https://github.com/StudiUM/moodle 2016-04-26 10:49:32 +08:00
David Monllao
e1f9593de4 Merge branch 'MDL-53678_master' of https://github.com/StudiUM/moodle 2016-04-26 10:45:40 +08:00
David Monllao
1ef42d5f29 Merge branch 'MDL-53865-master' of git://github.com/junpataleta/moodle 2016-04-26 09:38:33 +08:00