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,556 Commits 36 Branches 527 Tags
Commit Graph

19541 Commits

Author SHA1 Message Date
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
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
524cbf743a Merge branch 'm28_MDL-45955a' of https://github.com/totara/moodle 2014-12-16 10:44:16 +00: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
32759f7f7e Merge branch 'MDL-48547-master' of git://github.com/danpoltawski/moodle 2014-12-16 14:14:24 +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
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
David Monllao
ba872d3c3c MDL-46472 theme: Removing standard as an uninstallable theme 2014-12-12 13:32:55 +08:00
Sam Hemelryk
16dfee4e5b MDL-48430 customment: improved exception handling 2014-12-10 13:24:39 +01:00
Sam Hemelryk
f6c65c2575 Merge branch 'MDL-48430_master' of https://github.com/crazyserver/moodle 2014-12-10 13:24:38 +01:00
Ankit Agarwal
f9b7be4f95 MDL-34550 libraries: Final deprecation - get_context_instance_by_id() 2014-12-10 13:50:08 +05:30
Ankit Agarwal
4d851042eb MDL-44985 libraries: Final deprecation of conditional apis in modinfo 2014-12-10 12:20:37 +05:30
Ankit Agarwal
e56e8e3a0e MDL-44985 libraries: Final deprecation of conditional classes and apis 2014-12-10 12:20:37 +05:30
Ankit Agarwal
88b122537b MDL-42862 behat: Final deprecation of various steps 2014-12-10 09:58:42 +05:30
Brian Barnes
bbb0733297 MDL-45955 forms: replaced labels in static text elements 2014-12-10 17:28:09 +13:00
Dan Poltawski
5260dbb55b MDL-48547 thirdparty: remove incorrect entry 2014-12-09 23:12:02 +00:00
Dan Poltawski
e600e6ae50 Merge branch 'MDL-47323-enrol-plugin-backup' of https://github.com/mpetrowi/moodle 2014-12-09 22:29:37 +00:00
Dan Poltawski
51019f2a91 Merge branch 'MDL-48394-master' of git://github.com/jethac/moodle 2014-12-09 10:53:41 +00:00
Ankit Agarwal
1973a7e2f5 MDL-42862 behat: update deprecated_message api 
Deprecated message api now accepts a $throwexception param that if set to true always throws an exception
 2014-12-09 14:34:46 +05:30
Sam Hemelryk
50c1f47ec4 Merge branch 'wip_MDL-36499_master' of git://github.com/gjb2048/moodle 2014-12-09 16:57:03 +13:00
Sam Hemelryk
1e12b5688c Merge branch 'wip-MDL-46486-master' of git://github.com/marinaglancy/moodle 2014-12-09 16:20:40 +13:00
Sam Hemelryk
255501c900 Merge branch 'mdl48517' of https://github.com/tlevi/moodle 2014-12-09 15:15:51 +13:00
Sam Hemelryk
440d861ccb Merge branch 'wip-mdl-48426' of https://github.com/rajeshtaneja/moodle 2014-12-09 12:13:26 +13:00
Sam Hemelryk
7622b02f4c Merge branch 'MDL-43996-master' of git://github.com/jethac/moodle 2014-12-09 10:56:53 +13:00
Dan Poltawski
512cc4162e Merge branch 'MDL-48373' of git://github.com/timhunt/moodle 2014-12-08 15:15:35 +00:00
Dan Poltawski
29a9a28e57 Merge branch 'MDL-14908-master' of git://github.com/FMCorz/moodle 2014-12-08 13:22:16 +00:00
Frederic Massart
26e4b0caff MDL-44918 libraries: Final deprecation of count_login_failures() 2014-12-08 17:24:57 +08:00
Andrew Nicols
44ab05b31d MDL-44088 ajax: Final deprecation of ajaxenabled() php function 2014-12-08 09:12:03 +08:00
Tony Levi
064b8b7fe3 MDL-48517: behat: Fix reset ordering reversal (MDL-48302) 2014-12-07 23:58:24 +10:30
Gareth J Barnard
ffe618dcd3 MDL-36499 javascript: Expand height of the file element in embedded view. 2014-12-05 15:48:16 +00:00
Tim Hunt
0db16e082f MDL-48373 behat: generators for questions and categories 2014-12-05 12:22:27 +00:00
Tim Hunt
dd2e1c222a MDL-48373 behat: find table columns better. 
It was not possible to select the question bank 'Created by'
or 'Modified by' columns without this change.
 2014-12-05 12:22:26 +00:00
Tim Hunt
4e4c8d3a27 MDL-48373 behat: new container selector for list items. 2014-12-05 12:22:26 +00:00
Paul Nicholls
1461aee88a MDL-43996 editor_atto: add image drag and drop capability 
Adds the ability to drag and drop images directly into Atto, uploading the image and embedding it
correctly. Contains fixes from 1.0.2, as well as a policy change - images dragged and dropped into
Atto now have role=presentation by default.
 2014-12-05 11:32:32 +08:00
Eloy Lafuente (stronk7)
a610c9abac MDL-48374 behat: Added missing $session 2014-12-04 12:14:30 +00:00
Rajesh Taneja
9f3a68fe61 MDL-48374 behat: Check flag before searching for span on page 2014-12-04 12:04:37 +00:00
Andrew Nicols
1b2c35af34 MDL-48374 behat: improved page load detection 
Check that page load detection was correctly started before testing that a
new page was loaded.

Without this, it is possible to have mutliple subsequent cases of:
    And a new page should have loaded since I started watching

Without first starting the page load detection.
 2014-12-04 12:04:36 +00:00
Eloy Lafuente (stronk7)
951af91e08 Merge branch '48374-29' of git://github.com/samhemelryk/moodle 2014-12-04 12:04:09 +00:00
Sam Hemelryk
7594ed1e2a Merge branch 'MDL-40419-master-2nd' of git://github.com/FMCorz/moodle 2014-12-04 12:03:18 +00:00
Sam Hemelryk
6c4e70a6d8 Merge branch 'wip_MDL-47830_m29_pwrotation' of https://github.com/skodak/moodle 2014-12-04 12:03:15 +00:00
Dan Poltawski
7dad52f704 Merge branch 'wip_MDL-48420_m29_lasttypo' of https://github.com/skodak/moodle 2014-12-04 11:37:52 +00:00
Dan Poltawski
f9fae51704 Merge branch 'wip-MDL-32547-master-v2' of git://github.com/abgreeve/moodle 
Conflicts:
	version.php
 2014-12-04 11:37:48 +00:00
Matt Petro
f61992951d MDL-47323 backup: added enrol plugin backup structure and annotation 2014-12-02 21:46:33 -05:00
Sam Hemelryk
a33fed2161 MDL-48374 behat: improved page load exceptions 
The following improvements have been made to the page load watching:
* Improved the exceptions when a page load expectation fails.
* Added an exception if start watching happens twice without a page load.
* Improved the page load span and xpath to make it faster and less likely
  to interfer in the future.
 2014-12-02 11:43:58 +13:00
Tim Hunt
a109a3ca35 MDL-48374 behat: new steps for detecting page loads. 2014-12-02 08:57:28 +13:00