75413 Commits

Author SHA1 Message Date
Dan Poltawski
7c88aa7bec Merge branch 'wip-MDL-51636-master' of https://github.com/marinaglancy/moodle 2015-10-05 14:59:16 +01:00
Dan Poltawski
93ca67d637 Merge branch 'MDL-51501-master' of git://github.com/merrill-oakland/moodle 2015-10-05 11:47:52 +01:00
Dan Poltawski
61c257e7ee Merge branch 'wip-MDL-49028-master' of git://github.com/abgreeve/moodle 2015-10-05 10:44:37 +01:00
David Monllao
cc69a29b4b Merge branch 'MDL-51514_master' of git://github.com/markn86/moodle 2015-10-05 15:59:43 +08:00
David Monllao
fe73503248 Merge branch 'MDL-51408-master' of git://github.com/marinaglancy/moodle 2015-10-05 13:49:00 +08:00
David Monllao
b0fca9208b Merge branch 'MDL-51478-master' of git://github.com/jleyva/moodle 2015-10-05 13:38:43 +08:00
David Monllao
6ee188b162 MDL-50613 webservices: Upgrade info about riskbitmask 2015-10-05 12:19:29 +08:00
David Monllao
117fb5a21e Merge branch 'MDL-50613-master' of git://github.com/jleyva/moodle 2015-10-05 12:10:40 +08:00
Adrian Greeve
30836b17da MDL-49028 mod_wiki: Fully reset wiki pages.
All the wiki pages as well as comments and tags
can now be reset.

A thank you to Daniel Kosinski and Pascal Maury for
providing patches for this improvement.
2015-10-05 09:48:38 +08:00
Marina Glancy
810805da9e MDL-51636 core_tag: allow setting tags in generators 2015-10-04 22:25:37 +08:00
Sam Chaffee
84ab39cf77 MDL-51514 gradebook: Optimize set_usedinaggregation query for MySQL 2015-10-02 11:28:15 -06:00
Dan Poltawski
35d3e8b00b weekly release 3.0dev 2015-10-02 10:57:29 +01:00
Dan Poltawski
dd52e20b72 NOBUG: Fixed SVG browser compatibility 2015-10-02 10:57:28 +01:00
Dan Poltawski
04d4ca7f61 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2015-10-02 10:57:27 +01:00
Dan Poltawski
381c55b906 Merge branch 'MDL-48947_master-dnd-span' of git://github.com/dmonllao/moodle 2015-10-02 08:05:13 +01:00
David Monllao
5b9718928a MDL-48947 course: Adding the new extra span after dropping a section 2015-10-02 11:12:24 +08:00
Eloy Lafuente (stronk7)
3883191436 MDL-51555 behat: Added @_file_upload missing tags
So phantomjs can perform complete runs without breakage.
2015-10-01 17:41:48 +02:00
Dan Poltawski
e976a02cef MDL-48947 css: compile less 2015-10-01 16:12:13 +01:00
Dan Poltawski
331315a4c1 Merge branch 'MDL-48947_v3_patch' of https://github.com/Syxton/moodle 2015-10-01 16:12:09 +01:00
Syxton
c73fd11e86 MDL-48947 patch - fix unclickable menu issues
remove z-index fix and instead keep the header from gaining the opacity
change on hide
2015-10-01 10:54:23 -04:00
David Monllao
6dbb46ec0f MDL-46710 mod_lti: Removing duplicated generated events
Event generation and completion should be generated only once.
2015-10-01 11:55:38 +08:00
Eloy Lafuente (stronk7)
c75b891ba7 Merge branch 'MDL-49821-master-master' of git://github.com/jleyva/moodle 2015-10-01 01:26:58 +02:00
Eloy Lafuente (stronk7)
6a0deee441 Merge branch 'MDL-51227-master' of https://github.com/dthies/moodle 2015-10-01 00:25:31 +02:00
Eloy Lafuente (stronk7)
9fb434a618 Merge branch 'wip-mdl-51266' of https://github.com/rajeshtaneja/moodle 2015-09-30 20:34:33 +02:00
Eloy Lafuente (stronk7)
880eb93d3f Merge branch 'MDL-51292-master' of git://github.com/cameron1729/moodle 2015-09-30 17:32:57 +02:00
Juan Leyva
fca9e67c25 MDL-50613 webservice: Remove risk bit masks for Web Service protocols
This will prevent to show a 'Critical' status in security overview
report when mobile services are enabled
2015-09-30 09:34:23 +02:00
David Monllao
161649644d Merge branch 'MDL-51415-master' of git://github.com/jleyva/moodle 2015-09-30 14:15:29 +08:00
David Monllao
7f64df4131 Merge branch 'wip-MDL-44640-fix' of git://github.com/marinaglancy/moodle 2015-09-30 12:43:55 +08:00
Adam Olley
dba0fdc2bc MDL-9070 forum: Add margin in rtl mode to timed post icon
As the icon has a float on it to move it to the right, a margin-top
needs to be applied to keep it aligned the same as in ltr.
2015-09-30 12:27:12 +08:00
Marina Glancy
e7b161f0b2 MDL-44640 course: account for multiple events in course actions 2015-09-30 11:35:40 +08:00
David Monllao
ad704e2c49 Merge branch 'mdl51440-master' of git://github.com/tlock/moodle 2015-09-30 10:48:25 +08:00
David Monllao
8e31c017f2 MDL-9070 mod_forum: Reducing it to a single scenario 2015-09-30 10:09:03 +08:00
David Monllao
15791dffac Merge branch 'MDL-9070' of git://github.com/aolley/moodle 2015-09-30 09:29:55 +08:00
Eloy Lafuente (stronk7)
d4e65df215 Merge branch 'MDL-49143-master' of git://github.com/cameron1729/moodle
Note: Fixed small bug in unit test.
2015-09-30 03:22:26 +02:00
Adam Olley
05f1455b35 MDL-9070 forum: Show timed post display period
This adds the following changes when viewing a list of discussions and
forum_enabletimedposts is turned on.

* Discussions a student wouldnt see right now are dimmed (timestart in
  future or timeend in the past).
* A icon appears next to the discussion subject, the tooltip for this
  icon displays the display start and/or end time. This only appears for
  the user that made the discussion or has permission to
  viewhiddentimedposts.

These two changes achieve a couple of important things, namely, teachers
will not mistakenly think their students can see a discussion when
viewing the list if they've later forgot that they set a time limit on
it (or indeed if someone else put it on their discussion without them
realising). Additionally it makes it easy to see from the list when
different discussions are set to be released without having to go in and
edit them to find out.

Change-Id: Ia1818b33c00adae0dad72df8e170a078fb66cd76
2015-09-30 09:18:31 +09:30
Dan Poltawski
5fc9fdd54e Merge branch 'MDL-51402' of git://github.com/timhunt/moodle 2015-09-29 20:54:45 +01:00
Dan Poltawski
2764d7a597 Merge branch 'wip-mdl-51424' of https://github.com/dthies/moodle 2015-09-29 20:33:28 +01:00
Dan Poltawski
747554d335 Merge branch 'MDL-50658' of https://github.com/spvickers/moodle 2015-09-29 16:50:45 +01:00
Dan Poltawski
a3b1172dcb Merge branch 'MDL-50602-master' of https://github.com/StudiUM/moodle 2015-09-29 16:03:52 +01:00
Dan Poltawski
df15a71836 MDL-51261 config-dist: clarify setting description a little 2015-09-29 13:25:18 +01:00
Dan Poltawski
0dd7bb78d6 Merge branch 'MDL-51261-master-upgradekey' of git://github.com/mudrd8mz/moodle 2015-09-29 12:33:14 +01:00
Dan Poltawski
092455e4d4 Merge branch 'MDL-42639_master' of git://github.com/dmonllao/moodle 2015-09-29 10:20:13 +01:00
Dan Poltawski
b33662e4d7 Merge branch 'wip-MDL-44640-master' of https://github.com/marinaglancy/moodle 2015-09-29 10:13:19 +01:00
David Monllao
07d370849b MDL-42639 user: user:viewalldetails enough to view some fields
The fields are:
- username
- idnumber
- institution
- department
2015-09-29 16:55:14 +08:00
Andrew Nicols
eb89f7cb40 Merge branch 'MDL-43594-master' of git://github.com/junpataleta/moodle 2015-09-29 13:49:30 +08:00
Jun Pataleta
418a0d0465 MDL-43594 mod_assign: Fix calendar update on course reset
This patch fixes the updating of calendar events when the course
is reset and its start date is changed.
2015-09-29 13:46:27 +08:00
Andrew Nicols
853555f9a7 Merge branch 'MDL-35918-master' of git://github.com/ryanwyllie/moodle 2015-09-29 13:42:24 +08:00
Eloy Lafuente (stronk7)
07842a3861 MDL-49143 LTI: Test resource_link_id in lti_build_request() 2015-09-29 13:42:02 +08:00
Cameron Ball
219f956acc MDL-49143 LTI: Fix missing resource id 2015-09-29 13:41:55 +08:00
Ryan Wyllie
f56ae5a7ac MDL-35918 javascript: dialogues screen reader support
The YUI notification dialogues will now set the appropriate
aria attributes when they are shown/hidden to allow screen
readers to navigate them correctly.

When the dialogue is shown all background elements will be marked
as hidden while the dialogue is marked as visible to a screen reader.

When the dialogue is closed the modified elements will be reverted
to their previous state and the dialogue will be marked as hidden to
a screen reader.
2015-09-29 04:48:57 +00:00