mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-25 10:00:31 +01:00
Code Issues Projects Releases Wiki Activity
60,419 Commits 36 Branches 527 Tags
Commit Graph

15592 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
275c2c9f8a Merge branch 'MDL-38965_master' of git://github.com/dmonllao/moodle 2013-04-09 19:40:39 +02:00
Eloy Lafuente (stronk7)
668aaeb8f3 MDL-26649 forms: temp disable problematic call 
The new version of the dateselector is causing JS to stop
working completely in a lot of forms, so I've disabled
temporarily the ofending call to allow other stuff to be
integrated and tested.
 2013-04-09 19:37:08 +02:00
Eloy Lafuente (stronk7)
441b165c12 Merge branch 'MDL-39056-download-api-version' of git://github.com/mudrd8mz/moodle 2013-04-09 17:36:57 +02:00
David Mudrák
803738ea41 MDL-39056 Use new version of API when fetching available updates info 2013-04-09 17:07:30 +02:00
Dan Poltawski
ca0b1f57fc Merge branch 'wip-MDL-38442-m25' of git://github.com/samhemelryk/moodle 2013-04-09 15:39:57 +08:00
Damyon Wiese
92674e324e Merge branch 'MDL-26649_master' of https://github.com/markn86/moodle 2013-04-09 15:13:21 +08:00
Dan Poltawski
0ae1b8a294 Merge branch 'w14_MDL-39004_m25_roledocs' of git://github.com/skodak/moodle 2013-04-09 14:57:08 +08:00
Mark Nelson
f40df210ab MDL-26649 forms: added a calendar icon that will display the calendar pop-up when clicked rather than the select boxes triggering the event 2013-04-09 14:52:57 +08:00
Aparup Banerjee
45edc14126 Merge branch 'w14_MDL-38798_m25_php55' of git://github.com/skodak/moodle 2013-04-09 14:30:52 +08:00
Damyon Wiese
e497e90c76 Merge branch 'wip-mdl-31969' of git://github.com/rajeshtaneja/moodle 
Conflicts:
	version.php
 2013-04-09 14:09:14 +08:00
Rajesh Taneja
38c1dd194d MDL-31969 grades: Added user preference to show/hide/export suspended users. 
User with course:viewsuspendedusers capability can now show/hide/export
enrolled users whose enrolment is suspended or enrolment time is expired.
 2013-04-09 14:01:58 +08:00
Dan Poltawski
5331215459 Merge branch 'MDL-39005' of git://github.com/stronk7/moodle 2013-04-09 13:49:09 +08:00
Aparup Banerjee
163e0d3e70 Merge branch 'MDL-38508-m' of git://github.com/andrewnicols/moodle 2013-04-09 13:27:56 +08:00
Dan Poltawski
e26b02ddad Merge branch 'wip-MDL-38593-master' of git://github.com/marinaglancy/moodle 2013-04-09 11:46:27 +08:00
Dan Poltawski
a676e858f9 Merge branch 'wip-MDL-34346-master' of git://github.com/marinaglancy/moodle 2013-04-09 10:57:50 +08:00
Marina Glancy
cb52eeab28 MDL-38593 Argument 'id' renamed to 'categoryid' in course/manage.php 2013-04-09 12:55:50 +10:00
Marina Glancy
30142c1905 MDL-38593 Merge code from /course/category.php into /course/index.php 2013-04-09 12:21:05 +10:00
Dan Poltawski
b11c74f492 Merge branch 'wip-MDL-38541-m25' of git://github.com/marinaglancy/moodle 2013-04-09 09:47:47 +08:00
Marina Glancy
4202471a36 MDL-38541 Make sure course cache is cleared properly during upgrade 
- Core upgrade MUST NOT call rebuild_course_cache() at all - update DB directly instead
- Plugins MUST call rebuild_course_cache(.., TRUE) for clearing the course cache and can not update DB directly
- Plugins MUST NOT call rebuild_course_cache() unless for clearing the cache
- Created function upgrade_ensure_not_running() to be included in other functions that can not be used during upgrade
 2013-04-09 11:31:18 +10:00
Eloy Lafuente (stronk7)
552f00fb86 Merge branch 'w14_MDL-38750_m25_ocierrors' of git://github.com/skodak/moodle 2013-04-09 02:26:49 +02:00
Eloy Lafuente (stronk7)
13af1f0497 Merge branch 'w14_MDL-39038_m25_oracleconcat' of git://github.com/skodak/moodle 2013-04-09 02:23:36 +02:00
Eloy Lafuente (stronk7)
cf42eece55 Merge branch 'w14_MDL-39027_m25_sqlsrvdatatype' of git://github.com/skodak/moodle 2013-04-09 02:19:41 +02:00
Eloy Lafuente (stronk7)
6afbf283de Merge branch 'w14_MDL-39028_m25_sqlsrconcat' of git://github.com/skodak/moodle 2013-04-09 02:17:56 +02:00
Sam Hemelryk
8718ffbac5 MDL-38442 navigation: set_expansion_limit now only hides structural nodes 2013-04-09 12:07:10 +12:00
Eloy Lafuente (stronk7)
187afd0f52 Merge branch 'w14_MDL-39019_m25_mssqldatatype' of git://github.com/skodak/moodle 2013-04-09 02:01:04 +02:00
Eloy Lafuente (stronk7)
a035bc9b6d Merge branch 'w14_MDL-39024_m25_mssqlseek' of git://github.com/skodak/moodle 2013-04-09 01:58:20 +02:00
Eloy Lafuente (stronk7)
ce2cd44908 Merge branch 'w14_MDL-39022_m25_mssqlconcat' of git://github.com/skodak/moodle 2013-04-09 01:53:57 +02:00
Eloy Lafuente (stronk7)
70273fb6ae Merge branch 'MDL-38912' of git://github.com/timhunt/moodle 2013-04-09 01:36:20 +02:00
Eloy Lafuente (stronk7)
196bd8c885 Merge branch 'w14_MDL-38786_m25_yui391' of git://github.com/skodak/moodle 2013-04-09 01:32:35 +02:00
Eloy Lafuente (stronk7)
0460dc74db MDL-34222 simplepie: fix permissions. 2013-04-09 01:28:06 +02:00
Eloy Lafuente (stronk7)
de0fc867ad Merge branch 'w14_MDL-34222_m25_simplepie131' of git://github.com/skodak/moodle 2013-04-09 01:24:08 +02:00
Eloy Lafuente (stronk7)
5df002ad68 Merge branch 'MDL-38849' of git://github.com/timhunt/moodle 2013-04-09 00:52:27 +02:00
Petr Škoda
60e9a2fe5d MDL-39027 make sure sqlsrv does not return non-string data types 2013-04-08 23:29:52 +02:00
Petr Škoda
031a6de97a MDL-39038 nasty workaround for Oracle NULL concats 2013-04-08 23:23:08 +02:00
Andrew Robert Nicols
56d465b2d3 MDL 38508 JavaScript: Split out AJAX and non-AJAX help 
We need to keep these two separate as scripts which define AJAX_SCRIPT
before loading config.php will use a different default renderer and will
return appropriate exceptions which can be parsed by M.core.exception and
M.core.ajaxException correctly.

This also addresses an issue whereby a missing heading could break the
tooltip.
 2013-04-08 21:01:20 +01:00
Eloy Lafuente (stronk7)
5a0443cc14 Merge branch 'MDL-39023-parentlang' of git://github.com/mudrd8mz/moodle 2013-04-08 16:57:38 +02:00
David Mudrák
b7acd9be50 MDL-39023 Make get_language_dependencies() aware of circular dependency risk 
The patch reimplements the core_string_manager::get_language_dependencies()
so that potentially mis-configured language packs with circular
dependencies or self dependency do not make the site unavailable.
Unit tests for the expected behaviour are added.
 2013-04-08 14:31:27 +02:00
Petr Škoda
50f743021e MDL-39028 fix sqlsrv concat type conversion 2013-04-08 13:17:56 +02:00
Tim Hunt
c4dbaf74e8 MDL-38849 editor collapsing: cope with verbose languages 
We can't fix the width of the tab, because the length of the string
'Show editing tools' varies a LOT between langauges.
 2013-04-08 10:44:51 +01:00
Tim Hunt
e7373221cf MDL-38849 editor CSS: re-format to match coding style. 2013-04-08 10:37:22 +01:00
Petr Škoda
4c97487728 MDL-39024 fix MSSQL seek past the end of recordset 2013-04-08 10:36:37 +02:00
Petr Škoda
7a755250df MDL-39022 fix MSSQL concat type conversion 2013-04-08 10:19:51 +02:00
Petr Škoda
1b64533069 MDL-39019 make sure MSSQL does not return non-string data types 2013-04-08 10:06:55 +02:00
Dan Poltawski
91a3c9ba9f Merge branch 'MDL-38179_master' of git://github.com/dmonllao/moodle 2013-04-08 15:36:07 +08:00
David Monllao
bd1aca8834 MDL-38965 behat: New test 
According to MDLQA-5229, an admin
can add or remove items from the
TinyMCE editor toolbar.
 2013-04-08 14:42:47 +08:00
Damyon Wiese
278c280e8f Merge branch 'MDL-38878_master' of git://github.com/dmonllao/moodle 2013-04-08 13:02:38 +08:00
Damyon Wiese
5fbfc955d8 Merge branch 'MDL-39015-master' of git://github.com/danpoltawski/moodle 2013-04-08 12:32:56 +08:00
Dan Poltawski
fd0768c0e7 MDL-39015 navigation: remove course reports from navigation 
Regression from the commit in
278065528aed2e6d712292b09ecdedf3d5b26bfe
 2013-04-08 12:25:14 +08:00
Dan Poltawski
b23fcda2b9 Merge branch 'MDL-39006' of git://github.com/stronk7/moodle 2013-04-08 11:14:03 +08:00
David Monllao
f9d3667e7b MDL-38179 behat: Step definition to click on a table row element 2013-04-08 10:07:21 +08:00