mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-01 14:32:48 +01:00
Code Issues Projects Releases Wiki Activity
60,682 Commits 36 Branches 523 Tags
Commit Graph

60682 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marina Glancy
0f232ed6e8 MDL-34346 fixed missing string and correct instantiating of repositories in tests 2013-04-09 14:40:15 +10:00
Dan Poltawski
69203ea923 Merge branch 'wip-MDL-38682-master' of git://github.com/marinaglancy/moodle 2013-04-09 11:49:55 +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
Marina Glancy
9dd85edf02 MDL-38682 Allow configuring blocks for courses lists pages 
Also fixed block configuration form error when pagetype string does not exist (for course- pages)
 2013-04-09 13:24:31 +10:00
Dan Poltawski
91af884c4a MDL-34346 - bump version 2013-04-09 11:17:58 +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
David Monllao
eb18e0232f MDL-38967 behat: New test 
According to MDLQA-58, in an assignment
students can upload files for assessment.
 2013-04-09 10:50:29 +08:00
Dan Poltawski
fadec475d4 Merge branch 'MDL-38766/master' of github.com:kemitix/moodle 2013-04-09 10:37:23 +08:00
David Monllao
912a46dbce MDL-38969 behat: New test 
According to MDLQA-59, in an assignment
students can add and edit text online.
 2013-04-09 10:32:05 +08:00
Marina Glancy
30142c1905 MDL-38593 Merge code from /course/category.php into /course/index.php 2013-04-09 12:21:05 +10:00
Jason Fowler
f982303d62 MDL-35608 - Blocks - Updating the Completion Status block to use HTML Writer 2013-04-09 09:50:08 +08: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)
dba85495c1 Merge branch 'MDL-38934-master' of git://github.com/danpoltawski/moodle 2013-04-09 02:47:51 +02:00
AMOS bot
1e4a484378 Automatically generated installer lang files 2013-04-09 00:37:48 +00: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)
e934648d07 Merge branch 'w14_MDL-38753_m25_ocicount' of git://github.com/skodak/moodle 2013-04-09 02:25:12 +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
ppichet
3d9645ae6e MDL-38792 Update question/type in-line comments to codechecker standards 
Correct bad formated infiles in question/type directories
 2013-04-08 19:59:51 -04: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)
60f9cae763 Merge branch 'MDL-38618_master' of git://github.com/dmonllao/moodle 2013-04-09 01:44:58 +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)
b19e8a1fb9 Merge branch 'MDL-38744-master' of git://github.com/danpoltawski/moodle 2013-04-09 01:13:57 +02:00
Eloy Lafuente (stronk7)
d29afc4577 Merge branch 'MDL-38907-master' of git://github.com/damyon/moodle 2013-04-09 00:58:02 +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
Eloy Lafuente (stronk7)
d506f422c9 MDL-38999 timezones: add some TZ/stamps know to be problematic to tests. 2013-04-08 16:09:41 +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
Petr Škoda
03216719c3 MDL-38753 tweak count SQL to make stupid Oracle happy 2013-04-08 12:33:49 +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
David Monllao
ad2f644087 MDL-38942 behat: New test 
According to MDLQA-4582, a teacher can
set a group assignment.
 2013-04-08 17:33:37 +08:00
Tim Hunt
a6f849cbe6 MDL-38935 quiz autosave: save HTML editor contents. 
Also, ignore changes in scrollpos.
 2013-04-08 10:29:58 +01:00
David Monllao
e613fd905b MDL-38945 behat: New test 
According to MDLQA-142, a teacher can
organise students into groups within
a course.
 2013-04-08 17:29:20 +08:00
David Monllao
ecd580f310 MDL-38945 behat: Step definition to add users to groups 2013-04-08 17:28:53 +08:00
Damyon Wiese
c2bb7f6007 MDL-38907 Course: Remove unused CSS causing jump menu to be center aligned. 2013-04-08 16:45:44 +08:00
David Monllao
862fcc8b70 MDL-38943 behat: New test 
According to MDLQA-2417, teachers can
specify unique group and grouping ID numbers.
 2013-04-08 16:41:40 +08:00