mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-27 11:02:38 +01:00
Code Issues Projects Releases Wiki Activity
71,731 Commits 36 Branches 527 Tags
Commit Graph

19590 Commits

Author SHA1 Message Date
Dan Poltawski
cae0c46b9b Merge branch 'MDL-48156-master-pluginisenabled' of git://github.com/mudrd8mz/moodle 2014-11-11 17:16:00 +00:00
Rajesh Taneja
ac19f245bf MDL-48174 core_lang: support for ->skiplangupgrade in lang cron task 
Similar to upgrade_language_pack(), update_langpacks_task should
respect skiplangupgrade config. Also, this should be added to behat
whitelist, so it can be disabled during on-sync period, when lang
pack for master is not available.
 2014-11-11 16:52:20 +08:00
Eloy Lafuente (stronk7)
147bae8f7c MDL-48144 upgrade: add v2.8.0 sep lines 2014-11-10 18:08:15 +01:00
sam marshall
540af6f38e MDL-48093 HTML 5 video: Firefox now supports .mp4 2014-11-10 10:48:28 +00:00
David Mudrák
5429afc042 MDL-48156 task: Skip the scheduled task only for really disabled plugins 2014-11-10 11:09:25 +01:00
Eloy Lafuente (stronk7)
415fc3d2f9 Merge branch 'MDL-47943-master' of https://github.com/dthies/moodle 2014-11-06 18:44:38 +01:00
Eloy Lafuente (stronk7)
6fdd4633a7 Merge branch 'MDL-48035-master-enfix' of git://github.com/mudrd8mz/moodle 2014-11-06 11:14:52 +01:00
David Mudrák
6887e2e53e MDL-48035 Fix Behat tests regressions after merging en_fix strings 2014-11-06 10:54:27 +01: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
Petr Skoda
5cf50f96e7 MDL-48083 dml: Empty buffers on forced rollback 2014-11-06 15:52:37 +13: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)
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
Eloy Lafuente (stronk7)
862b76f39b Merge branch 'MDL-48050-master' of git://github.com/damyon/moodle 2014-11-06 00:01:26 +01:00
Daniel Thies
8160d004ce MDL-47943 editor_atto: Save selection on mouseleave for Chrome 2014-11-05 09:34:20 -06: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
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
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
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
Damyon Wiese
12938e894d MDL-48050 Libraries - fake HTTPS detection needs the correct port 2014-11-04 16:50:25 +08:00
Damyon Wiese
888d0822bd Merge branch 'MDL-47806' of github.com:mr-russ/moodle 2014-11-04 14:34:43 +08:00
Marina Glancy
1d9155872f Merge branch 'MDL-48006-master' of git://github.com/damyon/moodle 2014-11-04 10:47:09 +08:00
Petr Skoda
7ee4642bcb MDL-48013 calendar: force download of user files 2014-11-04 01:40:52 +01:00
Juan Leyva
a0095e5a89 MDL-47766 web services: get_grades exposes hidden grades to students 2014-11-04 09:13:46 +13:00
Dave Cooper
40a0465823 MDL-47050 core_wordlist: Updated wordlist to include only animals. 2014-11-04 09:03:08 +13:00
Dan Poltawski
712b72c0f0 Merge branch 'MDL-47864_master' of git://github.com/dmonllao/moodle 2014-11-03 15:20:58 +00:00
Petr Skoda
1993cc02b6 MDL-47287 prevent web access to phpunit boostrap 2014-11-03 17:10:33 +08:00
Marina Glancy
d9fb78c981 Merge branch 'wip-mdl-45204-m' of git://github.com/rajeshtaneja/moodle 2014-11-03 17:03:57 +08:00
Damyon Wiese
219ebf9bb4 Merge branch 'wip-MDL-45538-master' of git://github.com/marinaglancy/moodle 
Conflicts:
	version.php
 2014-11-03 14:10:43 +08:00
Damyon Wiese
520a32c3d4 Merge branch 'wip_MDL-47966_m28_defaultheaders' of https://github.com/skodak/moodle 2014-11-03 12:20:58 +08:00
Damyon Wiese
c942fddf93 MDL-48006 Atto autosave: Never restore text that is empty. 2014-11-03 11:30:30 +08:00
Sam Hemelryk
84d5a89c84 MDL-48026 usermenu: convert menu nowrap from CSS to method 2014-11-03 13:44:58 +13:00
Sam Hemelryk
a2a9468f01 MDL-48026 output: action_menu no wrap improvement 
Action menu output component has a new method set_nowrap_on_items
that sets a property to toggle nowrap on menu items.
That can be used to avoid problems when the menu appears within
an absolutely positioned or floated element.
 2014-11-03 13:34:02 +13:00
Eloy Lafuente (stronk7)
bacbb4e279 MDL-47874 dml: add support for replace_all_text to oracle 
And, at the same time, fix the implementation so all databases
will be using sql_substr() instead of harcoded "SUBSTRING".
 2014-11-02 18:26:18 +01:00
Rajesh Taneja
54957bdbf7 MDL-45204 phpunit: Fixed test_localcachedir test 
make_localcache_directory is the first call to make
localcache, which is already created by reset. So deleting
existing localcache directory will pass this test
 2014-10-31 16:07:47 +08:00
David Monllao
f5d3d0f498 MDL-47864 grade_report: Edulevels according to default user permissions 2014-10-31 14:01:30 +08:00
Petr Skoda
3c98b7a5ad MDL-47966 Add default content type and encoding 2014-10-30 11:38:07 +13:00
Dan Poltawski
4f82670250 Merge branch 'wip_MDL-40949_m28_pathsettings' of https://github.com/skodak/moodle 2014-10-29 13:04:46 +00:00
Dan Poltawski
0af29b0383 Merge branch 'MDL-47368' of git://github.com/timhunt/moodle 2014-10-29 11:18:15 +00:00
Julien Boulen
9b45b74e8f MDL-47584 database SQL: add debug info on connection error notices 2014-10-29 16:59:56 +08:00
Damyon Wiese
60c1108c30 Merge branch 'wip-MDL-47647-master' of git://github.com/abgreeve/moodle 2014-10-29 16:18:03 +08:00
Damyon Wiese
7154f954c7 Merge branch 'MDL-47755_master' of https://github.com/totara/openbadges 2014-10-29 15:31:58 +08:00
Marina Glancy
941de29601 MDL-45538 files: restore missing records in draft areas 2014-10-29 15:26:54 +08:00
Petr Skoda
5aaac8b2d6 MDL-40949 admin: Fix $CFG->preventexecpath hints 
This setting restricts all local paths, not just
executables.
 2014-10-29 10:45:44 +13:00
Dan Poltawski
31d6d2ae41 Merge branch 'MDL-47703-master' of git://github.com/FMCorz/moodle 2014-10-28 11:40:27 +00:00