69572 Commits

Author SHA1 Message Date
Damyon Wiese
c8336b9733 Merge branch 'MDL-46911' of https://github.com/bostelm/moodle 2014-09-01 15:42:01 +08:00
Damyon Wiese
caffd84d44 Merge branch 'm28_MDL-46985_7ZIP_RAR_MIME_types_missing' of https://github.com/scara/moodle 2014-09-01 15:33:54 +08:00
Damyon Wiese
e0e23395dd Merge branch 'master_MDL-46961' of https://github.com/danmarsden/moodle 2014-09-01 15:27:41 +08:00
Damyon Wiese
aac31be316 Merge branch 'wip-mdl-46670' of https://github.com/rajeshtaneja/moodle 2014-09-01 15:22:16 +08:00
Damyon Wiese
0908474990 Merge branch 'MDL-45818_master' of git://github.com/markn86/moodle 2014-09-01 15:15:24 +08:00
Marina Glancy
181435d483 Merge branch 'master_MDL-46639' of git://github.com/danmarsden/moodle 2014-09-01 14:36:09 +08:00
Marina Glancy
c1780a3d0b Merge branch 'MDL-46539-fix-28' of https://github.com/jmarthaler/moodle 2014-09-01 14:36:04 +08:00
Damyon Wiese
e698e24f1a Merge branch 'wip-MDL-39233-master' of git://github.com/marinaglancy/moodle 2014-09-01 13:35:50 +08:00
Damyon Wiese
37728346fb MDL-46619 Forum: whitespace fixes 2014-09-01 11:34:41 +08:00
Damyon Wiese
89a1fbe5ff Merge branch 'MDL-46619-visisble-authors-qanda' of https://github.com/amandadoughty/moodle 2014-09-01 11:00:07 +08:00
Dan Marsden
7383195cc7 MDL-46737 SCORM: correct dml syntax. 2014-09-01 10:54:59 +08:00
Rajesh Taneja
9e4e87b434 MDL-46670 report_participation: Look for records in legacy and current
Priority log store will have current information, so
make sure to get information and aggregate that with
legacy data
2014-09-01 10:24:01 +08:00
Matteo Scaramuccia
cfa5bd1f3f MDL-46985 Added 7-Zip and RAR MIME types. 2014-08-31 22:33:28 +02:00
Mark Nelson
cbfd685a7e MDL-45818 core_message: use system context if user no longer exists 2014-08-29 16:19:35 -07:00
zbdd
7d908d3365 MDL-37312 backup: Keep course idnumber on same site course restore
When the course idnumber is set during a same site course restore,
retain the course idnumber if there are no duplicates.
2014-08-29 07:15:03 +00:00
Eloy Lafuente (stronk7)
1446e02f69 weekly release 2.8dev 2014-08-28 19:11:58 +02:00
Eloy Lafuente (stronk7)
4678d1a9b3 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2014-08-28 19:11:47 +02:00
Frederic Massart
a2bf889706 MDL-46191 gradereport_history: Missing filename when downloading data 2014-08-28 11:21:40 +08:00
Jon Marthaler
abd0f0aec6 MDL-46539 assign calendar: Fix lastcron value for assign cron 2014-08-27 11:17:28 -05:00
AMOS bot
d499bcb1d8 Automatically generated installer lang files 2014-08-28 00:05:29 +08:00
Damyon Wiese
7c9e983b52 Merge branch 'MDL-46812-master-fixup' of https://github.com/FMCorz/moodle 2014-08-27 10:48:36 +08:00
Frederic Massart
981c2ee51c MDL-46812 gradereport_grader: Hide vertical scrollbar of scroller 2014-08-27 10:40:56 +08:00
Damyon Wiese
c2dbaaef64 Merge branch 'wip-MDL-39888-master-v2' of git://github.com/abgreeve/moodle 2014-08-27 09:53:35 +08:00
Faisal Kaleem
ae72469da9 MDL-46961 SCORM: JavaScript Hoisting issue. 2014-08-27 13:06:36 +12:00
Eloy Lafuente (stronk7)
934a22a333 Merge branch 'm28_MDL-46875' of https://github.com/totara/moodle 2014-08-27 01:41:58 +02:00
Damyon Wiese
6d9a83c294 Revert "Merge branch 'MDL-46917-master' of git://github.com/andrewnicols/moodle"
This reverts commit acbcea51013bdf5d0101dc5856d8aca97bf1c036, reversing
changes made to 91f31c097dd46674d8535096e020ffa42536e854.
2014-08-26 17:18:03 +08:00
Henning Bostelmann
f09040d76a MDL-46911 Database activity: jump to correct place in list after (un)approve 2014-08-26 10:15:15 +01:00
Adrian Greeve
1899519c6b MDL-39888 mnet: Removed tab and links to the log report.
The link would include parameters which generates warnings
on the log report page.
2014-08-26 15:11:56 +08:00
Adrian Greeve
8bc663e85e MDL-39888 mnet: Removal of an old sql statement invloving the mdl_log table. 2014-08-26 15:11:56 +08:00
Marina Glancy
cdd9c80f1a MDL-39233 mod_url: added unittest for get_course_content 2014-08-26 13:53:13 +08:00
Jason
1b126c0835 MDL-39233 mod_url: fix php notice 2014-08-26 13:47:46 +08:00
Damyon Wiese
a4fa3604e7 MDL-46235 Admin: Fix typos in mysql_compressed_rows.php cli script 2014-08-26 12:32:44 +08:00
Damyon Wiese
112632ed58 Merge branch 'wip_MDL-46235_m28_innodbtext' of https://github.com/skodak/moodle 2014-08-26 12:28:47 +08:00
Damyon Wiese
a564a66efa Merge branch 'MDL-46509' of https://github.com/danielneis/moodle 2014-08-26 11:45:43 +08:00
Damyon Wiese
ab38cb2833 MDL-46842 assign: Fix for unit tests - previous patch was completely ignoring manually reopening attempts. 2014-08-26 10:30:14 +08:00
Brian Barnes
24af352b40 MDL-46875 tinymce: Fixed issue with full screen and spelling 2014-08-26 13:19:43 +12:00
Eloy Lafuente (stronk7)
7beb1d8ea3 Merge branch 'MDL-46477' of https://github.com/shashirepo/moodle 2014-08-26 02:23:56 +02:00
Eloy Lafuente (stronk7)
db438e0c14 Merge branch 'm28_MDL-46716' of https://github.com/totara/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-08-26 02:16:50 +02:00
Eloy Lafuente (stronk7)
fd6bfe5856 Merge branch 'MDL-46753-master' of git://github.com/lameze/moodle 2014-08-26 02:07:56 +02:00
Eloy Lafuente (stronk7)
863c536219 Merge branch 'master_MDL-46842' of https://github.com/greg-or/moodle-mod_assign 2014-08-26 01:58:08 +02:00
Eloy Lafuente (stronk7)
af0646139c Merge branch 'MDL-46868' of git://github.com/timhunt/moodle 2014-08-26 01:40:00 +02:00
Eloy Lafuente (stronk7)
d3ebc21fdf Merge branch 'MDL-46867' of git://github.com/timhunt/moodle 2014-08-26 01:37:34 +02:00
Eloy Lafuente (stronk7)
40f1dff05f Merge branch 'master_MDL-46816' of https://github.com/danmarsden/moodle 2014-08-26 00:09:51 +02:00
Eloy Lafuente (stronk7)
f438b03fdc Merge branch 'wip-MDL-46874-master' of git://github.com/marinaglancy/moodle 2014-08-25 22:10:09 +02:00
Eloy Lafuente (stronk7)
56127f65af Merge branch 'm28_MDL-46900' of https://github.com/totara/moodle 2014-08-25 20:55:09 +02:00
Damyon Wiese
acbcea5101 Merge branch 'MDL-46917-master' of git://github.com/andrewnicols/moodle 2014-08-25 16:54:47 +08:00
Marina Glancy
91f31c097d Merge branch 'MDL-46894' of git://github.com/timhunt/moodle 2014-08-25 16:52:21 +08:00
Marina Glancy
b7e662bb13 Merge branch 'MDL-46916' of git://github.com/timhunt/moodle 2014-08-25 16:49:52 +08:00
Damyon Wiese
a88770d7eb Merge branch 'MDL-46923_master' of git://github.com/markn86/moodle 2014-08-25 16:48:27 +08:00
Damyon Wiese
4da7f20610 Merge branch 'wip_MDL-43918_m28_cm' of https://github.com/skodak/moodle 2014-08-25 16:45:15 +08:00