69263 Commits

Author SHA1 Message Date
Ray Morris
d6691fbee8 MDL-41513 mod_quiz: Scrollbar not working in Javascript Security Popup Quiz window in Chrome 2014-08-12 11:14:24 -05:00
Marina Glancy
14cb870f46 weekly release 2.8dev 2014-08-07 13:14:54 +08:00
Marina Glancy
d28f978649 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2014-08-07 13:14:52 +08:00
Marina Glancy
c293baee2e Merge branch 'wip-mdl-46175' of https://github.com/rajeshtaneja/moodle 2014-08-07 10:02:25 +08:00
Marina Glancy
4b9bcb5264 Merge branch 'MDL-32917-master-1' of https://github.com/andrewnicols/moodle 2014-08-07 10:01:24 +08:00
Rajesh Taneja
cc41342290 MDL-46175 behat: Fixed lang changes in gradebook 2014-08-07 09:39:58 +08:00
Rajesh Taneja
0631009caf MDL-45897 behat: fixed behat for my home page 2014-08-07 09:39:07 +08:00
Andrew Nicols
b6c56044f6 MDL-32917 calendar: Fix centering of calendar heading on IE10 2014-08-07 09:38:06 +08:00
Andrew Nicols
1fad754c58 MDL-44343 mod_glossary: Stop trying to pass deprecated unused variable for printing attachments 2014-08-06 12:04:36 +08:00
Dan Poltawski
a43be9d8f2 Merge branch 'MDL-46548-master' of git://github.com/damyon/moodle 2014-08-05 19:24:32 +01:00
Dan Poltawski
f851224256 Merge branch 'MDL-46175_strings' of https://github.com/andyjdavis/moodle 2014-08-05 19:14:15 +01:00
Eloy Lafuente (stronk7)
5013c189e9 Merge branch 'm28_MDL-46625' of https://github.com/totara/moodle 2014-08-05 13:04:11 +02:00
Damyon Wiese
0ab3362218 Merge branch 'wip_MDL-39840_m28_addonenv' of https://github.com/skodak/moodle 2014-08-05 16:22:36 +08:00
Petr Skoda
40cba608a6 MDL-39840 environment: add support for environment.xml in plugins
New features:

* environment.xml files in all types of plugins
* support for plugin strings via new optional plugin attribute in FEEDBACK
* support for class_name::method_name custom callbacks and classloader
2014-08-05 20:18:18 +12:00
Damyon Wiese
650f14e555 Merge branch 'wip-MDL-41639-master' of git://github.com/marinaglancy/moodle 2014-08-05 15:52:50 +08:00
Damyon Wiese
fff702acfd Merge branch 'MDL-45897_my2' of https://github.com/andyjdavis/moodle 2014-08-05 12:06:36 +08:00
Andrew Davis
7623260459 MDL-45897 blocks: added 3 new default blocks to /my 2014-08-05 08:44:21 +08:00
Eloy Lafuente (stronk7)
09e5495747 Merge branch 'MDL-46641-delete-activity-step' of https://github.com/rlorenzo/moodle 2014-08-05 02:24:48 +02:00
Eloy Lafuente (stronk7)
2f7000f94b Merge branch 'MDL-44149-master' of git://github.com/damyon/moodle 2014-08-04 17:10:38 +02:00
Damyon Wiese
9871a438f8 MDL-46548 grades: Reorder grade export form.
Move the list of grade items to the top, and leave them expanded by default.

Move the idnumber warning into the grade items section, now it is visible by default.
2014-08-04 16:24:47 +08:00
Damyon Wiese
8d395db4c3 MDL-46548 grades: Add upgrade.txt for gradeexport plugins 2014-08-04 16:18:33 +08:00
Damyon Wiese
8cd07ed02a MDL-46548 grades: Remove file upload tags 2014-08-04 16:18:32 +08:00
Damyon Wiese
8023a71b9a MDL-46548 grades: Add behat test for xml export 2014-08-04 16:18:32 +08:00
Damyon Wiese
26b0c96f5b MDL-46548 grades: Add behat test for csv export 2014-08-04 16:18:32 +08:00
Damyon Wiese
ad5ab383e6 MDL-46548 behat: Prevent force file save as for some pages we want to test with behat. 2014-08-04 16:18:32 +08:00
Damyon Wiese
6c6d05a651 MDL-46548 grades: Add warning to export form when users with no idnumber are excluded. 2014-08-04 16:18:25 +08:00
Damyon Wiese
0672e056dc MDL-44149 Assign: Reopen attempts from quick grading (reopenuntilpass) 2014-08-04 15:52:53 +08:00
Marina Glancy
da45b022f2 Merge branch 'MDL-32917-master' of git://github.com/andrewnicols/moodle 2014-08-04 15:13:30 +08:00
Andrew Davis
27dbf2628f MDL-46447 core_rate: made sure non-ajax files don't return JSON data 2014-08-04 15:12:50 +08:00
Marina Glancy
91a4788b17 Merge branch 'MDL-44794-master' of git://github.com/lameze/moodle 2014-08-04 14:24:04 +08:00
Marina Glancy
942aa06e91 Merge branch 'MDL-43506-master' of git://github.com/andrewnicols/moodle 2014-08-04 14:23:38 +08:00
Simey Lameze
a0372a4019 MDL-44794 group: unit test for groups_get_user_groups method. 2014-08-04 11:59:06 +08:00
Simey Lameze
93d10d162c MDL-44794 group: unit test for get_groups method. 2014-08-04 11:59:06 +08:00
Marina Glancy
5fcdf22034 Merge branch 'MDL-44343-master' of git://github.com/andrewnicols/moodle 2014-08-04 11:23:10 +08:00
Marina Glancy
d3bf99502c Merge branch 'MDL-46457' of git://github.com/aolley/moodle 2014-08-04 11:22:53 +08:00
Marina Glancy
eb06c9e9e2 Merge branch 'MDL-46414-master' of git://github.com/sammarshallou/moodle 2014-08-04 11:22:36 +08:00
Andrew Nicols
0181759e39 MDL-44343 mod_glossary: Show File attachments underneath content 2014-08-04 10:55:14 +08:00
Andrew Nicols
03f07eb387 MDL-44343 mod_forum: Show File attachments underneath content 2014-08-04 10:55:13 +08:00
Andrew Nicols
cbed1284f4 MDL-43506 Blocks: Remove various deprecated functions 2014-08-04 08:44:50 +08:00
Eloy Lafuente (stronk7)
1ad873c32f Merge branch 'MDL-46620-master' of https://github.com/merrill-oakland/moodle 2014-08-03 19:57:22 +02:00
Andrew Davis
e54e51931d MDL-46175 core_grading: updated grading related strings 2014-08-01 10:28:57 +08:00
Rex Lorenzo
84a1e50a9f MDL-46641 behat: Delete activity step does not work without actions menu open 2014-07-31 11:29:00 -07:00
AMOS bot
4683275d0c Automatically generated installer lang files 2014-08-01 00:05:31 +08:00
Damyon Wiese
97908a2225 MDL-46548 grades: Update xml grade export to support one step exports. 2014-07-31 17:00:14 +08:00
Damyon Wiese
9f5834ccc7 MDL-46548 grades: Update xls grade exporter to support one step exports. 2014-07-31 17:00:08 +08:00
Damyon Wiese
1cc43058a8 MDL-46548 grades: Update ods grade export to support one step exports. 2014-07-31 17:00:08 +08:00
Damyon Wiese
cca51baa07 MDL-46548 grades: Add support for simplified one-step exports and update txt exporter
This ui change requires changes to the API so I have deprecated the old functions while maintaining
compatibility (if you don't mind lots of debugging).
2014-07-31 17:00:01 +08:00
Dan Poltawski
d29fb4ac65 weekly release 2.8dev 2014-07-31 09:37:11 +01:00
Dan Poltawski
d7e09cb9fb Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2014-07-31 09:37:08 +01:00
John Okely
56302d4868 MDL-46465 mod_chat: Fix more user icon links 2014-07-31 12:31:53 +08:00