267d4927b4
Merge branch 'MDL-43173_master' of git://github.com/dmonllao/moodle
2014-01-08 08:21:06 +08:00
b8a8f3dd01
Merge branch 'MDL-42607_rss' of https://github.com/andyjdavis/moodle
2014-01-08 00:39:15 +01:00
78b31176cb
Merge branch 'w01_MDL-43515_m27_phpunitdocs' of https://github.com/skodak/moodle
2014-01-08 00:13:28 +01:00
7ad46ac29d
Merge branch 'w01_MDL-43503_m27_pagedldap' of https://github.com/skodak/moodle
2014-01-07 23:40:51 +01:00
b3b1b18a4f
Merge branch 'MDL-43451-master' of git://github.com/andrewnicols/moodle
2014-01-07 23:32:38 +01:00
7d374cdf4a
Merge branch 'w01_MDL-43510_m27_test404' of https://github.com/skodak/moodle
2014-01-07 17:28:15 +08:00
8af52d3188
Merge branch 'MDL-34356-master' of git://github.com/andrewnicols/moodle
2014-01-07 16:57:49 +08:00
25294dd466
MDL-43481 lib: minor cleanups to commands
...
And remove unused strings - thanks to Simon Coggins!
2014-01-07 15:48:06 +08:00
6d0796942b
Merge branch 'w01_MDL-43481_m27_passwords' of https://github.com/skodak/moodle
2014-01-07 15:46:59 +08:00
899ca7632f
Merge branch 'MDL-43489-master' of git://github.com/andrewnicols/moodle
2014-01-07 13:48:49 +08:00
4e5fb5bec1
Merge branch 'm27_MDL-40379_Prevent_Some_Mobile_Network_Providers_From_Modifying_Content' of https://github.com/scara/moodle
2014-01-07 12:42:33 +08:00
e011f229a8
Merge branch 'w01_MDL-43402_m27_zlib' of https://github.com/skodak/moodle
2014-01-07 12:29:45 +08:00
3a145daba4
Merge branch 'MDL-43490-master' of git://github.com/andrewnicols/moodle
2014-01-07 12:26:01 +08:00
de47c9c81b
Merge branch 'wip-mdl-43293' of https://github.com/rajeshtaneja/moodle
2014-01-07 12:22:49 +08:00
c68fbad68a
MDL-43526 category: added restore course link to admin structure
2014-01-07 12:08:34 +08:00
39bd07f732
MDL-43526 course: links to restore from management and admin structure.
2014-01-07 12:08:34 +08:00
812cc702ad
Merge branch 'MDL-42995-master-3rd' of git://github.com/FMCorz/moodle
2014-01-07 11:51:15 +08:00
a6b4b3350f
Merge branch 'MDL-43394a' of https://github.com/srynot4sale/moodle
2014-01-07 10:59:40 +08:00
62bfe6202e
Merge branch 'MDL-43323-master' of git://github.com/andrewnicols/moodle
2014-01-07 10:34:40 +08:00
686e3b3ae0
MDL-39661 blocks: More verbose move-block-here descriptions
2014-01-06 12:51:44 +01:00
0a8b3583ca
MDL-42995 libraries: Global function to strip pluginfile content
2014-01-06 09:29:25 +01:00
5490662ade
Merge branch 'MDL-41690-master' of git://github.com/danpoltawski/moodle
...
Conflicts:
course/dnduploadlib.php
2014-01-06 15:48:31 +08:00
9f83e42fe3
Merge branch 'w01_MDL-36721_m27_passlog' of https://github.com/skodak/moodle
2014-01-06 14:52:56 +08:00
73ee2fda6b
MDL-41690 course: remove use of deprecated functions
2014-01-06 10:45:59 +08:00
07e78d935f
MDL-41690 cm_info: deprecate various properties
2014-01-06 10:45:59 +08:00
7c445ab8c0
Merge branch 'w01_MDL-43527_m27_safemode' of https://github.com/skodak/moodle
2014-01-06 14:46:31 +13:00
8e06909afd
Merge branch 'w01_MDL-43528_m27_magic' of https://github.com/skodak/moodle
2014-01-06 14:19:11 +13:00
98f0074fc5
Merge branch 'MDL-31050_rss' of https://github.com/andyjdavis/moodle
2014-01-06 14:16:26 +13:00
61a79e01fc
Merge branch 'MDL-40551_master' of https://github.com/totara/openbadges
...
Conflicts:
badges/upgrade.txt
2014-01-06 12:00:11 +13:00
a9bd004c8c
Merge branch 'MDL-35973_redirect' of https://github.com/andyjdavis/moodle
2014-01-06 11:28:34 +13:00
9b94e327d3
Merge branch 'MDL-43281-master' of git://github.com/andrewnicols/moodle
2014-01-06 11:22:29 +13:00
dfed81ae12
Merge branch 'MDL-36334-master' of git://github.com/andrewnicols/moodle
2014-01-06 09:53:15 +13:00
7404bfd003
Merge branch 'w01_MDL-43196_m27_signupfiles' of https://github.com/skodak/moodle
2014-01-06 09:11:32 +13:00
184afb6b73
MDL-43238 events: Added event other information in event php doc block
2014-01-03 15:03:48 +08:00
afe9f42adb
MDL-43173 behat: Thowing an exception if the JS is not ready
2014-01-03 11:27:54 +08:00
6c90c5cae2
MDL-31050 rss: removed some unused function parameters and removed some low value comments
2014-01-02 10:35:14 +08:00
3e5226ab6e
MDL-43528 remove all traces of magic quotes hacking from moodle core
2014-01-02 10:15:06 +08:00
90627d9d59
MDL-43527 eliminate last references to safe_mode
...
Safe mode is not availabel in PHP 5.4 any more...
2014-01-02 09:23:15 +08:00
deae60239d
MDL-43503 do not check presence of ldap paging functions, we require PHP 5.4 now
2013-12-31 14:34:20 +08:00
fd2dcaa603
MDL-43451 Cron: Retrieve additional name fields when creating passwords
2013-12-31 13:45:14 +08:00
8f6e47d9c7
MDL-42607 mod_forum:fixed some inefficiencies in forum RSS generation
2013-12-31 12:28:09 +08:00
9edca1ae42
MDL-36334 Libraries: Add version gallery-2013.10.02-20-26 of specified gallery modules
...
We currently only include:
* gallery-sm-treeview*
2013-12-30 19:19:26 +08:00
5b49f8b3a8
MDL-36334 JavaScript: Enable access to the gallery
2013-12-30 19:19:26 +08:00
e3288953e7
MDL-35973 lib: added a page title to redirect() and added 2 seconds to the page redirection when posting in a forum
2013-12-30 18:26:24 +08:00
83e9f0ad71
MDL-40119 Forms: Date selector should use images for the calendar popup toggle
...
The calendar popup toggle must use an image, rather than an input with type
of image as the latter is actually a form of submit button, and hence it
steals the focus away from the real submit button.
2013-12-30 15:53:42 +08:00
32a829e85c
MDL-43515 update phpunit info page
2013-12-30 15:07:27 +08:00
1cce5dfb9a
MDL-43281 Blocks: Retrieve a newly created block after creating it
...
Although we were previously creating the DOM markup for a block region if
it did not exist, we were not making use of it.
This change ensures that we make use of that block region as part of the
blocks code.
2013-12-30 14:15:32 +08:00
676bad62f4
MDL-43262 JavaScript: Correct use of centered attribute override
...
This should be done using an attribute modification, rather than at the
constructor level.
2013-12-29 15:38:11 +08:00
713577985c
MDL-43262 JavaScript: Correct visible attribute override
...
This should be done using an attribute modification, rather than at the
constructor level.
2013-12-29 15:38:02 +08:00
d0cf26c328
MDL-43262 JavaScript: Correct width attribute override
...
This should be done using an attribute modification, rather than at the
constructor level.
2013-12-29 15:37:49 +08:00
Dan Poltawski