mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity
71,071 Commits 36 Branches 519 Tags
Commit Graph

71071 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Damyon Wiese
43db479d51 Merge branch 'MDL-47793-m' of https://github.com/micaherne/moodle 2014-11-05 14:25:22 +08:00
Damyon Wiese
686150130e Merge branch 'MDL-47930-master' of git://github.com/andrewnicols/moodle 2014-11-05 14:18:07 +08:00
Damyon Wiese
c5d4633fed Merge branch 'MDL-47902_scorm_inappropriate_default_values' of https://github.com/MorrisR2/moodle 2014-11-05 14:05:32 +08:00
Damyon Wiese
8a9fd2d4cf MDL-27930 lesson: Remove custom styling from timer 2014-11-05 13:58:38 +08:00
Damyon Wiese
c86477aa88 Merge branch 'MDL-27930' of git://github.com/jmvedrine/moodle 2014-11-05 13:34:07 +08:00
Zachary Durber
5467cc051c MDL-48031 gradebook: Fix for bulk updating users in single view. 2014-11-05 13:20:40 +08:00
Ankit Agarwal
f63c5b0413 MDL-47922 behat: Add a behat test 2014-11-05 10:19:45 +05:30
Ankit Agarwal
236a1f8d31 MDL-47922 tests: Enable tool monitor in various tests 2014-11-05 10:19:45 +05:30
Ankit Agarwal
5ff867362a MDL-47922 tool_monitor: Add a config to disable the tool 2014-11-05 10:19:44 +05:30
Andrew Nicols
6a5b087163 MDL-48061 mod_forum: Tidy up reply-by-email information in emails 
* Add a reminder to remove the original message; and
* Remove the reply-to address from the text.
 2014-11-05 11:20:59 +08:00
Rajesh Taneja
e790a3ecc7 MDL-45416 enrol_ldap: Use null_progress_trace while running phpunit 2014-11-05 10:43:16 +08:00
Eloy Lafuente (stronk7)
8d3c518bd5 Merge branch 'MDL-48035-master-enfix' of git://github.com/mudrd8mz/moodle 2014-11-05 01:16:05 +01:00
Helen Foster
ba033b861e MDL-48035 Merge English strings from the en_fix language pack 2014-11-04 21:55:26 +01:00
Eloy Lafuente (stronk7)
de881693f7 MDL-48021 bump: Bump all versions to planned release 
This bumps all versions to planned 2.8 release
(2014111000) version and all the dependencies to
current 2.8rc1 (2014110400)
 2014-11-04 17:52:35 +01:00
Dan Poltawski
f61619597b Merge branch 'MDL-47893-master' of git://github.com/zbdd/moodle 2014-11-04 16:50:47 +00:00
Dan Poltawski
f820acf01e Merge branch 'MDL-47944-master' of git://github.com/andrewnicols/moodle 2014-11-04 16:30:17 +00:00
Jean-Michel Vedrine
50d70c5caf MDL-27930 Lesson: the count-down timer does not work 2014-11-04 15:12:42 +01:00
Eloy Lafuente (stronk7)
6ce4b8ea30 Moodle release 2.8rc1 v2.8.0-rc1 2014-11-04 11:45:59 +01:00
Damyon Wiese
12938e894d MDL-48050 Libraries - fake HTTPS detection needs the correct port 2014-11-04 16:50:25 +08:00
Andrew Nicols
1008dd8ef0 MDL-47390 mod_forum: Correct check for groups when subscribing 2014-11-04 16:35:47 +08:00
Andrew Nicols
da30d04408 MDL-47390 mod_forum: Add discussion unsub to email footer 2014-11-04 16:35:47 +08:00
Mark Nelson
4e86f45a3e MDL-47361 tool_monitor: added missing column 
Also reworded a string as the fields have been renamed.
 2014-11-04 00:15:41 -08:00
Andrew Nicols
548453ecde MDL-48044 mod_forum: Preload icons for discussion subscription toggles 2014-11-04 16:09:19 +08:00
Andrew Nicols
a35ce611cf MDL-47944 mod_forum: Improve discussion subscription icon/link 
* make the link text clickable
* changes the link text when unsubscribed to the action text "Subscribe"
 2014-11-04 15:46:05 +08:00
Damyon Wiese
888d0822bd Merge branch 'MDL-47806' of github.com:mr-russ/moodle 2014-11-04 14:34:43 +08:00
Damyon Wiese
0c4a7f96cc Merge branch 'MDL-47810_master-fix-MDL-47758-changes' of git://github.com/dmonllao/moodle 2014-11-04 14:17:46 +08:00
Zachary Durber
50e30bd4e3 MDL-47893 gradebook: Progress bar and continues for grade saving. 
When you save a grade you are notified of how many grades have
been updated and any warnings.
 2014-11-04 13:57:03 +08:00
Damyon Wiese
7a056947e3 Merge branch 'MDL-45636-course_master' of https://github.com/eSrem/moodle 2014-11-04 13:47:51 +08:00
David Monllao
0907f49b4e MDL-47810 tool_monitor: Updating behat scenarios introduced in MDL-47758 2014-11-04 12:23:42 +08:00
Marina Glancy
1d9155872f Merge branch 'MDL-48006-master' of git://github.com/damyon/moodle 2014-11-04 10:47:09 +08:00
Eloy Lafuente (stronk7)
990ebf08c7 Merge branch 'MDL-47883-master-foundlangfile' of git://github.com/mudrd8mz/moodle 2014-11-04 02:03:11 +01:00
Eloy Lafuente (stronk7)
b53c2a92d0 Merge branch 'wip-MDL-47976-master' of git://github.com/marinaglancy/moodle 2014-11-04 01:59:23 +01:00
Eloy Lafuente (stronk7)
ddb5bc5fcd Merge branch '47969-28' of git://github.com/samhemelryk/moodle 2014-11-04 01:56:59 +01:00
Eloy Lafuente (stronk7)
882f915922 Merge branch '47968-28' of git://github.com/samhemelryk/moodle 2014-11-04 01:55:08 +01:00
Petr Skoda
76ae1f6068 MDL-47868 ws: verify upload areas 2014-11-04 01:48:17 +01:00
Petr Skoda
7ee4642bcb MDL-48013 calendar: force download of user files 2014-11-04 01:40:52 +01:00
Eloy Lafuente (stronk7)
bebd3ce8fc Merge branch 'MDL-47207_master' of git://github.com/dmonllao/moodle 2014-11-04 01:20:51 +01:00