65806 Commits

Author SHA1 Message Date
Sam Hemelryk
f9fb9826be NOBUG: rebuilt shifted files 2013-12-10 09:18:16 +13:00
Sam Hemelryk
8f2bd073aa Merge branch 'MDL-43253-master' of git://github.com/andrewnicols/moodle 2013-12-10 09:09:06 +13:00
Sam Hemelryk
c8d6ee9870 Merge branch 'MDL-43212-master' of git://github.com/andrewnicols/moodle 2013-12-10 09:07:11 +13:00
Sam Hemelryk
437fd401f9 Merge branch 'MDL-43232-master' of git://github.com/andrewnicols/moodle 2013-12-10 09:06:54 +13:00
Sam Hemelryk
b78f0294bb Merge branch 'MDL-43194-master' of git://github.com/andrewnicols/moodle 2013-12-10 08:48:33 +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
Eloy Lafuente (stronk7)
d073a5f118 Merge branch 'MDL-40003-master' of git://github.com/FMCorz/moodle 2013-12-09 16:24:26 +01:00
sam marshall
4c31243fc7 MDL-43252 Group menu in wrong order when groupings used 2013-12-09 13:02:12 +00:00
Sam Chaffee
262075ce02 MDL-40003 mod_assign: Fixed submission comments not being restored 2013-12-09 11:01:34 +01: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
Marina Glancy
40d5757441 Merge branch 'MDL-43092_master' of git://github.com/lazydaisy/moodle 2013-12-09 17:50:27 +11:00
Marina Glancy
98a89047fb Merge branch 'w50_MDL-43137_m27_openbasedir' of https://github.com/skodak/moodle 2013-12-09 16:15:21 +11:00
Damyon Wiese
4fe9950ba6 MDL-43025 EditPDF: Increase memory limit when reading source pdfs. 2013-12-09 12:58:40 +08: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
Damyon Wiese
1f738c8c0c MDL-43074 assignfeedback_editpdf: Use escapeshellarg for all args in exec command.
This is to fix a reported problem with windows compatibility (e.g. when ghostscript is installed in
a folder with spaces in the name).
2013-12-09 10:52:35 +08:00
Damyon Wiese
9a046c0683 MDL-40096 assign: Prevent js error because uniqid() is not unique.
Use html_writer::random_id instead because it incorporates a static counter.
2013-12-09 10:25:15 +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
Marina Glancy
9f973b7bae Merge branch 'master_MDL-43192' of https://github.com/danmarsden/moodle 2013-12-09 11:28:03 +11:00
Marina Glancy
3f189b5d49 Merge branch 'wip-MDL-40213_master' of git://github.com/gjb2048/moodle 2013-12-09 11:13:16 +11: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
6531d5a8ec MDL-43253 JavaScript: Migrate moodle-backup-backupselectall to use Shifter 2013-12-07 23:44:12 +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
0dd7c711c5 MDL-41292 cache: only update identifiers if they change 2013-12-07 11:34:40 +11: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
Dan Poltawski
4ea3286758 MDL-37380 mod_data: remove unused JS functions 2013-12-06 16:27:41 +08: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
David Monllao
d1e55a47be MDL-42625 behat: Step definitions + related changes in features
In general aiming for compatibility with multiple browsers,
firefox, chrome and phantomjs to be more specific.

* Removing hardcoded waits
* Adding @_alert, @_switch_window and @_switch_frame tags,
  to label actions that different drivers have problems with.
* Adding missing @_files_upload and @_only_local tags to features that
  uploads files.
* Fixing a few wait for page ready what specified miliseconds.
* New methods to ensure elements (usual selectors), sections and editors
  are ready to interact with
* Changing the select an option implementation to deal with the different
  drivers implementations when listening to JS events.
2013-12-06 13:10:24 +08:00
Pavel Sokolov
a66555328b MDL-43199 assign: fix js error when expanding comments for non editing teachers in assign grading table 2013-12-06 12:57:20 +08:00
David Monllao
333db2e9b9 MDL-42625 behat: Editing .feature files 2013-12-06 12:13:39 +08:00
Andrew Nicols
a42791cb90 MDL-41030 JavaScript: Convert remaining YUI2 IO calls to YUI3 2013-12-06 12:13:39 +08:00
Damyon Wiese
6e2c417c1f MDL-41030 Behat: Add support for waiting for javascript
This is so that phantomjs (which runs faster than selenium) can pass the tests.
2013-12-06 12:13:39 +08:00
David Monllao
5d2b67228c MDL-41030 behat: Dock blocks compatible with both selenium and phantomjs 2013-12-06 12:13:39 +08:00
Rajesh Taneja
53b93a6b30 MDL-43224 navigation: Load local plugin navigation in site admin via ajax
Local plugin can add navigation nodes to site admin and while loading
site admin via ajax this should be considered.
2013-12-06 10:17:19 +08:00
Petr Škoda
af549df9df MDL-31410 always send 200 in PayPal IPN response and hide all errors 2013-12-06 10:01:49 +08:00
Petr Škoda
6c3ae510f1 MDL-31625 fix multiple global search-replace issues
Includes following fixes:
* support for MS SQL Server
* optional trimming of of oversized VARCHAR fields
* conversion to forms library
* full localisation
* other cleanup
2013-12-06 09:51:49 +08:00