f5d810b4f3
Merge branch 'MDL-43461_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE
2014-01-15 09:38:46 +08:00
22a09b7d40
MDL-43461 behat: Using linux-style directory separators when using cygwin
2014-01-14 13:14:14 +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
b33cc5d748
MDL-43508 Quiz Invalid get_string() identifier.
2013-12-28 11:21:36 +01: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
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
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
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
b470112643
Merge branch 'MDL-42885_m26' of https://github.com/markn86/moodle into MOODLE_26_STABLE
2013-12-03 10:01:43 +01: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
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
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
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
ff8cadd271
MDL-41316 tool_spamcleaner: Fix sql queries
...
AS keyword is not allowed in sql qeries for table alias as Oracle doesn't support it
Thanks to Sara Cenni for suggesting the patch
2013-11-19 12:28:37 +13:00
a47b6805be
MDL-42863 make capabilities overview more fault-tolerant.
2013-11-19 12:03:55 +13:00
99b936835d
MDL-42865 Make XMLDB foreign key check more robust.
...
Otherwise, installing one bad add-on can completely break this report.
2013-11-19 11:51:06 +13:00
52454bedee
Merge branch 'MDL-42100_master' of https://github.com/markn86/moodle into MOODLE_26_STABLE
2013-11-18 16:08:31 +08:00
005e784e22
MDL-42930 Add 2.6.0 upgrade line
2013-11-18 11:41:59 +08:00
9a36c7d95c
Merge branch 'MDL-42447_master' of git://github.com/dmonllao/moodle
2013-11-15 02:11:27 +01:00
58a3a34e38
MDL-42447 performance: New var to add perf. info to redirections
2013-11-15 09:10:22 +08:00
e4af9616c3
Merge branch 'MDL-40728-master-2' of git://github.com/mouneyrac/moodle
2013-11-13 16:57:34 +08:00
c8a661098e
MDL-40728 courseupload: add missing help icons
2013-11-13 16:34:43 +08:00
8eb2ea83d2
MDL-42100 tool_capability: fixed incorrect links
2013-11-13 00:20:28 -08:00
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
5a25566060
MDL-42728 Merge English strings from the en_fix language pack
2013-11-05 23:41:44 +01:00
f39c82ebed
MDL-42701 Bump all versions near 2.6 release
2013-11-05 02:36:00 +01:00
db6767ae47
Merge branch 'w45_MDL-42044_m26_zipaddon' of https://github.com/skodak/moodle
2013-11-04 16:14:04 +08:00
d04bea30da
Merge branch 'wip-MDL-42400-master' of git://github.com/marinaglancy/moodle
2013-11-04 13:11:42 +08:00
4cf944c6bc
MDL-42044 minor add-on installer unit tests cleanup
2013-11-01 10:43:14 +01:00
99456a5559
MDL-42044 standardise list of unzipped files in add-on installer
2013-11-01 10:43:13 +01:00
63950e4d0b
MDL-42236 behat: New steps to look for elements visibility
2013-11-01 08:55:27 +08:00
c3f0f2fd79
MDL-40683 fix user upload form validation problem
2013-10-29 12:05:29 +01:00
e17bac441d
Merge branch 'wip-MDL-40683-master' of git://github.com/abgreeve/moodle
2013-10-29 16:42:48 +08:00
b1a6c9dc52
Merge branch 'wip-mdl-41811' of git://github.com/rajeshtaneja/moodle
...
Conflicts:
login/change_password.php
2013-10-28 15:37:05 +08:00
9a84376d4b
Merge branch 'w44_MDL-42110_m26_addoninstaller' of https://github.com/skodak/moodle
2013-10-28 12:39:30 +08:00
c00252fbed
MDL-40683 administration: Include alternate name fields in CSV user import.
...
Removal of firstname and lastname from STD_FIELDS
2013-10-28 09:14:44 +08:00
6f4ece9f57
MDL-40683 libraries: Include alternate name fields in CSV user import.
2013-10-28 09:08:48 +08:00
7cff3faa94
MDL-42400 tool_generator: save db query in module generation
2013-10-26 14:00:24 +11:00
Damyon Wiese