Sam Hemelryk
1092f63a80
Merge branch 'MDL-38775-master' of git://github.com/andrewnicols/moodle
2013-12-11 12:25:16 +13:00
Sam Hemelryk
5cc0c2c41d
Merge branch 'MDL-38776-master' of git://github.com/andrewnicols/moodle
2013-12-11 12:25:14 +13:00
Eloy Lafuente (stronk7)
ebc77165a4
Merge branch 'MDL-42625_master' of git://github.com/dmonllao/moodle
2013-12-10 23:29:06 +01:00
Sam Hemelryk
df1498f711
Merge branch 'MDL-42796-master' of git://github.com/andrewnicols/moodle
2013-12-11 11:13:32 +13:00
Sam Hemelryk
87176b481e
Merge branch 'MDL-43252-master' of git://github.com/sammarshallou/moodle
2013-12-11 11:03:39 +13:00
Sam Hemelryk
3f35f367cb
Merge branch 'w50_MDL-31625_m27_replace' of https://github.com/skodak/moodle
2013-12-11 10:50:07 +13:00
Eloy Lafuente (stronk7)
7f34773665
Merge branch 'wip-MDL-43150-master' of git://github.com/marinaglancy/moodle
2013-12-10 22:47:15 +01:00
Sam Hemelryk
ebb9daa5e1
Merge branch 'MDL-42959-master' of git://github.com/andrewnicols/moodle
2013-12-11 10:34:17 +13:00
Sam Hemelryk
b6df1b3ab3
Merge branch 'MDL-40517-master' of git://github.com/danpoltawski/moodle
2013-12-11 10:32:06 +13:00
Eloy Lafuente (stronk7)
5cf182e39d
Merge branch 'wip-MDL-42174-master' of git://github.com/marinaglancy/moodle
2013-12-10 22:06:39 +01:00
Russell Smith
cc67c6db61
MDL-39725 database: Apply database statistics update to daily stats
2013-12-10 20:33:01 +11:00
Russell Smith
8343b340c4
MDL-39725 database: Include stats collections in unit tests
2013-12-10 20:32:56 +11:00
Russell Smith
814c9438a0
MDL-39725 database: Add statistics collection functions
2013-12-10 20:31:47 +11:00
Marina Glancy
e762d5a7f2
Merge branch 'm27_MDL-43082_IE9_Compat_View_SVG_Say_No' of https://github.com/scara/moodle
2013-12-10 14:47:08 +11:00
Marina Glancy
a98bdfa668
Merge branch 'MDL-37517-master' of git://github.com/danpoltawski/moodle
2013-12-10 14:29:22 +11:00
Jason Fowler
c476e67839
MDL-25473 mediaplayer - prevent embedded videos from looping
2013-12-10 10:49:44 +08:00
Andrew Nicols
aff365cc10
MDL-43243 JavaScript: Deprecate destroy_item
2013-12-10 09:55:34 +08:00
Andrew Nicols
0d8907e3d8
MDL-43243 JavaScript: Deprecate show_item
2013-12-10 09:55:34 +08:00
Andrew Nicols
f260850efc
MDL-43243 JavaScript: Deprecate addonload
2013-12-10 09:55:33 +08:00
Andrew Nicols
bc549847d9
MDL-43243 JavaScript: Deprecate getElementsByClassName
2013-12-10 09:55:33 +08:00
Andrew Nicols
e1b4553d8c
MDL-43243 JavaScript: Deprecate hide_item
2013-12-10 09:55:33 +08:00
Marina Glancy
907b98204b
MDL-43044 fix trailing whitespace
2013-12-10 11:52:42 +11:00
Marina Glancy
013620aad3
Merge branch 'MDL-43044-master' of git://github.com/ankitagarwal/moodle
2013-12-10 11:40:54 +11:00
Sam Hemelryk
fd0281dfc3
Merge branch 'MDL-43104-master' of git://github.com/andrewnicols/moodle
2013-12-10 10:27:45 +13:00
Sam Hemelryk
176521e560
Merge branch 'MDL-38774-master' of git://github.com/andrewnicols/moodle
2013-12-10 09:25:51 +13:00
Sam Hemelryk
830299fe4f
Merge branch 'm27_MDL-43159_Wrong_Naming_Convention_For_Variable' of https://github.com/scara/moodle
2013-12-10 09:21:10 +13:00
Sam Hemelryk
822f529014
Merge branch 'MDL-43152-master' of git://github.com/andrewnicols/moodle
2013-12-10 08:43:50 +13:00
Sam Hemelryk
e3f7ac09e7
Merge branch 'MDL-43087a' of https://github.com/srynot4sale/moodle
...
Conflicts:
config-dist.php
2013-12-10 08:36:39 +13:00
sam marshall
4c31243fc7
MDL-43252 Group menu in wrong order when groupings used
2013-12-09 13:02:12 +00:00
Marina Glancy
95971ae99e
Merge branch 'wip-MDL-43175-master' of git://github.com/abgreeve/moodle
2013-12-09 18:54:53 +11:00
Marina Glancy
895d3050e0
Merge branch 'wip-mdl-43224' of https://github.com/rajeshtaneja/moodle
2013-12-09 18:45:27 +11:00
Marina Glancy
645cd2fe77
Merge branch 'w50_MDL-42973_m27_addonupd' of https://github.com/skodak/moodle
2013-12-09 18:26:39 +11:00
Andrew Nicols
83cdecec1e
MDL-38774 JavaScript: Migrate moodle-core-dragdrop to Shifter
2013-12-09 11:27:44 +08:00
David Monllao
c1faf86bd1
MDL-42625 behat: Make behat pacient
...
* When looking for texts inside the page or inside
other containers we should wait until the elements
are visible.
* Same when expanding tree nodes.
* Normalizing loops to spin() function using
behat_base::TIMEOUT and behat_base::EXTENDED_TIMEOUT,
leaving TIMEOUT for DOM load processes and
EXTENDED_TIMEOUT for long processes that involves JS
too.
* Add page load waits between actions that involves
reloading the page.
2013-12-09 11:08:42 +08:00
Adrian Greeve
5bb7158d77
MDL-43175 events: Base event unit tests for JSON encoding / decoding comparison.
2013-12-09 09:21:37 +08:00
Adrian Greeve
49ff134227
MDL-43175 events: Changed JSON encoding decoding comparison to be less strict.
...
Debugging messages would be sent when other contained a float that is a whole number.
When encoding and decoding using JSON the number is changed to an integer and the
comparison fails.
2013-12-09 09:21:37 +08:00
Andrew Nicols
54d076a353
MDL-43104 JavaScript: Combine mcore JS into simplemoodle
...
I was wrong about why this didn't work before - this was caused by the
missing semi-colon.
Joining these scripts into a single combo-load has the benefit of further
reducing the number of HTTP transactions to load a page, and a minor
reduction on transferred size due to a reduced header count.
2013-12-09 09:05:16 +08:00
Andrew Nicols
cff3b8feed
MDL-43259 JavaScript: Deprecate M.core.dialogue's lightbox attribute
...
The lightbox attribute just sets the modal attribute of the upstream
dialogue and provides no real benefit. We should deprecate it in favour of
documented upstream attributes of Y.Panel.
2013-12-08 16:27:41 +08:00
Andrew Nicols
4246e5c7cc
MDL-43234 JavaScript: Clone dialogue configuration before initialising
...
Since we modify the config object when instantiating a new Dialogue, we
need to clone the configuration to prevent those changes from being
reflected back in the caller.
2013-12-07 09:04:45 +08:00
Russell Smith
9c7dfbe6ed
MDL-41359 database: no table columns is a dml_excpeiton
...
When insert_record is called and it doesn't find any columns
to insert data into, that is a dml_exception as you need at least
one column in the database to insert into it. This can happen
when you have created a zero column database table, or the table
does not exist.
2013-12-07 08:56:24 +11:00
Andrew Nicols
0a59cd5917
MDL-43240 JavaScript: Remove deprecated functions for 2.7
...
This patch removes functions which were deprecated in Moodle 2.4:
* M.util.init_select_autosubmit
* M.util.init_url_select
* M.util.help_icon
2013-12-06 16:26:14 +08:00
Andrew Nicols
11dd4dadb4
MDL-42796 ActionMenu: Add additional keyboard event handling
...
Add additional handling for up/down/escape key presses and consolidate them
with the existing tab/shift+tab handling.
2013-12-06 16:20:10 +08:00
Andrew Nicols
a4e1fefa39
MDL-42796 ActionMenu: Move event handlers to showMenu
2013-12-06 16:19:52 +08:00
Andrew Nicols
5f77a55984
MDL-42959 JavaScript: Backport fix from https://github.com/yui/yui3/pull/1465
2013-12-06 16:14:56 +08:00
Ankit Agarwal
1f2aeda91e
MDL-43044 events: Add unit tests
2013-12-06 16:08:03 +08:00
Ankit Agarwal
45faf15dfd
MDL-43044 events: Deprecate and remove code duplication from instances_list_viewed events
2013-12-06 15:59:49 +08:00
Ankit Agarwal
c4b0d6dca5
MDL-43044 events: Deprecate course_module_instances_list_viewed abstract class
2013-12-06 15:59:49 +08:00
Ankit Agarwal
bad8b60009
MDL-43044 events: Add a course_module_instance_list_viewed abstract class
2013-12-06 13:18:50 +08:00
Ankit Agarwal
b6c7ab22db
MDL-43044 events: Move component declartion to construct
2013-12-06 13:18:50 +08:00
Damyon Wiese
519449c528
MDL-42625 TinyMCE: Hook into API to track the progress of the init script
2013-12-06 13:10:24 +08:00