69551 Commits

Author SHA1 Message Date
Helen Foster
9447cdc206 MDL-47031 Merge English strings from the en_fix language pack 2014-09-03 10:02:56 +02: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
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
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
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
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
Marina Glancy
e55cecf05f Merge branch 'MDL46887_assignment_file_max_size' of git://github.com/Dave-B/moodle 2014-08-25 16:28:49 +08:00
Marina Glancy
8c1fb0f89e Merge branch 'MDL-46895' of git://github.com/colchambers/moodle 2014-08-25 16:27:49 +08:00
Rex Lorenzo
f0d2cb3e90 MDL-46776 gradereport_grader: Improve Grader report user interface
* Adding assignments to test course generator to more easily test the grader report with large number of students and graded activities.
2014-08-25 16:17:47 +08:00
Marina Glancy
cf2d4159b7 Merge branch 'MDL-46191-master' of git://github.com/FMCorz/moodle 2014-08-25 15:43:29 +08:00
Frederic Massart
07f827acd4 MDL-46191 gradereport_history: Final clean up for integration 2014-08-25 14:53:28 +08:00
Marina Glancy
f0623ea70e Merge branch 'MDL-46450_master' of git://github.com/nadavkav/moodle 2014-08-25 14:45:22 +08:00
Marina Glancy
241d1d42cf Merge branch 'MDL-46904-master' of git://github.com/damyon/moodle 2014-08-25 14:45:05 +08:00
Damyon Wiese
bb918c0e94 Merge branch 'wip-MDL-46812_master' of git://github.com/lazydaisy/moodle 2014-08-25 14:03:00 +08:00
Damyon Wiese
b04dbae3fe Merge branch 'wip-MDL-46703-master' of git://github.com/marinaglancy/moodle 2014-08-25 13:49:05 +08:00
Marina Glancy
2ef3ecffb7 Merge branch 'MDL-46918' of git://github.com/timhunt/moodle 2014-08-25 12:01:10 +08:00
Petr Skoda
a45d54b8cb MDL-46235 ddl: add support for large number of text fields in one database table 2014-08-25 12:40:57 +12:00
Petr Skoda
b6f299bb69 MDL-43918 add more validation to $modulename parameter when fetching cms 2014-08-25 12:09:54 +12:00
Nadav Kavalerchik
51f2398ce7 MDL-46450 availability/info: Add links to module names inside restrict access availabilityinfo box 2014-08-24 23:39:20 +03:00
Colin Chambers
96fc865427 MDL-46895 qtype_calculated_find_formula_errors not defined causes Calculated question type test to fail 2014-08-22 13:55:44 +01:00
Ankit Agarwal
5bd36407af MDL-46907 gradereport_history: Refactor user_button class to remove js methods
Part of MDL-46191
2014-08-22 10:52:27 +08:00
Ankit Agarwal
9e7a84e5b2 MDL-46191 gradereport_history: Fix minor issues after the review
Part of MDL-46191
2014-08-22 10:38:27 +08:00
Frederic Massart
4870363dd2 MDL-46573 gradereport_history: Cross DB query relying on timemodified
Part of MDL-46191
2014-08-22 10:38:24 +08:00
Ankit Agarwal
950ac46e2a MDL-46678 gradereport_history: Write unit tests for get_graders api
Part of MDL-46191
2014-08-22 10:38:20 +08:00
Ankit Agarwal
9f3523767e MDL-46678 gradereport_history: Move hardcoded sql from index.php to an api
Part of MDL-46191
2014-08-22 10:38:17 +08:00