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

4773 Commits

Author SHA1 Message Date
Dan Poltawski
1f931e2928 Merge branch 'MDL-43670' of git://github.com/timhunt/moodle 2014-01-21 11:25:38 +08:00
Tim Hunt
dc4a3ea1ee MDL-43670 quiz_question_instances to match coding guidelines. 
Some columns needed to be renamed:
* quiz     -> quizid
* question -> questionid
* grade    -> maxmark

Then all the places that refer to those needed to be fixed.
 2014-01-17 10:56:07 +00:00
David Monllao
561e9bb92e MDL-43480 behat: Switching @_only_local and @_alerts to @_file_upload and @_alert 2014-01-17 10:41:37 +08:00
David Monllao
81ad5438c7 MDL-43480 behat: Removing @_only_local tags from steps where it is not necessary 2014-01-17 10:41:37 +08:00
Damyon Wiese
7508094a87 Merge branch 'MDL-43461_master' of git://github.com/dmonllao/moodle 2014-01-15 09:39:03 +08:00
Eloy Lafuente (stronk7)
7d4c752e31 Merge branch 'w02_MDL-43524_m27_textcaching' of https://github.com/skodak/moodle 2014-01-14 22:08:46 +01:00
Eloy Lafuente (stronk7)
da47e297da Merge branch '35597-27' of git://github.com/samhemelryk/moodle 2014-01-14 16:39:00 +01:00
Damyon Wiese
718f42ae68 Merge branch 'MDL-43584_master' of git://github.com/dmonllao/moodle 2014-01-14 16:21:21 +08:00
Dan Poltawski
2c9c8c7f46 Merge branch 'MDL-43642_master' of git://github.com/dmonllao/moodle 2014-01-14 15:48:49 +08:00
David Monllao
19a40b1468 MDL-43461 behat: Using linux-style directory separators when using cygwin 2014-01-14 13:10:40 +08:00
Petr Škoda
62c8032509 MDL-34347 remove all problematic global text caching 
Instead we will create new MUC caches inside each filter plugin.
Please note that all cache filters should work with local caches
without the need of strict cache invalidation.
 2014-01-14 10:49:23 +08:00
Sam Hemelryk
e5e0d397f4 MDL-35597 admin-plugins: are now sorted alphabetically 2014-01-13 08:12:42 +13:00
David Monllao
50edfdca03 MDL-43584 behat: Updating features to use the new expected arguments 2014-01-10 18:25:44 +08:00
David Monllao
abe572e3f2 MDL-43642 behat: Setting the correct files @package 2014-01-10 17:50:50 +08:00
Eloy Lafuente (stronk7)
577432283c Merge branch 'MDL-43590-en_fix' of git://github.com/mudrd8mz/moodle 2014-01-10 10:08:34 +01:00
Helen Foster
480fca77b3 MDL-43590 Merge English strings from the en_fix language pack 2014-01-09 01:06:01 +01:00
Eloy Lafuente (stronk7)
e6a6eb7838 Merge branch 'w01_MDL-42797_m27_admin' of https://github.com/skodak/moodle 2014-01-08 02:09:55 +01:00
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
Petr Škoda
61d598f057 MDL-42797 require real user login on upgrade settings page 2014-01-02 09:17:16 +08:00
Petr Škoda
fc1d0e822d MDL-42797 require real user login on admin page 2014-01-01 15:19:02 +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