mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-23 09:00:30 +01:00
Code Issues Projects Releases Wiki Activity
75,388 Commits 36 Branches 527 Tags
Commit Graph

75388 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Andrew Nicols
c9830ddbb7 Merge branch 'wip-MDL-51241-master' of git://github.com/abgreeve/moodle 2015-09-29 12:22:20 +08:00
Andrew Nicols
2aac262f69 Merge branch 'MDL-51476' of git://github.com/timhunt/moodle 2015-09-29 11:40:40 +08:00
Dan Poltawski
23e1a54f57 Merge branch 'MDL-51305_master_too_many_gradeitem_fetches' of https://github.com/colin-umn/moodle 2015-09-28 16:25:54 +01:00
Dan Poltawski
51e0adf664 MDL-48947 version: bump 2015-09-28 15:45:11 +01:00
Dan Poltawski
ebadc15c1f Merge branch 'MDL-48947_v3' of https://github.com/Syxton/moodle 2015-09-28 15:06:21 +01:00
Dan Poltawski
5a068364cb Merge branch 'mdl46710-master' of https://github.com/tlock/moodle 2015-09-28 14:56:52 +01:00
Dan Poltawski
411dea9523 Merge branch 'MDL-51390_master' of https://github.com/totara/openbadges 2015-09-28 13:27:12 +01:00
Dan Poltawski
1b7caf12dc Merge branch 'MDL-51312_master' of git://github.com/markn86/moodle 2015-09-28 11:51:36 +01:00
Dan Poltawski
233ab7ee47 Merge branch 'MDL-51498_regrade_perf' of https://github.com/moodlerooms/moodle 2015-09-28 11:09:12 +01:00
Dan Poltawski
158cc03737 Merge branch 'MDL-50109-master-blogsort' of https://github.com/mudrd8mz/moodle 2015-09-28 10:44:47 +01:00
Yuliya Bozhko
4d0ebdebc5 MDL-51390 badges: Switch backpack URL to use HTTPS 
Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
 2015-09-28 10:37:03 +01:00
Dan Poltawski
52f4e19bbd Merge branch 'MDL-49482-master' of https://github.com/blckct/moodle 2015-09-28 10:31:48 +01:00
Marina Glancy
7fdc469048 MDL-44640 enrol_meta: sync when enrol method is updated 2015-09-27 17:52:20 +08:00
Marina Glancy
080c7d471d MDL-44640 enrol: trigger events on instances actions 2015-09-27 17:52:20 +08:00
Daniel Thies
7bb2069bfa MDL-51227 editor_atto: Stop Chrome losing selection when formating 2015-09-25 09:32:46 -05:00
Tim Hunt
ddc016830d MDL-51476 questions: manual grading validation for ungraded Qs 
The change in MDL-51090 broke manually commenting on questions for which
no mark is given (max mark == 0). This fixes it, with unit tests.

Thanks to Nick Phillips for the original suggestion of the fix.
 2015-09-25 14:01:33 +01:00
Juan Leyva
4485f7c549 MDL-49821 webservice: Add active user checks in external functions 2015-09-25 11:33:13 +02:00
Juan Leyva
3961ebfbc0 MDL-49821 core_user: New function for checking if a user is active 2015-09-25 11:33:13 +02:00
Eloy Lafuente (stronk7)
a9ed308f74 Merge branch 'wip-mdl-51555' of https://github.com/rajeshtaneja/moodle 2015-09-25 11:31:14 +02:00
rajesh Taneja
0f2aad5908 MDL-51555 behat: Increase question preview window 
As question preview window is small, chrome driver
fails to select drag and drop element
 2015-09-25 16:53:14 +08:00
rajesh Taneja
8d892b1d40 MDL-51555 behat: Added @_switch_window tag 
DND question types use switch window and the tag
was not added, so it was failing for phantomjs
Added tag to avoid phantomjs failures
 2015-09-25 11:53:03 +08:00