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

19557 Commits

Author SHA1 Message Date
Damyon Wiese
219ebf9bb4 Merge branch 'wip-MDL-45538-master' of git://github.com/marinaglancy/moodle 
Conflicts:
	version.php
 2014-11-03 14:10:43 +08:00
Damyon Wiese
520a32c3d4 Merge branch 'wip_MDL-47966_m28_defaultheaders' of https://github.com/skodak/moodle 2014-11-03 12:20:58 +08:00
Damyon Wiese
c942fddf93 MDL-48006 Atto autosave: Never restore text that is empty. 2014-11-03 11:30:30 +08:00
Sam Hemelryk
84d5a89c84 MDL-48026 usermenu: convert menu nowrap from CSS to method 2014-11-03 13:44:58 +13:00
Sam Hemelryk
a2a9468f01 MDL-48026 output: action_menu no wrap improvement 
Action menu output component has a new method set_nowrap_on_items
that sets a property to toggle nowrap on menu items.
That can be used to avoid problems when the menu appears within
an absolutely positioned or floated element.
 2014-11-03 13:34:02 +13:00
Eloy Lafuente (stronk7)
bacbb4e279 MDL-47874 dml: add support for replace_all_text to oracle 
And, at the same time, fix the implementation so all databases
will be using sql_substr() instead of harcoded "SUBSTRING".
 2014-11-02 18:26:18 +01:00
Rajesh Taneja
54957bdbf7 MDL-45204 phpunit: Fixed test_localcachedir test 
make_localcache_directory is the first call to make
localcache, which is already created by reset. So deleting
existing localcache directory will pass this test
 2014-10-31 16:07:47 +08:00
David Monllao
f5d3d0f498 MDL-47864 grade_report: Edulevels according to default user permissions 2014-10-31 14:01:30 +08:00
Petr Skoda
3c98b7a5ad MDL-47966 Add default content type and encoding 2014-10-30 11:38:07 +13:00
Dan Poltawski
4f82670250 Merge branch 'wip_MDL-40949_m28_pathsettings' of https://github.com/skodak/moodle 2014-10-29 13:04:46 +00:00
Dan Poltawski
0af29b0383 Merge branch 'MDL-47368' of git://github.com/timhunt/moodle 2014-10-29 11:18:15 +00:00
Julien Boulen
9b45b74e8f MDL-47584 database SQL: add debug info on connection error notices 2014-10-29 16:59:56 +08:00
Damyon Wiese
60c1108c30 Merge branch 'wip-MDL-47647-master' of git://github.com/abgreeve/moodle 2014-10-29 16:18:03 +08:00
Damyon Wiese
7154f954c7 Merge branch 'MDL-47755_master' of https://github.com/totara/openbadges 2014-10-29 15:31:58 +08:00
Marina Glancy
941de29601 MDL-45538 files: restore missing records in draft areas 2014-10-29 15:26:54 +08:00
Petr Skoda
5aaac8b2d6 MDL-40949 admin: Fix $CFG->preventexecpath hints 
This setting restricts all local paths, not just
executables.
 2014-10-29 10:45:44 +13:00
Dan Poltawski
31d6d2ae41 Merge branch 'MDL-47703-master' of git://github.com/FMCorz/moodle 2014-10-28 11:40:27 +00:00
Tim Hunt
08ab7a3c10 MDL-47368 core JS: dragdrop click move fills the dom with divs 
Every time you click the move icon, it builds a new dialogue with a list
of drop targets, but it never discards the old ones. Not only does this
fill the DOM with junk, but it also causes Behat tests to fail, since
the old dialogues come first, and are hidden, but contain links with the
same text that you are trying to click.
 2014-10-28 11:32:44 +00:00
David Balch
7b2eff2886 MDL-36874 mod_book: Add uarrow() output renderer. 
In preparation for Book navigation improvements in MDL-36874, this commit
adds a uarrow() output renderer, to complement rarrow() and larrow().
 2014-10-28 09:29:28 +00:00
Damyon Wiese
5baf74a327 Merge branch 'MDL-47559-master' of git://github.com/jethac/moodle 2014-10-28 09:59:04 +08:00
Jetha Chan
b865a3e2d1 MDL-47559 user_menu: customusermenu setting 2014-10-27 20:04:45 +08:00
Adrian Greeve
afc3431413 MDL-47647 lib: Fix message unit test failure. 
Messaging unit tests on Windows were failing because
of a comparison between two file paths. Part of the
path would have a forward slash instead of a backslash
and so would fail.
 2014-10-27 16:35:06 +08:00
Dan Poltawski
a1ac634692 Merge branch 'MDL-47734-master-fixes' of git://github.com/andrewnicols/moodle 2014-10-27 07:40:06 +00:00
Damyon Wiese
837862579e Merge branch 'm28_MDL-47210_IIS_PATH_INFO_Ignored_In_Required_Login_Pluginfile_Redirect' of https://github.com/scara/moodle 2014-10-27 13:58:15 +08:00
Dave Cooper
d7f9acc46a MDL-47833 core: Change default expiry for message inbound handlers 2014-10-27 11:53:33 +08:00
Frederic Massart
8b5c454562 MDL-47703 core_grades: Prevent use of weights with non-aggregated scales 2014-10-27 11:23:54 +08:00
Andrew Nicols
2af57bdbc5 MDL-47734 core: Do not set scrolltop on fixed dialogues 
Fixed position dialogues use a different xy positioning than standard
dialogues so cannot use the scrollTop positioning method.
 2014-10-27 11:22:30 +08:00
Damyon Wiese
2b97417296 Merge branch 'wip-MDL-30358-master' of git://github.com/marinaglancy/moodle 2014-10-27 10:30:44 +08:00
Matteo Scaramuccia
ce1cc198bb MDL-47210 Files API: IIS, PATH_INFO ignored in required login redirect. 2014-10-26 08:03:27 +01:00
Dan Poltawski
8d1c5eceb3 Merge branch 'MDL-47545-master' of git://github.com/jleyva/moodle 2014-10-24 16:40:06 +01:00
Juan Leyva
3ca3d259e5 MDL-47545 web services: Allow cross origin requests for file downloads 2014-10-24 17:10:44 +02:00
Dan Poltawski
22ef599c5d Merge branch 'MDL-47780_master' of https://github.com/markn86/moodle 2014-10-24 15:19:48 +01:00
Dan Poltawski
d6eff32be0 Merge branch '46518-28' of git://github.com/samhemelryk/moodle 2014-10-24 15:16:55 +01:00
Dan Poltawski
0b03353433 Merge branch 'MDL-47804' of git://github.com/aolley/moodle 2014-10-24 15:14:53 +01:00
Frederic Massart
aad194b19a MDL-47397 editor_atto: Properly close confirm dialogue in Behat test 2014-10-24 15:09:06 +01:00
Dan Poltawski
7dc62ed3cb Merge branch 'wip-MDL-47676-master' of git://github.com/abgreeve/moodle 2014-10-24 14:30:44 +01:00
Dan Poltawski
1429a25cd8 Merge branch 'MDL-47734-master' of git://github.com/andrewnicols/moodle 2014-10-24 14:13:59 +01:00
Damyon Wiese
0b9635cba4 Merge branch '46499-28' of git://github.com/samhemelryk/moodle 2014-10-24 11:48:24 +02:00
Dan Poltawski
ad968a36d6 Merge branch 'MDL-47847-master' of git://github.com/jleyva/moodle 2014-10-24 11:48:17 +02:00
Juan Leyva
938728739b MDL-47847 Web Services: Add messaging functions to the mobile service 2014-10-24 11:48:17 +02:00
Dan Poltawski
0ca7a4b75b Merge branch '47752-28' of git://github.com/samhemelryk/moodle 2014-10-24 11:48:16 +02:00
Dan Poltawski
276af2a44d Merge branch 'MDL-47513-master' of git://github.com/andrewnicols/moodle 2014-10-24 11:48:15 +02:00
Dan Poltawski
f335c9a1f1 Merge branch 'MDL-47637-master' of git://github.com/FMCorz/moodle 2014-10-24 11:48:15 +02:00
Dan Poltawski
4ade5b11b2 Merge branch 'MDL-47814-master' of git://github.com/FMCorz/moodle 2014-10-24 11:48:14 +02:00
Frederic Massart
3e5a4c9047 MDL-47814 core_grades: Improved coverage of user_graded event tests 
The tests needed to use the API in order to trigger the user_graded
event that occurs when the course final grade has changed.
 2014-10-24 11:48:14 +02:00
Dan Poltawski
1153177851 Merge branch 'MDL-47499-master' of git://github.com/damyon/moodle 2014-10-24 11:48:11 +02:00
Marina Glancy
c3b545a92a Merge branch 'wip-MDL-47675-master' of git://github.com/abgreeve/moodle 2014-10-24 11:48:09 +02:00
Marina Glancy
3824556c9a Merge branch 'MDL-47704-master' of git://github.com/damyon/moodle 2014-10-24 11:48:06 +02:00
Damyon Wiese
edffadfd1c MDL-47763 Grades: Handle the case when a grade category is hidden. 
This was breaking the contribution column, which needs to know the
weights of all the categories up the tree, whether they are visible or
not.
 2014-10-24 11:48:05 +02:00
Adam Olley
4ac478a3ed MDL-47804 events: calendar_event_updated needs to accept a timestart == 0 2014-10-24 15:34:30 +10:30