71808 Commits

Author SHA1 Message Date
Atanas Atanasov
33ce9e581a MDL-20304 lesson: do not send practice lesson grades to gradebook 2014-12-17 14:17:50 +00:00
Wiktor Wandachowicz
900a559a3c MDL-35078 enrol: allow times to be chose on bulk enrolment forms
Previously only a date was available, which made it ambigious whether
the the enrolment was inclusive of the date. Now we use a time to make
it less ambigious.

This matches changes done in other forms in MDL-41173.
2014-12-17 12:01:45 +00:00
Dan Poltawski
344b4b9846 Merge branch 'MDL-44829_MOODLE_MASTER' of git://github.com/BenKelada/moodle 2014-12-17 10:11:40 +00:00
Frederic Massart
077b347d6d MDL-43004 blog: Deprecation of parameter $action in add_association/s() 2014-12-17 17:30:45 +08:00
Eloy Lafuente (stronk7)
b033a93682 Merge branch 'MDL-46122-master' of git://github.com/FMCorz/moodle 2014-12-17 10:12:34 +01:00
Mark Nelson
acb525551f MDL-48534 mod_assign: display correct workflow state and marker 2014-12-17 00:06:49 -08:00
Mark Nelson
8dc1f5ff71 MDL-45324 mod_assign: always notify students when requested 2014-12-16 23:41:00 -08:00
Simey Lameze
6dd7175a20 MDL-44260 core_deprecated: final deprecation of clam related methods 2014-12-17 15:10:33 +08:00
Simey Lameze
1e23ff2122 MDL-44260 core_file: final deprecation of upload_manager class and clam functions 2014-12-17 15:10:13 +08:00
BKelada
8ce30abf5b MDL-44829 libraries: Update android user agent detection 2014-12-17 16:10:24 +11:00
Gregory Faller
24937b2c1e MDL-48428 mod/assign: Allow Grant extension option in offline assignment 2014-12-17 14:26:25 +10:30
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
Andrew Nicols
35df3d5373 MDL-48593 messageinbound: Correct header retrieval from IMAP server
Header retrieval should only be performed on the base message, and not each
part of the message as is currently performed.

This came to light because Google changed their IMAP server such that, if
you inform the data query that you wish to retrieve the headerText for a
part which does not contain a MIME header, then no message is retrieved in
the search causing a general failure of the IMAP fetch.

In normal circumstances, headers should only be a part of the base message
part.
2014-12-17 09:34:56 +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
John Okely
e6904efc52 MDL-42166 repositories: Finalise deprecation of repository sync methods 2014-12-16 15:57:50 +08: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
Simey Lameze
64a5ede261 MDL-48580 report_log: fix site errors dropdown
Thanks Renaat Debleu for pointing this bug and share a solution.
2014-12-16 12:37:28 +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
Josh Marshall
404e33e9b5 MDL-48445 report_loguser: Include logstore parameter for pagination 2014-12-16 14:29:31 +10:30
David Monllao
d0f3b7e685 Merge branch 'MDL-44642-master-fixes' of git://github.com/andrewnicols/moodle 2014-12-16 11:43:21 +08:00