mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-04 16:04:00 +02:00
Code Issues Projects Releases Wiki Activity
71,006 Commits 36 Branches 528 Tags
2b0a7419c6
Commit Graph

71006 Commits

Author SHA1 Message Date
Andrew Nicols
2b0a7419c6 MDL-47390 mod_forum: Provide ID and Discussion ID for discussion unsub 2014-11-06 16:50:36 +08:00
Marina Glancy
f2db391f59 Merge branch 'MDL-47980-master' of git://github.com/jethac/moodle 2014-11-06 15:14:05 +08:00
Damyon Wiese
527464a618 MDL-43430 ldap: whitespace fix 2014-11-06 12:05:32 +08:00
Damyon Wiese
bd6ee5c58a Merge branch 'wip_master_mdl-43430' of https://github.com/iarenaza/moodle 2014-11-06 12:00:12 +08:00
Marina Glancy
253b93f720 Merge branch 'wip_MDL-48083_m28_rollback' of git://github.com/skodak/moodle 2014-11-06 11:42:10 +08:00
Damyon Wiese
ce1b8779df Merge branch 'MDL-48061-master-fixes' of https://github.com/andrewnicols/moodle 2014-11-06 11:30:42 +08:00
Andrew Nicols
4ee412613b MDL-48061 mod_forum: posttext should concat 2014-11-06 11:29:25 +08:00
Damyon Wiese
b0637c57ad Merge branch 'MDL-48061-master-fixes' of https://github.com/andrewnicols/moodle 2014-11-06 11:22:42 +08:00
Andrew Nicols
a41cff4e23 MDL-48061 mod_forum: Correct variable name in HTML warning message 2014-11-06 11:05:44 +08:00
Petr Skoda
5cf50f96e7 MDL-48083 dml: Empty buffers on forced rollback 2014-11-06 15:52:37 +13:00
Andrew Nicols
ddb4a31d54 MDL-48029 mod_forum: Check for subscription before enrolling 2014-11-06 10:42:09 +08:00
Jetha Chan
dd01789b4f MDL-47980 gradebook: add labels and legends missing from single view 2014-11-06 10:40:36 +08:00
Eloy Lafuente (stronk7)
dc3fab74ae Merge branch 'wip-MDL-47174-master' of git://github.com/marinaglancy/moodle 2014-11-06 02:15:44 +01:00
Marina Glancy
8f94164df3 MDL-47174 events: new calendar event may have 0 timestart 2014-11-06 08:57:29 +08:00
Eloy Lafuente (stronk7)
a376c72a05 Merge branch 'wip-mdl-45416' of https://github.com/rajeshtaneja/moodle 2014-11-06 00:57:45 +01:00
Eloy Lafuente (stronk7)
ec070d2cf7 Merge branch '48026-28' of git://github.com/samhemelryk/moodle 2014-11-06 00:33:46 +01:00
John Okely
9aa9a1c70a MDL-47862 tool_monitor: Fix tool monitor navigation tree 
Added event monitor rules link to the frontpage navigation tree, when
editing the frontpage rules. Added hack so that when viewing the site
context subscriptions, the link in navigation is correct, allowing the
breadcrumbs to appear
 2014-11-06 12:27:51 +13:00
John Okely
8f6b6982fa MDL-47862 event_monitor: Fix context for capability check on subscription page 2014-11-06 12:27:51 +13:00
Eloy Lafuente (stronk7)
4723da1bff Merge branch 'MDL-47990' of git://github.com/timhunt/moodle 2014-11-06 00:22:32 +01:00
Eloy Lafuente (stronk7)
862b76f39b Merge branch 'MDL-48050-master' of git://github.com/damyon/moodle 2014-11-06 00:01:26 +01:00
Sam Hemelryk
12a312ac6a Merge branch 'MDL-48044-master' of git://github.com/andrewnicols/moodle 2014-11-06 11:55:46 +13:00
Eloy Lafuente (stronk7)
97100bea54 Merge branch 'MDL-48054-master' of git://github.com/andrewnicols/moodle 2014-11-05 21:34:37 +01:00
Dan Poltawski
62e965c9b8 Merge branch 'MDL-47466-master' of https://github.com/tehanuyor/moodle 2014-11-05 16:24:14 +00:00
Dan Poltawski
c293eb004b Merge branch 'MDL-47874' of git://github.com/stronk7/moodle 2014-11-05 14:27:12 +00:00
Dan Poltawski
5a6c9f1cfb Merge branch 'MDL-48021' of git://github.com/stronk7/moodle 
Conflicts:
	admin/tool/monitor/version.php
	mod/lesson/version.php
 2014-11-05 12:11:16 +00:00
Dan Poltawski
35d236c1ea Merge branch 'MDL-48047-master' of git://github.com/lameze/moodle 2014-11-05 12:05:58 +00:00
Dan Poltawski
90de57db26 Merge branch 'MDL-48068-master' of git://github.com/FMCorz/moodle 2014-11-05 12:03:48 +00:00
Dan Poltawski
f3fd919187 Merge branch 'MDL-47981-master' of git://github.com/damyon/moodle 2014-11-05 12:00:19 +00:00
Dan Poltawski
7aedf52716 MDL-47922 tool_monitor: bump version 2014-11-05 11:42:37 +00:00
Dan Poltawski
7ea14bb819 Merge branch 'MDL-47922-master' of git://github.com/ankitagarwal/moodle 2014-11-05 11:18:22 +00:00
Dan Poltawski
a0cba367bd Merge branch 'MDL-47982-master' of git://github.com/gurgus/moodle 2014-11-05 11:03:57 +00:00
Andrew Nicols
7a311adbba MDL-48019 mod_forum: Add sesskey checks when setting tracking prefs 
This also removes set_url() and changes require_course_login to
require_login as guests cannot set tracking.
 2014-11-05 10:35:12 +00:00
Dan Poltawski
fb3e9ea25d Merge branch 'MDL-48067-master' of git://github.com/jethac/moodle 2014-11-05 10:15:41 +00:00
Damyon Wiese
a75cc21442 Merge branch 'MDL-48061-master' of git://github.com/andrewnicols/moodle 2014-11-05 16:54:32 +08:00
Damyon Wiese
ec57e8b3f4 Merge branch 'MDL-46500_master' of https://github.com/dmonllao/moodle 2014-11-05 16:52:07 +08:00
Marina Glancy
93a4f8b5fc Merge branch 'MDL-47390-master' of git://github.com/andrewnicols/moodle 2014-11-05 16:35:05 +08:00
Iñaki Arenaza
cc22032502 MDL-43430 enrol_ldap: Enrolment lost if member of group with parenthesis 
While testing the fix, it was found that ldap_stripslashes() was broken and
using a deprecated PCRE patter modifier, so it's also been fixed.

Thanks to Damyon Wiese, some units tests have been added to cover
ldap_addslashes() and ldap_stripslashes().
 2014-11-05 09:01:27 +01:00
Iñaki Arenaza
21302343ee MDL-43430 enrol_ldap: Enrolment lost if member of group with parenthesis 
The group names we get from ldap_find_user_groups() can contain invalid LDAP
filter characters. So we need to escape them for LDAP filter usage.
 2014-11-05 09:00:17 +01:00
Iñaki Arenaza
9807737734 MDL-43430 enrol_ldap: Enrolment lost if member of group with parenthesis 
As part of fixing MDL-43430, a typo has been detected in the
quoted alphanumeric characters (the '=' and '>' were transposed).
 2014-11-05 09:00:17 +01:00
Damyon Wiese
2f1637f09b Merge branch '48025-28' of git://github.com/samhemelryk/moodle 2014-11-05 15:39:27 +08:00
Simey Lameze
b52b1ee9a4 MDL-48047 gradebook: change the missing ID number to checkbox on XML export 2014-11-05 15:24:09 +08:00
Damyon Wiese
b729370ebe Merge branch 'MDL-47893-master-fix' of https://github.com/zbdd/moodle 2014-11-05 15:22:55 +08:00
Damyon Wiese
086e5b7b9e Merge branch 'MDL-47360-master' of git://github.com/lameze/moodle 2014-11-05 15:12:56 +08:00
Frederic Massart
00d03b0b8a MDL-48068 tool_monitor: Link to course points to the right course 2014-11-05 15:06:27 +08:00
Simey Lameze
0194d87ec5 MDL-47360 tool_monitor: add more help link and default template message 2014-11-05 14:57:53 +08:00
Andrew Nicols
7122e1543a MDL-48054 mod_forum: Fix unit test failures 
These sporadic unit test failures were happening because the post time and
subscription time sometimes differ depending on the amount of time it takes
to complete the different components of the test.

To reliably address these issues, the post creation, and the discussion
subscription times are manually updated by different factors to ensure a
more realistic state of affairs.
 2014-11-05 14:49:02 +08:00
Zachary Durber
4fb6b62c42 MDL-47893 gradebook: Fix for bulk updating single view. 2014-11-05 14:44:15 +08:00
Damyon Wiese
5ab68de8f0 Merge branch 'wip-MDL-46262-master' of git://github.com/marinaglancy/moodle 2014-11-05 14:38:11 +08:00
Jetha Chan
088fcf90ca MDL-48067 user_menu: allow empty customusermenuitems setting 2014-11-05 14:37:33 +08:00
Damyon Wiese
225fa27fc2 MDL-47793 assign: trivial fix for inconsistent use of get_instance() 2014-11-05 14:27:58 +08:00