moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-08 10:26:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
82917 commits 37 branches 544 tags 1.3 GiB
Commit graph

6571 commits

Author SHA1 Message Date
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
Dan Poltawski
ca6cbe3428 Merge branch 'MDL-53853-master' of git://github.com/junpataleta/moodle 2016-04-25 22:00:18 +01:00
Issam Taboubi
68f8ad4c95 MDL-53698 tool_lp: Progress percent sign not showing 2016-04-22 14:00:12 -04:00
Issam Taboubi
18daa64cbf MDL-53878 tool_lp: Condition on displaying Link competencies button 2016-04-22 13:57:09 -04:00
Issam Taboubi
e65fda6b7f MDL-53733 tool_lp: Competency heading misaligned in templatecompetency 2016-04-22 13:54:02 -04:00
Issam Taboubi
ee0ca65f4e MDL-53678 tool_lp: Dropdown list plan displays horizontal scroll bar 2016-04-22 13:51:52 -04:00
Issam Taboubi
7fbbd771f7 MDL-53494 tool_lp: user_competency_in_plan page should be in a popup 2016-04-22 12:32:46 -04:00
Serge Gauthier
eeb477079e MDL-53859 competency: Can't change user in course competency breakdown 2016-04-22 11:41:36 -04:00
Serge Gauthier
184f9b12ed MDL-53629 tool_lp: Add buttons should be displayed left below the title 2016-04-22 10:50:40 -04:00
Eloy Lafuente (stronk7)
7e122c6e29 NOBUG: Fixed SVG browser compatibility 2016-04-22 10:56:53 +02:00
Frederic Massart
5592edb646 MDL-53451 competency: Improve performance by bypassing api::is_enabled() 2016-04-22 11:34:39 +08:00
Andrew Nicols
6ab41abd3e Merge branch 'MDL-52781-master' of git://github.com/lameze/moodle 2016-04-21 15:54:45 +08:00
Simey Lameze
94a578af82 MDL-52781 tool_uploaduser: add invalid data warnings if validation fails 2016-04-21 15:34:32 +08:00