f5d810b4f3
Merge branch 'MDL-43461_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE
2014-01-15 09:38:46 +08:00
33d83d755a
Merge branch 'MDL-43642_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE
2014-01-14 15:48:52 +08:00
22a09b7d40
MDL-43461 behat: Using linux-style directory separators when using cygwin
2014-01-14 13:14:14 +08:00
52a027398e
MDL-43642 behat: Setting the correct files @package
2014-01-10 17:47:49 +08:00
02b5deb65a
Merge branch 'MDL-43590-en_fix_26' of git://github.com/mudrd8mz/moodle into MOODLE_26_STABLE
2014-01-10 10:10:27 +01:00
8772689453
MDL-43590 Merge English strings from the en_fix language pack
2014-01-09 01:11:59 +01:00
895e16ff28
Merge branch 'w01_MDL-42797_m26_admin' of https://github.com/skodak/moodle into MOODLE_26_STABLE
2014-01-08 02:10:36 +01:00
ddc72f06ef
MDL-42797 require real user login on upgrade settings page
2014-01-02 09:17:38 +08:00
9d904936c8
MDL-42797 require real user login on admin page
2014-01-01 15:19:34 +08:00
b33cc5d748
MDL-43508 Quiz Invalid get_string() identifier.
2013-12-28 11:21:36 +01:00
12c847fed9
Merge branch 'MDL-43235_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE
2013-12-18 11:19:26 +13:00
c56dbe9c28
MDL-43235 behat: Ensure that behat_config_manager::get_config_file_contents() has always a behat_wwwroot
2013-12-13 14:33:52 +08:00
2f7a48c0a9
MDL-42931 set new requirements for 2.7
2013-12-13 14:06:20 +08:00
fff8b97ebc
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.
2013-12-12 13:42:56 +08:00
3675c98506
Merge branch 'MDL-42625_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE
2013-12-10 23:31:51 +01:00
3ef86b3909
Merge branch 'w50_MDL-31625_m26_replace' of https://github.com/skodak/moodle into MOODLE_26_STABLE
2013-12-11 10:51:21 +13:00
8a630a771c
Merge branch 'wip-MDL-42174-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE
2013-12-10 22:13:17 +01:00
66a437aca8
Merge branch 'MDL-43215_m26' of https://github.com/markn86/moodle into MOODLE_26_STABLE
2013-12-10 14:26:14 +11:00
9f8ef4294a
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 15:53:55 +08:00
503c8dddcc
MDL-42625 behat: Editing .feature files
2013-12-06 15:53:50 +08:00
f5940bfb5f
MDL-41030 behat: Dock blocks compatible with both selenium and phantomjs
2013-12-06 15:53:38 +08:00
35c2c697ce
MDL-42174 behat: replace word filepicker with filemanager in file upload step
2013-12-06 17:31:58 +11:00
b4d2e7f267
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:52:47 +08:00
4bc526cc8a
MDL-42973 fix multiple addon update issues
2013-12-06 09:37:28 +08:00
b4d09c2db0
MDL-43215 core_webservice: retrieve all user name fields when adding a token
2013-12-04 20:57:24 -08:00
2fc28aa794
MDL-41592 behat: Setting a default value for CFG->behat_wwwroot in case it is empty
2013-12-05 17:06:18 +13:00
8e60097af8
Merge branch 'MDL-41592_26' of https://github.com/dmonllao/moodle into MOODLE_26_STABLE
2013-12-04 11:52:18 +13:00
786f04f485
Merge branch 'MDL-43142_m26' of https://github.com/markn86/moodle into MOODLE_26_STABLE
2013-12-03 23:41:24 +01:00
310cf52b37
Merge branch 'MDL-43140_m26' of https://github.com/markn86/moodle into MOODLE_26_STABLE
2013-12-03 23:25:33 +01:00
cb891e57f0
Merge branch 'wip-MDL-42731-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE
2013-12-03 17:29:57 +08:00
b470112643
Merge branch 'MDL-42885_m26' of https://github.com/markn86/moodle into MOODLE_26_STABLE
2013-12-03 10:01:43 +01:00
4d32c0c6d0
Merge branch 'wip-MDL-43026-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE
2013-12-03 16:12:08 +08:00
77325154af
Merge branch 'wip-mdl-43028-m26' of https://github.com/rajeshtaneja/moodle into MOODLE_26_STABLE
2013-12-03 13:46:26 +08:00
eb1931ccd1
MDL-41592 general: Also checking the site path
2013-12-02 14:19:25 +08:00
5f717f7aac
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:19:25 +08:00
f497fd1de8
MDL-43026 behat: add tests for all available module generators
2013-12-02 10:38:29 +11:00
fdc93e4092
MDL-42731 behat: load 'Site administration' when expanding node in non-javascript mode
2013-12-02 10:15:33 +11:00
5546df9078
MDL-43140 mnet: display header after redirects to avoid warning
2013-11-29 14:26:08 -08:00
d0e29366de
MDL-43142 mnet: fixed typo in variable passed to get_string
2013-11-29 14:15:24 -08:00
dcef51b614
MDL-42885 tool_uploaduser: removed misleading debugging message
2013-11-26 21:26:23 -08:00
66d40a5dae
MDL-42942 behat: increment version
2013-11-27 11:37:32 +08:00
1e9c117f50
Merge branch 'wip-MDL-43008-26' of git://github.com/abgreeve/moodle into MOODLE_26_STABLE
2013-11-26 16:59:04 +08:00
55b02e02e6
MDL-43008 calendar: Allow calendar plugins to display setting pages.
2013-11-26 15:50:31 +08:00
44e5ac93bc
Merge branch 'MDL-40741_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE
2013-11-26 14:57:15 +08:00
addedcb142
MDL-40741 behat: Changing xpaths for clean theme
...
Keeps compatibility with standard theme.
2013-11-26 13:00:24 +08:00
3b62f94787
MDL-43028 navigation: correct capability check
2013-11-25 13:29:11 +08:00
13d5afea34
MDL-43028 Navigation: Setting proper page properties on admin pages
2013-11-25 13:29:02 +08:00
d3ec6a9dcf
Merge branch 'MDL-42547_m26' of https://github.com/markn86/moodle into MOODLE_26_STABLE
2013-11-25 10:37:36 +08:00
2f874214ba
MDL-42547 tool_uploaduser: trim values before uploading users
2013-11-20 00:32:15 -08:00
c7232a325a
MDL-42850 administration: Updated bulk user upload errors to be more descriptive.
2013-11-19 14:20:32 +13:00
Damyon Wiese