1614 Commits

Author SHA1 Message Date
Helen Foster
fcca760ae7 MDL-44425 Merge English strings from the en_fix language pack 2014-03-05 13:29:32 +01:00
Frederic Massart
eaafde6ec0 MDL-44345 repository_youtube: Endless loop when reaching last results 2014-03-05 16:58:13 +08:00
Damyon Wiese
267c4b4292 Merge branch 'MDL-43738_master' of git://github.com/dmonllao/moodle 2014-03-04 13:29:03 +08:00
Frederic Massart
f4f0aa27d4 MDL-29409 repository_alfresco: Drop support for URL/link
The current solution has two major issues. Firstly, it is using the
session key in the file URL, allowing anyone with the link to steal
the identify of the poster. Secondly, the links are not presistent
and become broken as soon as the server is restarted. Let's not
support this any more until a proper solution is found in MDL-26454.
2014-03-04 11:34:51 +08:00
David Monllao
f083d6145e MDL-43738 behat: Updating features files
The following used steps were replaced by the ones
added in this issue:
- I fill the moodle form with
- I fill in with
- I select from
- I select radio button
- I check
- I uncheck
- the field should match

Also removing test for deprecated steps:
- the ASD checkbox should be checked
- the ASD checkbox should not be checked
2014-02-27 18:22:05 +08:00
Jason Fowler
88d366e595 MDL-38903 File picker: making upload form with more semantic HTML 2014-02-25 07:51:53 +08:00
Sam Hemelryk
527dd78d36 Merge branch 'wip-MDL-33920-master' of git://github.com/marinaglancy/moodle 2014-02-04 10:47:00 +13:00
Marina Glancy
1b066c06c6 Merge branch 'MDL-43440-master' of git://github.com/mr-russ/moodle 2014-02-03 13:42:23 +08:00
Marina Glancy
4e3663365b MDL-33920 filepicker: hide 'save as' field when not applicable 2014-01-31 16:56:13 +08:00
Andrew Nicols
8cf30a371a MDL-42928 Filepicker: Disable behat tests run by phantom
There seems to be a bug relating to overflow: hidden on the body tag in
some cases which is only showing for dialogues which belong to the
filepicker.

Disabling these for the moment as this issue may be related to MDL-43712
which is a work in progress.
2014-01-30 17:13:32 +08:00
Michael Aherne
780cf0a728 MDL-43440 unit tests Use correct cm identifier in unit tests 2014-01-25 08:56:43 +11:00
David Monllao
561e9bb92e MDL-43480 behat: Switching @_only_local and @_alerts to @_file_upload and @_alert 2014-01-17 10:41:37 +08:00
David Monllao
abe572e3f2 MDL-43642 behat: Setting the correct files @package 2014-01-10 17:50:50 +08:00
Sam Hemelryk
0e7367a57e MDL-34182 js: fixed typo in ajaxException use 2013-12-23 09:54:57 +13:00
Sam Hemelryk
5c7e16db54 Merge branch 'MDL-34182-master' of git://github.com/andrewnicols/moodle 2013-12-23 09:54:44 +13:00
Eloy Lafuente (stronk7)
438e799f42 Merge branch 'wip-mdl-43311' of https://github.com/rajeshtaneja/moodle 2013-12-17 22:33:51 +01:00
Andrew Nicols
5329506f22 MDL-34182 Repositories: Check for and warn on invalid output in the file picker 2013-12-13 14:10:05 +08:00
David Monllao
c5a1015338 MDL-42625 behat: Fixing ExpectationException::__construct() call
Also adding an extra checking to the selector to
ensure it is no updating the list of files.
2013-12-11 17:02:46 +08:00
Eloy Lafuente (stronk7)
ebc77165a4 Merge branch 'MDL-42625_master' of git://github.com/dmonllao/moodle 2013-12-10 23:29:06 +01: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
Rajesh Taneja
c3df05a9f9 MDL-43311 Repository: Added missing global CFG 2013-12-10 16:50:10 +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
Marina Glancy
9f973b7bae Merge branch 'master_MDL-43192' of https://github.com/danmarsden/moodle 2013-12-09 11:28:03 +11: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
Marina Glancy
cde67a8377 MDL-42174 behat: change word filepicker to filemanager in step definitions 2013-12-05 21:00:26 +11:00
Marina Glancy
07622451a3 MDL-42174 behat: deprecate upload file to filepicker step in favour of filemanager 2013-12-05 21:00:25 +11:00
Marina Glancy
fcb6ed4776 MDL-42174 More behat tests for filepicker 2013-12-05 21:00:20 +11:00
Dan Marsden
8164a2b549 MDL-43192 Repository: param doesn't exist - should use function 2013-12-04 20:54:57 +13:00
Sam Hemelryk
4f13423663 Merge branch 'wip-mdl-40079' of git://github.com/rajeshtaneja/moodle 2013-12-04 09:49:29 +13:00
Rajesh Taneja
e6e5f43efc MDL-40079 repositories: Added deprecated tags 2013-12-03 13:34:33 +08:00
Rajesh Taneja
7f9a4b35c3 MDL-40079 repositories: Replaced const with configs for boxnet 2013-12-03 13:24:10 +08:00
Sam Hemelryk
a59a423926 Merge branch 'MDL-42084-master' of git://github.com/sammarshallou/moodle 2013-12-03 11:12:34 +13:00
Rajesh Taneja
c1b3ac4358 MDL-40079 repositories: Replaced const with configs 2013-12-02 09:41:41 +08:00
Damyon Wiese
47578dbff4 MDL-42930 Add 2.6.0 upgrade line 2013-11-18 11:47:17 +08:00
Eloy Lafuente (stronk7)
201877b5d0 Merge branch 'MDL-42573-master' of git://github.com/danpoltawski/moodle 2013-11-12 03:27:22 +01:00
Dan Poltawski
7925c3b45c MDL-42666 repository_boxnet: fix broken version
The last commit here looked like Fred had broken the version,
but it was my mistake. I owe Fred a beer at the next available
opportunity.
2013-11-08 11:02:35 +08:00
Frederic Massart
ab1658fb17 MDL-42666 repository_boxnet: Do not run the upgrade multiple times 2013-11-07 15:53:59 +08:00
Frederic Massart
7cb353ff69 MDL-42666 tests: Setting new Box.net mandatory arguments 2013-11-07 13:54:47 +08:00
Dan Poltawski
f6a2a36bcd Merge branch 'MDL-42666-master' of git://github.com/FMCorz/moodle 2013-11-07 11:44:01 +08:00
Frederic Massart
f591c247ca MDL-42666 repository_boxnet: Improved output during migration 2013-11-07 10:58:40 +08:00
Frederic Massart
102a241998 MDL-42666 repository_boxnet: Fix undefined variable usage 2013-11-07 10:54:48 +08:00
Frederic Massart
d7274bfead MDL-42666 repository_boxnet: Convert all the references asap
This has been done in case the script fails during the processing
and needs to be re-run. Now all the references are converted as soon
as we can, where as before they could have ended up being re-downloaded.
2013-11-07 10:54:47 +08:00
Frederic Massart
ab227cc6a9 MDL-42666 repository_boxnet: Warn on HTTPS requirement when non HTTPS 2013-11-07 10:54:47 +08:00
Frederic Massart
090976b966 MDL-42666 repository_boxnet: Alert the admins of the migration process 2013-11-07 10:54:38 +08:00
Dan Poltawski
02c6bd358f Merge branch 'MDL-42728-en_fix' of git://github.com/mudrd8mz/moodle
Conflicts:
	lang/en/moodle.php
2013-11-07 09:34:31 +08:00
sam marshall
3ef7279f26 MDL-42084 Core: Change set_time_limit to core_php_time_limit::raise everywhere
Exceptions (places where set_time_limit is still left) are:

Third-party libraries:
  ADODB
  PHPMailer

Moodle core:
  PHPUnit - not relevant (CLI mode)
2013-11-06 16:40:01 +00:00
Damyon Wiese
ac3831b422 Merge branch 'MDL-41232-master' of git://github.com/mouneyrac/moodle 2013-11-06 11:59:41 +08:00
Frederic Massart
b2f9028559 MDL-42666 repository_boxnet: Remove hardcoded date for APIv1 end of life 2013-11-06 10:46:29 +08:00
Frederic Massart
091ac5969e MDL-42666 repository_boxnet: Disabling file references 2013-11-06 10:46:29 +08:00
Frederic Massart
05eaf64397 MDL-42666 repository_boxnet: Advise the user to run the migration tool 2013-11-06 10:46:29 +08:00