mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-03 15:32:43 +02:00
Code Issues Projects Releases Wiki Activity
78,227 Commits 36 Branches 528 Tags
Commit Graph

21509 Commits

Author SHA1 Message Date
David Monllao
c3b661403c Merge branch 'cbe' of git://github.com/FMCorz/moodle 2016-04-19 12:37:11 +08:00
Andrew Nicols
383819375d Merge branch 'MDL-53779-master' of git://github.com/FMCorz/moodle 2016-04-19 10:32:56 +08:00
Eloy Lafuente (stronk7)
15f69edb1d Merge branch 'MDL-53796_master' of git://github.com/dmonllao/moodle 2016-04-19 01:58:13 +02:00
Frederic Massart
1e99f31e33 MDL-53654 competency: Provide a way to delete evidence 2016-04-18 11:06:47 +08:00
Frederic Massart
56537316f6 MDL-53719 competency: Delete content upon course and cm delete/reset 2016-04-18 11:06:01 +08:00
Frederic Massart
b14311b2cd MDL-53760 competency: Set block_lp as default dashboard block 2016-04-18 11:06:01 +08:00
Frederic Massart
8d0c57ed08 MDL-53700 competency: Migrating scale_used hook to core 2016-04-18 11:06:00 +08:00
Frederic Massart
899f46d6de MDL-53700 competency: Use URL resolver in events 2016-04-18 11:06:00 +08:00
Frederic Massart
d8370908b5 MDL-53700 competency: Update standard plugins list 2016-04-18 11:06:00 +08:00
Frederic Massart
e6dc03d7c4 MDL-53700 competency: Migrating language strings 2016-04-18 11:06:00 +08:00
Frederic Massart
4aa6acb22a MDL-53700 competency: Migrating comment related APIs to core 2016-04-18 11:05:59 +08:00
Frederic Massart
c88b6c05ca MDL-53700 competency: Migrating observers to core 2016-04-18 11:05:59 +08:00
Frederic Massart
5a1a685c28 MDL-53700 competency: Migrating events to core 
Leaving comments behind for now as it's a tricky one.
 2016-04-18 11:05:59 +08:00
Frederic Massart
81de839f37 MDL-53700 competency: Migrating external functions to core 2016-04-18 11:05:59 +08:00
Frederic Massart
767f66c028 MDL-53700 competency: Migrating the competency API to core 2016-04-18 11:05:59 +08:00
Frederic Massart
67bc0eaf38 MDL-53700 competency: Migrate main classes to core 2016-04-18 11:05:59 +08:00
Frederic Massart
36a43db821 MDL-53700 competency: Migrating message definitions to core 2016-04-18 11:05:58 +08:00
Frederic Massart
42a7899f0d MDL-53700 competency: Migrate tasks to core 2016-04-18 11:05:58 +08:00
Frederic Massart
a4e659c788 MDL-53700 competency: Migrate database tables to core 2016-04-18 11:05:58 +08:00
Frederic Massart
b90e2205b4 MDL-53700 competency: Migrate capabilities to core 2016-04-18 10:59:01 +08:00
Frederic Massart
23381ab803 MDL-51036 tool_lp: Making comments work inside templates 2016-04-18 10:58:49 +08:00
Frederic Massart
44c6470d90 MDL-51025 tool_lp: Removing hardcoded link to frameworks in navigation 2016-04-18 10:58:33 +08:00
Frederic Massart
2de75345bb MDL-51025 tool_lp: Frameworks can be created on a category level 2016-04-18 10:58:33 +08:00
Damyon Wiese
7e8d4dac9b MDL-50308 tool_lp: Big javascript cleanup 
This includes:
* Move all JS modules from lib/amd to admin/tool/lp/amd
* Add all jsdocs
* fix all jshint warnings
* Rewrite the actionmenu wrapper to a real amd module
 2016-04-18 10:58:32 +08:00
Damyon Wiese
d9a39950b2 MDL-49459 Learning plans: Support for creating and editing competency frameworks. 
This includes an API (\tool_lp\competency_api), a set of web services, unit tests for the web services and a nice UI built as an admin tool.
 2016-04-18 10:58:32 +08:00
Damyon Wiese
c2f30eeddb MDL-49264 Javascript: Add a simple version of dragdrop reordering 
This is done in YUI with an AMD wrapper.
 2016-04-18 10:58:32 +08:00
Damyon Wiese
61ddd5ecd4 MDL-49263 Javascript: Add an AMD wrapper for actionmenus 2016-04-18 10:58:32 +08:00
Damyon Wiese
821ab1bf9b MDL-52954 assign: Behat fixes because the assign grading ui has changed 2016-04-15 15:57:56 +08:00
Damyon Wiese
11c16f5fc8 MDL-53772 externallib: Deprecate external_function_info() 2016-04-14 15:07:41 +08:00
Damyon Wiese
e02e7f5a01 MDL-53772 libraries: More context fixes 
1. Improve upgrade note
2. Don't abuse $PAGE to get the current course/cm
3. Use validate_context, never $PAGE->set_context()
4. Reset current coursemodule in validate_context().
5. Respect moodlepageclass when calling an external function.
 2016-04-14 15:02:41 +08:00
David Monllao
3dd89357d4 Merge branch 'MDL-53772-master' of git://github.com/damyon/moodle 
Conflicts:
	lib/upgrade.txt
 2016-04-14 14:01:16 +08:00
Marina Glancy
787ec240c1 MDL-53772 inplace_editable: set context in callbacks 2016-04-14 13:58:29 +08:00
Damyon Wiese
56fa860ead MDL-53772 externallib: Fix busted webservices context handling 
Fix:
$PAGE->context must be reset when calling validate_context

Improve:
Provide wrapper for calling an external function

The wrapper correctly checks the function parameters and return type against
the description of the external function, and stores the PAGE and COURSE global
state variables, restoring them before the function returns.

Fix: buggy unit tests.

These tests are expecting debugging from a bug that was fixed, and calling web
service functions with no user or session.
 2016-04-14 13:58:23 +08:00
Dan Poltawski
e92a39cf0c Revert "Merge branch 'MDL-52944-master' of git://github.com/cameron1729/moodle" 
This reverts commit 61a0465ce76154dbe223649c58c66313e9b510ae, reversing
changes made to 2408f8fe2bf6321592cc1ab5a8db6f9b3c65eb4b.
 2016-04-13 10:48:59 +01:00
David Monllao
8918a8115e MDL-53796 behat: Move get_debug_text to base class 2016-04-13 10:34:28 +08:00
David Monllao
101303034f Merge branch 'wip-MDL-16855-master' of https://github.com/marinaglancy/moodle 2016-04-13 09:51:35 +08:00
David Monllao
27bfb0ee9b Merge branch 'wip-MDL-45064-master' of https://github.com/marinaglancy/moodle 2016-04-13 09:38:12 +08:00
Marina Glancy
df003a85f0 MDL-53443 mod_feedback: templates code clean up and behat tests 2016-04-13 09:21:33 +08:00
Marina Glancy
9ca0420e93 MDL-45064 course: mod callback get_shortcuts() 
also deprecate callback get_types()
 2016-04-13 08:30:04 +08:00
John Okely
01e8bfd745 MDL-45064 lti: LTI types in activity chooser 2016-04-13 08:30:04 +08:00
Eloy Lafuente (stronk7)
11c673f3a3 Merge branch 'MDL-53167-master' of git://github.com/merrill-oakland/moodle 2016-04-12 21:34:41 +02:00
Dan Poltawski
d350414813 Merge branch 'MDL-52263-master' of git://github.com/crazyserver/moodle 2016-04-12 16:50:29 +01:00
Dan Poltawski
61a0465ce7 Merge branch 'MDL-52944-master' of git://github.com/cameron1729/moodle 2016-04-12 14:13:36 +01:00
Pau Ferrer Ocaña
b1a9804a9b MDL-52263 libraries: Add test cases to external_format_text options 2016-04-12 15:05:46 +02:00
Pau Ferrer Ocaña
19a131edff MDL-52263 libraries: Add options to external_format_text 2016-04-12 14:39:23 +02:00
Frederic Massart
bf6239eddb MDL-53779 external: get_string and get_strings use PARAM_RAW 
For the string parameters and translated strings.
 2016-04-12 17:04:19 +08:00
David Monllao
212153767a Merge branch 'wip-MDL-52707-master' of https://github.com/marinaglancy/moodle 2016-04-12 14:34:11 +08:00
Dan Poltawski
4a39dd3071 Merge branch 'wip-MDL-53363-master' of https://github.com/marinaglancy/moodle 2016-04-11 16:34:26 +01:00
Dan Poltawski
5702a8289b Merge branch 'MDL-52954-master' of git://github.com/damyon/moodle 2016-04-11 09:52:40 +01:00
David Monllao
468ef66775 Merge branch 'MDL-52385-master' of git://github.com/andrewnicols/moodle 2016-04-11 13:54:23 +08:00