mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-06 00:42:44 +02:00
Code Issues Projects Releases Wiki Activity
60,409 Commits 36 Branches 529 Tags
Commit Graph

60409 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damyon Wiese
92674e324e Merge branch 'MDL-26649_master' of https://github.com/markn86/moodle 2013-04-09 15:13:21 +08:00
Dan Poltawski
ad84f8f9ac Merge branch 'w14_MDL-38927_m25_rolelocalisation' of git://github.com/skodak/moodle 2013-04-09 14:58:47 +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
Dan Poltawski
33815b4b7e Merge branch 'wip-MDL-38682-master' of git://github.com/marinaglancy/moodle 2013-04-09 14:49:07 +08:00
Petr Škoda
6f55ce1893 MDL-38927 use role->localname to get real role name 2013-04-09 08:31:25 +02: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
Aparup Banerjee
eeb47dbd30 Merge branch 'wip-MDL-38887-m25' of git://github.com/marinaglancy/moodle 2013-04-09 14:21:22 +08:00
Marina Glancy
5f79b34b5e MDL-38682 removed auto page type, created issue MDL-39045 to address this 2013-04-09 16:16:21 +10:00
Damyon Wiese
bb18ec5e5b MDL-31969 Grader report - bump version for capabilities and settings. 2013-04-09 14:09:27 +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
Damyon Wiese
10c56dc137 MDL-35608 Completion status block - use html_writer::link 
Just changing 2 calls from html_writer::tag to html_writer::link.
 2013-04-09 13:59:48 +08:00
Damyon Wiese
9adb30759f Merge branch 'wip-MDL-35608-master' of git://github.com/phalacee/moodle 2013-04-09 13:59:45 +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
Damyon Wiese
0180dfdede MDL-38865 Completion report: Version bump for css changes. 2013-04-09 13:21:04 +08:00
Damyon Wiese
67879710ee Merge branch 'MDL-38865-master' of https://github.com/mackensen/moodle 2013-04-09 13:20:52 +08:00
Dan Poltawski
224db0e83b Merge branch 'MDL-38981' of git://github.com/jmvedrine/moodle 2013-04-09 13:19:10 +08:00
Dan Poltawski
c64d2c0acd Merge branch 'wip-MDL-34346-master' of git://github.com/marinaglancy/moodle 2013-04-09 13:09:57 +08:00
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
Dan Poltawski
fadec475d4 Merge branch 'MDL-38766/master' of github.com:kemitix/moodle 2013-04-09 10:37:23 +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
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
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)
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