mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-09 18:30:03 +01:00
Code Issues Projects Releases Wiki Activity
65,914 Commits 36 Branches 523 Tags
Commit Graph

1400 Commits

Author SHA1 Message Date
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
Frederic Massart
cc4de9ea58 MDL-42666 repository_boxnet: Tool to launch the migration 2013-11-06 10:46:29 +08:00
Frederic Massart
4cdb94cce7 MDL-42666 repository_boxnet: Function to convert APIv1 references to true copies 2013-11-06 10:46:29 +08:00
Frederic Massart
2d5c7d5057 MDL-42666 repository_boxnet: Convert repository to APIv2 2013-11-06 10:45:52 +08:00
Helen Foster
5a25566060 MDL-42728 Merge English strings from the en_fix language pack 2013-11-05 23:41:44 +01:00
Eloy Lafuente (stronk7)
f39c82ebed MDL-42701 Bump all versions near 2.6 release 2013-11-05 02:36:00 +01:00
Frederic Massart
37b6c65dfe MDL-41807 repository_filesystem: Coding style clean up 2013-11-04 13:35:04 +08:00
Frederic Massart
5df695d221 MDL-41807 repository_filesystem: Prevent access to parent directories 2013-11-04 13:34:59 +08:00
Petr Škoda
0c431257e9 MDL-42387 standardise file lifetime handling 2013-11-01 10:42:18 +01:00
Jason Fowler
98719c48fa MDL-42236 Filepicker: fixing search box for repositories 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-11-01 08:55:27 +08:00
Jerome Mouneyrac
07d1a2f349 MDL-41232 revert IE8 fix for solving unspoken filemanager details on View List selection 2013-10-29 14:44:02 +08:00
Dan Poltawski
c4a8d8e4ca MDL-42573 skydrive: support non-js login scheme 
This is actually not especially useful because Microsoft don't currently
support non-JS login. But its possible they could make it work in
future. And at least the user gets an error from MS rather than blank
screen.
 2013-10-28 16:23:42 +08:00
Eloy Lafuente (stronk7)
20ddc0c9cf Merge branch 'MDL-42410-master' of git://github.com/danpoltawski/moodle 2013-10-24 23:35:24 +02:00
Dan Poltawski
93488d8bb0 Merge branch 'MDL-42293-master' of git://github.com/ankitagarwal/moodle 2013-10-24 10:27:23 +08:00