mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-21 08:00:37 +01:00
Code Issues Projects Releases Wiki Activity
71,583 Commits 36 Branches 527 Tags
Commit Graph

71583 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
b033a93682 Merge branch 'MDL-46122-master' of git://github.com/FMCorz/moodle 2014-12-17 10:12:34 +01:00
David Monllao
ceb7769a29 Merge branch 'MDL-48243_master' of git://github.com/lazydaisy/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-12-17 11:48:42 +08:00
Frederic Massart
c9bd4e41eb MDL-46122 libraries: Final deprecation of file lib/pluginlib.php 2014-12-17 09:37:11 +08:00
David Monllao
a646812d1b MDL-48482 core_admin: version change to add new lang strings 2014-12-17 08:54:46 +08:00
David Monllao
92f5468179 Merge branch 'm29_MDL-48482' of git://github.com/totara/moodle 2014-12-17 08:52:58 +08:00
Brian Barnes
60b57b6189 MDL-48482 core_admin: Added additional label for durations 2014-12-17 08:54:55 +13:00
Dan Poltawski
861265b43a Merge branch 'MDL-43462_landscape_pdf' of git://github.com/davosmith/moodle 2014-12-16 19:20:22 +00:00
Dan Poltawski
d23bf1f5b8 Merge branch 'MDL-42501-master' of git://github.com/lameze/moodle 2014-12-16 19:17:57 +00:00
Dan Poltawski
f5360dd16b Merge branch 'MDL-43902-master' of git://github.com/FMCorz/moodle 2014-12-16 18:52:40 +00:00
Dan Poltawski
4b0c38daee Merge branch '38663-29' of git://github.com/samhemelryk/moodle 2014-12-16 18:45:33 +00:00
Eloy Lafuente (stronk7)
ccad9ddee6 Merge branch 'MDL-48452-master' of https://github.com/sammarshallou/moodle 2014-12-16 19:21:40 +01:00
sam marshall
af729c3f5e MDL-48452 Completion: Expected date doesn't save when form is locked 
The completion fields are locked when a user has already completed the
task, to prevent you accidentally causing it to recalculate the data.

This lock doesn't apply to the expected date field, as this doesn't
affect user completion. However, changes to the field in this
situation were incorrectly not saved.
 2014-12-16 17:31:00 +00:00
Dan Poltawski
aaca4e3eff Merge branch 'MDL-48587-master' of git://github.com/xow/moodle 2014-12-16 17:05:03 +00:00
Eloy Lafuente (stronk7)
8b25d8d70c Merge branch '34041-29' of git://github.com/samhemelryk/moodle 2014-12-16 16:35:47 +01:00
Eloy Lafuente (stronk7)
cccab73451 Merge branch 'm29_MDL-48532' of https://github.com/totara/moodle 2014-12-16 15:47:06 +01:00
Dan Poltawski
b721d502e4 Merge branch 'MDL-46442-master' of git://github.com/zbdd/moodle 2014-12-16 13:52:52 +00:00
Dan Poltawski
c236f820e1 Merge branch 'MDL-47610-master' of git://github.com/zbdd/moodle 2014-12-16 12:59:45 +00:00
Dan Poltawski
eb7ab07ef8 Merge branch 'MDL-44985-master' of git://github.com/ankitagarwal/moodle 2014-12-16 12:44:22 +00:00
Eloy Lafuente (stronk7)
3bd434cd49 Merge branch 'MDL-34550-master' of git://github.com/ankitagarwal/moodle 2014-12-16 13:35:52 +01:00
Dan Poltawski
4c4507d6dc Merge branch 'MDL-42862-master' of git://github.com/ankitagarwal/moodle 2014-12-16 12:22:37 +00:00
Dan Poltawski
d3a1c13ed8 Merge branch 'MDL-46651-master-restore-course-completion-duplicate-key' of https://github.com/Trii/moodle 2014-12-16 11:58:53 +00:00
Dan Poltawski
52a7001bc2 Merge branch 'MDL-44088-master' of git://github.com/andrewnicols/moodle 2014-12-16 11:20:29 +00:00
Dan Poltawski
a3cc7bd8ce Merge branch 'MDL-44918-master' of git://github.com/FMCorz/moodle 2014-12-16 11:20:04 +00:00
Dan Poltawski
157e267fdd MDL-45295 blocks: added a bit more info to upgrade.txt 2014-12-16 10:49:53 +00:00
Dan Poltawski
a2c3649ecd Merge branch 'MDL-45295-master' of git://github.com/FMCorz/moodle 2014-12-16 10:48:33 +00:00
Dan Poltawski
524cbf743a Merge branch 'm28_MDL-45955a' of https://github.com/totara/moodle 2014-12-16 10:44:16 +00:00
Eloy Lafuente (stronk7)
2da9d573c3 Merge branch 'MDL-47694-master' of git://github.com/zbdd/moodle 2014-12-16 11:18:08 +01:00
Frederic Massart
38a73bf4ae MDL-48495 curl: Limit usage of curl to HTTP and HTTPS protocols 2014-12-16 10:08:33 +00:00
David Monllao
a87494c46f Merge branch 'MDL-48539_master' of git://github.com/StudiUM/moodle 2014-12-16 15:01:31 +08:00
Zachary Durber
a4b10a5244 MDL-46442 mod_assign: Notify users when grades are changed 2014-12-16 14:49:52 +08:00
David Monllao
32759f7f7e Merge branch 'MDL-48547-master' of git://github.com/danpoltawski/moodle 2014-12-16 14:14:24 +08:00
David Monllao
ffb83efb31 Merge branch 'm29_MDL-48567' of git://github.com/totara/moodle 2014-12-16 13:33:54 +08:00
Brian Barnes
7eac77a51e MDL-48286 core_files: Improved accessibility of file management 2014-12-16 13:27:36 +08:00
David Monllao
81103d1d67 Merge branch 'wip-MDL-48569-master' of git://github.com/marinaglancy/moodle 2014-12-16 12:25:44 +08:00
David Monllao
e064c37550 Merge branch 'MDL-48164-master' of git://github.com/andrewnicols/moodle 2014-12-16 12:02:29 +08:00
David Monllao
d0f3b7e685 Merge branch 'MDL-44642-master-fixes' of git://github.com/andrewnicols/moodle 2014-12-16 11:43:21 +08:00
Andrew Nicols
8fab443931 Merge branch 'MDL-46472_master' of git://github.com/dmonllao/moodle 2014-12-16 10:35:48 +08:00
Andrew Nicols
f9b431b873 MDL-44642 session: Remove 403 from require_sesskey() 
This should not have been added in core at this time (needs a separate
issue).
 2014-12-16 10:18:21 +08:00
Andrew Nicols
dd6c9eeb16 MDL-48164 messageinbound: Attempt to detect autoreplies 
Any message which includes:
* Precedence: bulk
* X-Autoreply: !no
* X-Autoresponse: !no
* Auto-Submitted: !no

Will not be detected as a bulk message and therefore ignored.
 2014-12-16 09:34:12 +08:00
Andrew Nicols
c9fa2dee2a MDL-48164 mod_forum: Add additional headers to prevent OOF replies 
This adds the X-Auto-Response-Suppress header to outbound messages.
 2014-12-16 09:34:12 +08:00
Zachary Durber
3712ee3ed0 MDL-47610 gradebook: Show extra credit icon in grades column 2014-12-16 09:16:41 +08:00
Eloy Lafuente (stronk7)
985a1217bf Merge branch 'MDL-44642-master' of git://github.com/andrewnicols/moodle 2014-12-16 01:57:58 +01:00
Andrew Nicols
de1c6859cc MDL-44642 grading: Add session keepalive during advanced grading setup 2014-12-16 08:32:46 +08:00
Andrew Nicols
57996fe956 MDL-44642 session: Add a client-side session keepalive system 
For pages where there will be significant user interaction in which the
server is not updated, it may be necessary to poll the server periodically
to touch the session.

This makes use of the existing checknet script which was designed for
checking network connectivity but fits into this use-case reasonably well.
 2014-12-16 08:32:46 +08:00
Eloy Lafuente (stronk7)
05a9873b89 Merge branch 'MDL-47037-master' of git://github.com/jethac/moodle 2014-12-16 01:23:16 +01:00
Eloy Lafuente (stronk7)
bd5745341e Merge branch 'MDL-48473' of git://github.com/jmvedrine/moodle 2014-12-16 01:12:56 +01:00
Eloy Lafuente (stronk7)
9f0b21eda6 Merge branch 'MDL-46491-master' of git://github.com/andrewnicols/moodle 2014-12-16 00:35:46 +01:00
Davo Smith
50c12f01bc MDL-43462 assignfeedback_editpdf: fix display of landscape PDFs 
The size of the drawing canvas is now set from the size of the generated page image, with automatic
scrolling if it is too wide to display
Absolutely-positioned nodes (comments + stamps) are repositioned as the drawing canvas is scrolled
 2014-12-15 22:01:26 +00:00
Eloy Lafuente (stronk7)
9f6658e18c Merge branch 'MDL-48556-master' of git://github.com/ankitagarwal/moodle 2014-12-15 17:53:27 +01:00
Dan Poltawski
dda9997250 Merge branch 'MDL-38128_master' of https://github.com/dmonllao/moodle 2014-12-15 16:10:15 +00:00