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

22260 commits

Author SHA1 Message Date
Dan Poltawski
b887c81907 Merge branch 'MDL-54633-master-tinymce' of git://github.com/mudrd8mz/moodle 2016-05-19 09:00:12 +01:00
David Monllao
ca7b16fa70 Merge branch 'MDL-54638' of git://github.com/stronk7/moodle 
Conflicts:
	mod/lti/version.php
 2016-05-19 13:47:22 +08:00
David Monllao
505ce88467 MDL-54627 search: Ensure that all format_string strings are text. 
All user input that is usually displayed through format_strings with
filters like mulitlang applied should be converted to text as well.
 2016-05-19 13:16:01 +08:00
Andrew Nicols
367c85d78c Merge branch 'MDL-53988-master' of https://github.com/xow/moodle 2016-05-19 11:43:27 +08:00
David Monllao
89fc74508b Merge branch 'MDL-54613-m' of https://github.com/micaherne/moodle 2016-05-19 11:20:58 +08:00
John Okely
811d9ff941 MDL-53988 mod_lti: Fix followup up issues 
Fix function naming
Fix param types
Fix error popping up twice with incorrect URL
Add confirm dialog when you delete a tool
Show orphaned tool proxies in list
Fix interface jumping up and down
Change to use notification stack
Change capabilities in db/services.php
Add loading animation after registering tool
Show loading animation until tools are rendered
 2016-05-19 11:18:21 +08: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 Mudrák
34321d491b MDL-54633 tinymce: Automatically sync editor with its textarea 
Probably as a result of recent changes in the way how forms client side
validators are trigerred (MDL-52826), the field validator has been
triggered before the underlying textarea's values property is updated by
TinyMCE. This led to marking such a field as "required" even if the
value is provided.

Inspired by http://stackoverflow.com/questions/2122085/
this patch adds a new onchange callback that automatically keeps the
underlying textarea synced with the editor iframe. Relevant API docs:
http://archive.tinymce.com/wiki.php/Configuration3x:onchange_callback

I was also trying to call the save() method via the editor's onSubmit
method but that one seems to be also triggered only after the validator.
 2016-05-19 00:50:08 +02:00
Eloy Lafuente (stronk7)
a73d64585a Merge branch 'MDL-54553-master' of git://github.com/danpoltawski/moodle 2016-05-18 18:23:41 +02:00
Eloy Lafuente (stronk7)
c0fe085c24 Merge branch 'MDL-53896-master' of git://github.com/cameron1729/moodle 2016-05-18 13:36:45 +02:00
Dan Poltawski
5c602bf5bb MDL-54553 behat: check statuscode of http request 2016-05-18 11:15:58 +01:00
Dan Poltawski
07eb3a0db7 Merge branch 'wip-mdl-53956' of https://github.com/rajeshtaneja/moodle 2016-05-18 10:45:22 +01:00
David Monllao
9d00c6e9e5 Merge branch 'wip-MDL-45390-master' of git://github.com/abgreeve/moodle 2016-05-18 14:10:31 +08:00
David Monllao
50c338b84b Merge branch 'MDL-54544-master' of git://github.com/damyon/moodle 2016-05-18 13:55:05 +08:00
Damyon Wiese
4f54bdc733 MDL-54544 files: Better error handling in $fs->create_converted_document() 2016-05-18 13:44:13 +08:00
David Monllao
61e1d3d96c Merge branch 'MDL-53883_master' of git://github.com/markn86/moodle 2016-05-18 13:00:29 +08:00
Cameron Ball
cd6041b98f MDL-53896 core: Document Html2Text run-time overrides 2016-05-18 11:37:17 +08:00
Andrew Nicols
e0c901dc49 MDL-53896 core: WIP bc layer for Html2Text 2016-05-18 11:35:37 +08:00
Adrian Greeve
41abbbbde5 MDL-45390 gradebook: sql tidy up and version alignment. 2016-05-18 10:41:30 +08:00
Rajesh Taneja
1ef6a5e30a MDL-53956 behat: Avoid before and after step and switch 
After pressing the button, if system is slow then
after step and before step might fail as the window
is closed by then. Execute steps one after other
 2016-05-18 10:41:01 +08:00
David Monllao
ece791dbd4 MDL-45390 grades: Courses letters using system bad boundaries 
Added unit tests to highlight the existing failures and adding
unset_config between each set of tests.
 2016-05-18 10:08:10 +08:00
Adrian Greeve
405b90bcd2 MDL-45390 gradebook: Grade boundary fix. 
Code to upgrade, fix, and freeze the gradebook for
courses with letter boundary problems.
 2016-05-18 09:56:00 +08:00
Ryan Wyllie
073fcb5aa1 MDL-54164 notification: Add notification render to CLI renderer 2016-05-18 01:48:37 +00:00
Adrian Greeve
70dfd48f53 MDL-45390 gradebook: Unit tests for grade boundary issue. 2016-05-18 09:08:18 +08:00
David Monllao
ccf323d571 Merge branch 'MDL-54164-master' of git://github.com/ryanwyllie/moodle 2016-05-18 07:11:25 +08:00
Michael Aherne
0c0f01aa4c MDL-54613 unit tests: Add iteminstance to test grade_item 2016-05-17 13:06:32 +01:00
Mark Nelson
40d5651302 MDL-53883 core_form: updated the group elements ID 2016-05-17 17:53:17 +08:00
Rajesh Taneja
13708875d3 MDL-54573 testing: don't uppercase dbtype 2016-05-17 17:16:12 +08:00
David Monllao
f0a2dbf188 Merge branch 'MDL-54121-master' of git://github.com/damyon/moodle 2016-05-17 17:16:12 +08:00
David Monllao
2fb0f13a87 Merge branch 'MDL-54573-master' of git://github.com/danpoltawski/moodle 2016-05-17 17:16:10 +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
David Monllao
a7bb1dda6e Merge branch 'MDL-53311-master-moregooderer' of git://github.com/cameron1729/moodle 2016-05-17 17:16:07 +08:00
Ryan Wyllie
2059d6edb5 MDL-54164 upgradelib: Remove close button on success notification 2016-05-17 03:55:46 +00:00
Damyon Wiese
5620177efd MDL-54544 file: Use shared tmp storage for unoconv document conversions 2016-05-17 10:58:25 +08:00
Dan Poltawski
fc3d70d798 MDL-54573 testing: don't uppercase dbtype 2016-05-16 08:25:10 +01:00
Adrian Greeve
0eecf87687 MDL-53923 mod_assign: Movement of functions to file_storage. 2016-05-16 14:32:54 +08:00
Simey Lameze
c4d692285f MDL-53923 mod_assign: test unoconv path 2016-05-16 14:08:09 +08:00
David Monllao
2d5032db89 Merge branch 'MDL-54026-master' of git://github.com/andrewnicols/moodle 2016-05-16 11:52:02 +08:00
Tim Hunt
795efd9c1b MDL-54582 accesslib: improve performance of load_course_context 
The new query is logically equivalen, but much, much faster, at
least on Postgred. (15ms, instead of 700ms, in one example I tried
on the database for the OU's main Moodle site.)
 2016-05-13 20:36:33 +01:00
Dan Poltawski
f6cbdf788a MDL-54573 testing: use dbtype rather dbvendor for diagnostics 
So that we can differentiate between drivers
 2016-05-13 14:49:42 +01:00
Andrew Nicols
e53d7e7c04 Merge branch 'MDL-50063' of git://github.com/stronk7/moodle 2016-05-13 18:12:32 +08:00
Andrew Nicols
a1057084e1 MDL-52253 scales: Correct doc 2016-05-13 18:12:31 +08:00
Damyon Wiese
d03602c86b MDL-52253 scales: Prevent deletion of the last global scale 2016-05-13 18:12:31 +08:00
Damyon Wiese
8de0b1ab7d MDL-52253 scales: Add new competence scale 2016-05-13 18:12:28 +08:00
Damyon Wiese
81967b54b6 MDL-52253 scales: Install the separate and connected scale 2016-05-13 18:11:30 +08:00
Dan Poltawski
35f11c55fb Merge branch 'MDL-54101_master' of git://github.com/markn86/moodle 2016-05-13 18:11:29 +08:00
Cameron Ball
f65ce33f99 MDL-53311 behat: Update behat navigation steps 2016-05-13 16:01:48 +08:00
Cameron Ball
4838a19641 MDL-53311 navigation: Move treeitem role on to p 
Previously the li elements had the treeitem role, which was not invalid,
but it meant that when a menu item expanded, the entire li was clickable
and clicking anywhere that was not another menu item would cause the
(sub)tree to collapse. This patch moves the treeitem role on to the p
element (which contains the node name) and uses aria-owns to expand

Mad shoutouts to Ryan Wyllie for his assistance 🙌

🌄 ᚳᚱᛒ
 2016-05-13 16:01:44 +08:00
Andrew Nicols
6885517d78 MDL-54121 core-notification: Fix lockscroll recalc for nest dialogues 2016-05-13 12:12:05 +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