mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-03 15:32:43 +02:00
Code Issues Projects Releases Wiki Activity
69,287 Commits 36 Branches 528 Tags
Commit Graph

69287 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
c7a042bfcf Merge branch 'master_MDL-46524' of https://github.com/greg-or/moodle-mod_assign 2014-08-11 17:06:54 +01:00
Dan Poltawski
2f035def0f Merge branch 'MDL-45932-master' of https://github.com/StudiUM/moodle 2014-08-11 16:53:51 +01:00
Dan Poltawski
c068b0814b Merge branch 'MDL-46496-master' of git://github.com/andrewnicols/moodle 2014-08-11 14:38:33 +01:00
Dan Poltawski
d3014cca39 Merge branch 'master_MDL-44015' of https://github.com/greg-or/moodle-mod_assign 2014-08-11 14:31:02 +01:00
Dan Poltawski
c5186b2251 Merge branch 'MDL-46688' of git://github.com/timhunt/moodle 2014-08-11 14:13:12 +01:00
Dan Poltawski
463d281377 Merge branch 'MDL-45759-master' of git://github.com/andrewnicols/moodle 2014-08-11 11:24:19 +01:00
Dan Poltawski
0bd41a9ccf Merge branch 'wip-MDL-30668-master' of git://github.com/marinaglancy/moodle 2014-08-11 10:41:40 +01:00
Marina Glancy
e4c2a25866 Merge branch 'wip_MDL-46692_m28_forum' of git://github.com/skodak/moodle 2014-08-11 17:24:19 +08:00
Marina Glancy
b832dde880 Merge branch 'MDL-35984-master' of git://github.com/damyon/moodle 2014-08-11 17:22:13 +08:00
Damyon Wiese
d6caf63789 MDL-35984 Grades: Fix deprecation of grade_category::aggregate_values 2014-08-11 15:53:47 +08:00
Damyon Wiese
5232d3f2c9 MDL-35984 grade: Recalculate min/max for sum of grades when hidden grades are involved. 2014-08-11 15:53:47 +08:00
Damyon Wiese
d2e9fc5845 MDL-35984 grade: Add behat tests for grade aggregations 2014-08-11 15:53:41 +08:00
Dan Poltawski
ac7584c85b Merge branch 'MDL-46748-master' of git://github.com/damyon/moodle 2014-08-11 08:37:35 +01:00
Andrew Nicols
83d68fde48 MDL-45780 mod_quiz: Autosave should listen for textarea:change events too 2014-08-11 12:31:36 +08:00
Andrew Nicols
4dbc02f664 MDL-45780 editor_atto: Update the textarea more often 
This change updates the frequency of the textarea update to additionally
update it:
* on keypress; and
* on content paste.
 2014-08-11 12:31:36 +08:00
Damyon Wiese
0b51b466a1 MDL-46748 MathJax filter: Update setting default for https cdn url. 2014-08-11 12:02:35 +08:00
Damyon Wiese
fa268b7ed6 MDL-46748 MathJax filter: Make misconfigured mathjax url less "fatal" for Atto. 2014-08-11 11:37:35 +08:00
Tim Hunt
1fa2823de8 MDL-46688 weblib: improve the highlight function. 
Thanks to Joseph Baxter for suggesting some of the test cases.
 2014-08-08 17:51:58 +01:00
Marina Glancy
9fe5a1b8f4 MDL-30668 gradereport_grader: split user preferences into individual courses 
This solves the DB exception when users were trying to insert very large string in DB
 2014-08-08 15:13:58 +08:00
Andrew Nicols
c8f596147a MDL-46496 libraries: Add additional tests for jquery and jqueryUI 
The additional tests add a clear example of the use of jquery UI images in
addition to working JavaScript.
 2014-08-08 14:09:05 +08:00
Andrew Nicols
74ce46e4ae MDL-45759 javascript: Handle setting of the confirm button fields post-init 2014-08-08 08:25:43 +08: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
Gregory Faller
ce09177696 MDL-44015: EditPDF scrolls instead of drawing on iOS 2014-08-06 14:45:43 +09:30
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
Gregory Faller
e4ebf7ef0f MDL-46524: Auto-create groups from existing group or grouping membership 2014-08-06 10:50:14 +09:30
Petr Skoda
d9b60e315e MDL-46692 forum: fix defaultpreference_trackforums to not depend on forum settings 
Existence of admin settings must not depend on other settings,
especially not from other plugins.

In any case somebody should cleaup the preference mess and allow
plugins to setup user preferences instead of hardcoding everything in
core.
 2014-08-06 09:08:06 +12: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
David Ligne
302b8abdd9 MDL-45932 enrol_imsenterprise: Implement Scheduled Task for IMS Enrolment plugin. 2014-08-05 13:41:09 -04: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