moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-11 11:56:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
73974 commits 37 branches 544 tags 1.3 GiB
Commit graph

5391 commits

Author SHA1 Message Date
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 bb32a499e1.
 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
Mark Nelson
bb32a499e1 MDL-42932 core_calendar: introduced calendar type system setting 2013-11-25 23:11:17 -08:00
Dan Poltawski
2bc34d6528 Merge branch 'MDL-40741_master' of git://github.com/dmonllao/moodle 2013-11-26 14:52:21 +08:00
David Monllao
5df9e40cec MDL-40741 behat: Changing xpaths for clean theme 
Keeps compatibility with standard theme.
 2013-11-26 11:41:13 +08:00
Marina Glancy
b884e46d5d MDL-43028 navigation: correct capability check 2013-11-25 13:27:01 +08:00
Rajesh Taneja
823c593fc5 MDL-43028 Navigation: Setting proper page properties on admin pages 2013-11-25 12:12:38 +08:00
Dan Poltawski
a136e16c8e Merge branch 'MDL-42547_master' of https://github.com/markn86/moodle 2013-11-25 10:37:33 +08:00
Mark Nelson
7ca44a4963 MDL-42547 tool_uploaduser: trim values before uploading users 2013-11-18 20:07:01 -08:00
Sam Hemelryk
496692fb9d Merge branch 'wip-MDL-42850-master' of git://github.com/abgreeve/moodle 2013-11-19 14:19:20 +13:00
Sam Hemelryk
40dca7e4d6 Merge branch 'MDL-41316-master' of git://github.com/ankitagarwal/moodle 2013-11-19 12:28:08 +13:00
Sam Hemelryk
074e5686db Merge branch 'MDL-42863' of git://github.com/timhunt/moodle 2013-11-19 12:03:41 +13:00
Sam Hemelryk
04fcb4a96c Merge branch 'MDL-42865' of git://github.com/timhunt/moodle 2013-11-19 11:50:44 +13:00
Damyon Wiese
ef16df1449 Merge branch 'MDL-42100_master' of https://github.com/markn86/moodle 2013-11-18 16:08:57 +08:00
Damyon Wiese
47578dbff4 MDL-42930 Add 2.6.0 upgrade line 2013-11-18 11:47:17 +08:00
Adrian Greeve
a2071fbf7c MDL-42850 administration: Updated bulk user upload errors to be more descriptive. 2013-11-18 11:36:16 +08:00