mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-01 22:42:35 +02:00
Code Issues Projects Releases Wiki Activity
81,540 Commits 36 Branches 528 Tags
Commit Graph

81540 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jun Pataleta
826ee7370e MDL-55825 enrol_lti: Added context type column to enrol_lti_lti2_context 2016-10-28 10:10:43 +08:00
Jun Pataleta
a78d184c05 MDL-55825 core_lib: LTI tool provider library fixes 
* Define consumer profile member variable for ToolConsumer class
* Added context type property for Context class
* Set context type if 'context_type' parameter was submitted through POST

This commit can be dropped once the pull requests for these changes have
been integrated upstream.
 2016-10-28 10:10:43 +08:00
Jun Pataleta
f30f627501 MDL-56339 enrol_lti: Force page layout to embedded from custom setting 2016-10-28 10:05:02 +08:00
Jun Pataleta
59eb63612b MDL-56573 enrol_lti: Non-null default for tool_consumer_instance_name 2016-10-28 10:03:19 +08:00
Brian Barnes
ea6763e421 MDL-47500 scorm: improved height calculation 2016-10-28 13:41:18 +13:00
Eloy Lafuente (stronk7)
a29bcf7819 MDL-47162 core_message: debug whenever courseid is missing 
Instead of silently defaulting to SITEID when courseid (coming
from message_send()/\core\message\manager::send_message()) is missing,
now a debugging message is shown to allow developers to fix their
messages to, always, include courseid.

Raw creation of events via message_sent::create() missing other[courseid]
leads to coding exception since now (there shouldn't be any legacy use, as far as
they are always created via create_from_ids() when sending a message.

Updated upgrade.txt notes a little bit, added references the 3.6 final
deprecation issue (MDL-55449) and covered with unit tests.
 2016-10-28 00:30:02 +02:00
Eric Merrill
9d0e8a4f6d MDL-47162 core_message: Remove changes to small messages 2016-10-27 18:12:43 +02:00
Eric Merrill
0e8b51607b MDL-47162 core_message: Cleanup of messaging course ids code 2016-10-27 18:12:42 +02:00
Amanda Doughty
cc350fd9c8 MDL-47162 core_message: Add course id to message eventdata 2016-10-27 18:11:27 +02:00
lazydaisy
808955143e MDL-56469 theme_boost: reduce section activity indent when not editing. 2016-10-27 15:22:23 +01:00
lazydaisy
13a8c3d89b MDL-56523 theme_boost: Removed region-main-box in maintenance.mustache 2016-10-27 15:18:58 +01:00
Brendan Anderson
c28c76450b MDL-54112 mod_assign: Add scale null grade filter 2016-10-27 09:58:56 -04:00
Pau Ferrer Ocaña
59111fa937 MDL-56583 assign: Add info about the user submission capability 2016-10-27 15:40:03 +02:00
Dan Poltawski
577bd70d38 weekly release 3.2dev 2016-10-27 12:19:27 +01:00
Dan Poltawski
2062b6de90 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2016-10-27 12:19:25 +01:00
John Okely
3a5e14a5d0 MDL-55841 mod_lti: Improve interface usability & consistency 
* Always say "Tool URL"
* Add help strings to cartridge interface
 2016-10-27 17:13:22 +08:00
Dan Poltawski
1810eb1bf8 Revert "Merge branch 'MDL-56129-master' of git://github.com/andrewnicols/moodle" 
This reverts commit aaa2788e42361b5e3032feacd9c0534fe47cb69c, reversing
changes made to 80b74762c9dad6c5127115f7146cfdf46ad70ab4.
 2016-10-27 09:59:38 +01:00
Eloy Lafuente (stronk7)
6a17bdec92 Merge branch 'MDL-56594-master' of git://github.com/damyon/moodle 2016-10-27 10:47:51 +02:00
Damyon Wiese
7744f89275 MDL-56296 theme_boost: Do not hide server-side validation errors 
When the client side validation passes - do not hide errors that were not
generated by client side validation.
 2016-10-27 15:51:56 +08:00
Simey Lameze
4a7fdb4abb MDL-56427 message: style fixes for notification and message preferences 2016-10-27 15:27:11 +08:00
Damyon Wiese
9629c86f6c MDL-56433 theme_boost: Fix styling for autocompletes 
This is for when the autocomplete is used outside of an mform - the drop down arrow was misaligned because
of conflicts with the bootstrap form-control class.
 2016-10-27 15:23:50 +08:00
Andrew Nicols
77cfc19a85 Merge branch 'MDL-56015-master-fix1' of http://github.com/damyon/moodle 2016-10-27 15:12:49 +08:00
Kenneth Hendricks
e47c002c75 MDL-29795 assign: Tweak user-info section in grader view 
- also mirror due date removal in boost template
 2016-10-27 17:09:58 +11:00
Kenneth Hendricks
84a303b5d2 MDL-29795 assign: Fix mustache template 2016-10-27 15:52:28 +11:00
Andrew Nicols
ce434c7664 Merge branch 'wip-mdl-55074-fix2' of https://github.com/rajeshtaneja/moodle 2016-10-27 12:16:43 +08:00
Rajesh Taneja
0fa66b5383
MDL-55074 behat: Remove js tag as the feature can run without it 2016-10-27 12:11:45 +08:00
Kenneth Hendricks
eeaefbb850 MDL-29795 assign: Add 'Duplicate override' breadcrumb 2016-10-27 14:10:43 +11:00
Kenneth Hendricks
a13f1f4996 MDL-29795 assign: Only display date columns if overrides 2016-10-27 14:10:35 +11:00
Damyon Wiese
b7d127aa93 MDL-55732 theme_boost: Add separator logic to group templates 2016-10-27 11:05:08 +08:00
Frédéric Massart
b24212515c MDL-55732 theme_boost: Export elements separator in groups 2016-10-27 10:54:02 +08:00
Frédéric Massart
4b021492d6 MDL-55732 theme_boost: Bulk user actions form adjustments 
- The 'add' and 'remove' buttons consistently wrap on two lines
- Multiple select fields use the size attribute to set the options seen
 2016-10-27 10:54:02 +08:00
Damyon Wiese
bff9fd896a MDL-56597 theme_boost: Maintenance warning styles 2016-10-27 10:41:42 +08:00
Damyon Wiese
f1f6d80e69 MDL-56610 theme_boost: White background on the maintenance pages 2016-10-27 09:39:39 +08:00
lazydaisy
8b590de0b7 MDL-56523 theme_boost: Removed region-main-box in maintenance.mustache 2016-10-27 09:32:19 +08:00
Damyon Wiese
58473a6776 MDL-56015 theme_boost: change theme preview screenshot 2016-10-27 09:20:35 +08:00
Kenneth Hendricks
34fac159fb MDL-29795 assign: Add course to user profile link 2016-10-27 11:38:40 +11:00
Kenneth Hendricks
f73c5b519c MDL-29795 assign: Add missing inactiveoverridehelp lang string 2016-10-27 10:39:49 +11:00
Eloy Lafuente (stronk7)
6f01090159 Merge branch 'MDL-56448-master' of git://github.com/danpoltawski/moodle 2016-10-26 16:11:44 +02:00
Dan Poltawski
f07cb88c57 MDL-56448 mustache: fix json errors in example context 2016-10-26 12:35:45 +01:00
Dan Poltawski
2300b95dbf Merge branch 'MDL-56184-master-master' of git://github.com/damyon/moodle 2016-10-26 12:11:56 +01:00
Dan Poltawski
add9db49f4 MDL-56334 tests: add some trivial cases to domain tests 
This gets us to 100% code coverage.
 2016-10-26 09:58:05 +01:00
Dan Poltawski
e376b4bd64 Merge branch 'MDL-56334-master-v2' of git://github.com/snake/moodle 2016-10-26 09:57:50 +01:00
David Mudrák
dfe73442f7 MDL-56542 lang: Fix coding style of qtype_calculated strings file 
This patch does not actually change the value of strings. It only fixes
the coding style issues raised by the prechecker (missing spaces around
the assignment operator).
 2016-10-26 10:47:15 +02:00
Damyon Wiese
11774d9014 MDL-56599 theme_boost: Move region settings menu out of content div 
This is because the content div has it's own rules for scrolling and overflow,
and they don't work well with the action menu for the region.
 2016-10-26 16:46:29 +08:00
Eloy Lafuente (stronk7)
c64230234f Merge branch 'MDL-56090-master-fix' of github.com:andrewnicols/moodle 2016-10-26 10:38:36 +02:00
Adrian Greeve
020c98e373 MDL-56334 libraries: Addition of domain checker. 
Added a function for checking if a domain is allowed
against a list of domains that could contain wildcards.
 2016-10-26 15:51:32 +08:00
Jake Dallimore
6d6e36923b MDL-56334 libraries: Add new internet protocol library to core 
New library providing utilities for IP addresses, DNS and other
internet-protocol-related information.
 2016-10-26 15:49:03 +08:00
Andrew Nicols
ebc746dcc2 MDL-56090 message: Make key in union unique 
This also fixes the unit test to use the correct indices.
 2016-10-26 15:43:56 +08:00
Damyon Wiese
76132d1eb9 MDL-56078 theme_boost: Preset settings for release 
Allow user uploaded preset files and remove the bootswatch based existing presets.
 2016-10-26 15:27:43 +08:00
David Monllao
01435b4ebd Merge branch 'MDL-53048-master-fix' of git://github.com/andrewnicols/moodle 2016-10-26 15:11:27 +08:00