mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-13 12:32:08 +02:00
Code Issues Projects Releases Wiki Activity
78,790 Commits 37 Branches 536 Tags
0450f5e081
Commit Graph

78790 Commits

Author SHA1 Message Date
John Okely
0450f5e081 MDL-53988 mod_lti: Improve error handling and user interface 
Only show one, more helpful error instead of two non-helpful errors.
Don't show the 'no configured tools' message if there is a proxy there.
Return to the Tool configure page when editing a proxy if you came
from it.
 2016-05-19 17:10:00 +08:00
Dan Poltawski
b887c81907 Merge branch 'MDL-54633-master-tinymce' of git://github.com/mudrd8mz/moodle 2016-05-19 09:00:12 +01:00
Andrew Nicols
9f59bc5b2c Merge branch 'MDL-54632-master' of git://github.com/andrewnicols/moodle 2016-05-19 15:17:03 +08:00
Marina Glancy
bff0a28894 MDL-54632 mod_lti: separate show as preconfigured and in activitychooser 2016-05-19 15:15:46 +08:00
David Monllao
8af3e3abb2 Merge branch 'MDL-54630_master' of git://github.com/markn86/moodle 2016-05-19 15:03:14 +08:00
Mark Nelson
1e03d74cfa MDL-54630 core_tags: preserve 'timemodified' when moving tags 2016-05-19 14:50:12 +08: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
Andrew Nicols
9dfee70f6b Merge branch 'MDL-53988-master-fix' of https://github.com/xow/moodle 2016-05-19 11:58:16 +08:00
John Okely
b1c8a860cb MDL-53988 mod_lti: Add language string for unactivated proxies 2016-05-19 11:55:17 +08:00
Andrew Nicols
9e550d5804 Merge branch 'MDL-54542-master-fixup' of https://github.com/FMCorz/moodle 2016-05-19 11:52:29 +08:00
Andrew Nicols
367c85d78c Merge branch 'MDL-53988-master' of https://github.com/xow/moodle 2016-05-19 11:43:27 +08:00
Frederic Massart
d309f3e218 MDL-54542 competency: Really handle false negatives in plans to review 2016-05-19 11:42:15 +08:00
David Monllao
a1643e66b0 Merge branch 'MDL-54578_m31v2' of https://github.com/sbourget/moodle 2016-05-19 11:41:21 +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
Andrew Nicols
a88f8b2fd5 Merge branch 'MDL-54542-master-fixup' of https://github.com/FMCorz/moodle 2016-05-19 10:56:50 +08:00
Frederic Massart
c07712db17 MDL-54542 competency: False negative when listing plans to review 2016-05-19 10:23:46 +08:00
Eloy Lafuente (stronk7)
29a004946b MDL-54638 versions: main version bump 2016-05-19 02:17:59 +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
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
Dan Poltawski
60941d4cb0 Merge branch 'MDL-54025' of https://github.com/stronk7/moodle 2016-05-18 19:20:23 +01:00
Eloy Lafuente (stronk7)
8728dbeecb MDL-54025 mod_lti: Amend tests to observe the new behavior 2016-05-18 19:37:57 +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
Stephen Bourget
0fd2260069 MDL-54578 Behat: Add tests for the myprofile block 2016-05-18 09:08:24 -04: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
cb5167df12 Merge branch 'MDL-54025_master' of https://github.com/snake/moodle 2016-05-18 11:38:30 +01:00
Dan Poltawski
5c602bf5bb MDL-54553 behat: check statuscode of http request 2016-05-18 11:15:58 +01:00
Dan Poltawski
53b540c82a Merge branch 'MDL-54027-master' of git://github.com/FMCorz/moodle 2016-05-18 11:05:06 +01:00
Dan Poltawski
07eb3a0db7 Merge branch 'wip-mdl-53956' of https://github.com/rajeshtaneja/moodle 2016-05-18 10:45:22 +01: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
923b230c8e Merge branch 'wip-MDL-54061-master' of git://github.com/abgreeve/moodle 2016-05-18 16:20:27 +08:00
Adrian Greeve
759f61fe1c MDL-54061 mod_assign: Added encoding and separator to upload form. 
Added the fields of encoding and separator so that the user has
more control when uploading a csv assignment grading file.
 2016-05-18 15:50:33 +08:00
David Monllao
eface10d30 MDL-45390 grades: Bump build to today's date 
To test backup/restore.
 2016-05-18 14:12:21 +08: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
d9e7af1d6a Merge branch 'MDL-54594-master' of git://github.com/ryanwyllie/moodle 2016-05-18 14:02:00 +08:00
David Monllao
50c338b84b Merge branch 'MDL-54544-master' of git://github.com/damyon/moodle 2016-05-18 13:55:05 +08:00
Ryan Wyllie
7d7e5a4cf0 MDL-54594 mod_assign: Fix editpdf toolbar breakpoints 
Fixed the CSS media breakpoints for the editpdf toolbar after the
additional button was added.
 2016-05-18 05:53:44 +00: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
David Monllao
f3ba5f4249 Merge branch 'MDL-53805-master' of git://github.com/cameron1729/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2016-05-18 12:24:45 +08:00
Andrew Nicols
03b5351f88 MDL-54620 rating: Add tests for get_aggregate_string 2016-05-18 12:13:52 +08:00
Andrew Nicols
134b6485e2 Merge branch 'MDL-54620_master' of git://github.com/dmonllao/moodle 2016-05-18 12:04:20 +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
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
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
Andrew Nicols
63c492ece0 Merge branch 'MDL-54049-master' of git://github.com/jleyva/moodle 2016-05-18 10:34:34 +08:00
David Monllao
6b6847bc97 Merge branch 'MDL-54164-integration-cli-fix' of git://github.com/ryanwyllie/moodle 2016-05-18 10:30:30 +08:00