4754 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
45f6a8340b Merge branch 'm27_MDL-43508_Invalid_String_Identifier' of https://github.com/scara/moodle 2014-01-08 00:45:51 +01:00
Damyon Wiese
e011f229a8 Merge branch 'w01_MDL-43402_m27_zlib' of https://github.com/skodak/moodle 2014-01-07 12:29:45 +08:00
Sam Hemelryk
39bd07f732 MDL-43526 course: links to restore from management and admin structure. 2014-01-07 12:08:34 +08:00
Petr Škoda
3e5226ab6e MDL-43528 remove all traces of magic quotes hacking from moodle core 2014-01-02 10:15:06 +08:00
Matteo Scaramuccia
7a66ddb63b MDL-43508 Quiz Invalid get_string() identifier. 2013-12-28 11:12:29 +01:00
Petr Škoda
2803f3c1b5 MDL-43402 remove all zlib detection code
Zlib extension is now required.
2013-12-27 11:06:18 +08:00
Petr Skoda
9bb80d2005 MDL-43213 fix init regression and remove $checkphp parameter 2013-12-19 13:11:25 +08:00
Sam Hemelryk
adfcdcb027 Merge branch 'w51_MDL-43213_m27_simplebehat' of https://github.com/skodak/moodle 2013-12-18 10:30:30 +13:00
Petr Škoda
dbe0203ba8 MDL-42931 fix hardcoded PHP version tests for 2.7 2013-12-13 14:04:24 +08:00
Petr Škoda
d1a628e5fd MDL-42931 set new requirements for 2.7 2013-12-13 14:04:24 +08:00
Petr Škoda
60129d5d1f MDL-43213 try to simplify behat config and init code
1/ always require 3 behat settings - $CFG->behat_wwwroot, $CFG->behat_dataroot and $CFG->behat_prefix
2/ cleanup init code
3/ do not require $CFG->wwwroot and $CFG->dataroot on test sites
4/ remove switch completely - the most confusing part for me
5/ print out behat_wwwwroot in init script so that you can test the test site manually
2013-12-13 14:03:04 +08:00
David Monllao
fb99ef1ded MDL-42625 behat: Fixing failures
* Expanding fieldsets before setting the course format
* Ensure editors are loaded moved to expand_all_fieldsets
* Return true rather than false when JS is disabled and
  non-allowed steps should continue without throwing an
  exception.
* Submit create user form after editing it
2013-12-12 13:41:07 +08:00
Sam Hemelryk
e453c70d14 Merge branch 'MDL-42932_master' of https://github.com/markn86/moodle 2013-12-11 12:30:26 +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
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)
5cf182e39d Merge branch 'wip-MDL-42174-master' of git://github.com/marinaglancy/moodle 2013-12-10 22:06:39 +01:00
Marina Glancy
3649bcfa21 Merge branch 'MDL-43215_master' of https://github.com/markn86/moodle 2013-12-10 14:25:24 +11:00
Mark Nelson
8bf0f20795 MDL-42932 core_calendar: introduced calendar type system setting 2013-12-09 18:40:46 -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
David Monllao
333db2e9b9 MDL-42625 behat: Editing .feature files 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
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
Petr Škoda
fc28111316 MDL-42973 fix multiple addon update issues 2013-12-06 09:36:38 +08: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
Mark Nelson
626aec1e74 MDL-43215 core_webservice: retrieve all user name fields when adding a token 2013-12-04 20:56:25 -08:00
David Monllao
a9c32ee29e MDL-41592 behat: Setting a default value for CFG->behat_wwwroot in case it is empty 2013-12-05 17:06:02 +13:00
Sam Hemelryk
5d288a5dbb Merge branch 'MDL-41592_master' of https://github.com/dmonllao/moodle 2013-12-04 11:52:12 +13:00
Eloy Lafuente (stronk7)
2574b28b81 Merge branch 'w49_MDL-43117_m27_releaseinfo' of https://github.com/skodak/moodle 2013-12-03 23:45:54 +01:00
Eloy Lafuente (stronk7)
200fcba737 Merge branch 'MDL-43142_master' of https://github.com/markn86/moodle 2013-12-03 23:40:19 +01:00
Eloy Lafuente (stronk7)
e3febb2315 Merge branch 'MDL-43140_master' of https://github.com/markn86/moodle 2013-12-03 23:24:22 +01:00
Sam Hemelryk
4f13423663 Merge branch 'wip-mdl-40079' of git://github.com/rajeshtaneja/moodle 2013-12-04 09:49:29 +13:00
Damyon Wiese
a977fa7b36 Merge branch 'wip-MDL-42731-master' of git://github.com/marinaglancy/moodle 2013-12-03 17:29:39 +08:00
Eloy Lafuente (stronk7)
e7b3306a69 Merge branch 'MDL-42885_master' of https://github.com/markn86/moodle 2013-12-03 10:01:19 +01:00
Damyon Wiese
a5ec4f7ae9 Merge branch 'wip-MDL-43026-master' of git://github.com/marinaglancy/moodle 2013-12-03 16:11:48 +08:00
Dan Poltawski
6ca388028e Revert "MDL-42932 core_calendar: introduced calendar type system setting"
This reverts commit bb32a499e10abc3bb88e715fb0575e5b7fb66e8e.
2013-12-03 14:57:10 +08:00
Dan Poltawski
753eb47edc Merge branch 'wip-mdl-43028' of https://github.com/rajeshtaneja/moodle 2013-12-03 13:45:59 +08:00
Dan Poltawski
8d8e6f9607 Merge branch 'MDL-42932_master' of https://github.com/markn86/moodle 2013-12-03 10:07: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
Marina Glancy
6dfd8325f0 MDL-42731 behat: load 'Site administration' when expanding node in non-javascript mode 2013-12-02 17:44:32 +11:00
David Monllao
677b2e79f1 MDL-41592 general: Also checking the site path 2013-12-02 14:18:10 +08:00
David Monllao
7f7a91e4ce MDL-41592 behat: Config settings more flexible
Adding the option to just set ->behat_wwwroot to
allow switching to the behat test site.
2013-12-02 14:18:10 +08:00
Rajesh Taneja
c1b3ac4358 MDL-40079 repositories: Replaced const with configs 2013-12-02 09:41:41 +08:00
Petr Škoda
2f98f5d541 MDL-43117 Add release column to Plugins Overview page
This patch is based on previous patch by Marko Vidberg, thanks a lot!
2013-12-01 18:57:49 +08:00
Mark Nelson
67bfaaf0dd MDL-43140 mnet: display header after redirects to avoid warning 2013-11-29 14:25:45 -08:00
Mark Nelson
f9b4143a8e MDL-43142 mnet: fixed typo in variable passed to get_string 2013-11-29 14:15:07 -08:00
Marina Glancy
dd47f2107f MDL-43026 behat: add tests for all available module generators 2013-11-29 17:24:12 +11:00
Mark Nelson
275d958e62 MDL-42885 tool_uploaduser: removed misleading debugging message 2013-11-26 21:26:03 -08:00
Dan Poltawski
ab47c758d1 MDL-42942 behat: increment version 2013-11-27 11:33:11 +08:00
Damyon Wiese
e359857e41 Merge branch 'wip-MDL-43008-master' of git://github.com/abgreeve/moodle 2013-11-26 16:56:20 +08:00
Adrian Greeve
b404b1f41c MDL-43008 calendar: Allow calendar plugins to display setting pages. 2013-11-26 15:44:57 +08:00