mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-21 08:00:37 +01:00
Code Issues Projects Releases Wiki Activity
72,515 Commits 36 Branches 527 Tags
Commit Graph

72515 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
a0941ad0af Merge branch 'wip-mdl-39752' of https://github.com/rajeshtaneja/moodle 2015-03-10 08:08:51 +00:00
David Monllao
fa91462dfa Merge branch 'MDL-49316-master' of git://github.com/jleyva/moodle 
Conflicts:
	version.php
 2015-03-10 15:50:13 +08:00
David Monllao
81ce169dce Merge branch 'MDL-49346-master' of git://github.com/jleyva/moodle 2015-03-10 15:31:51 +08:00
David Monllao
8ee9d93e31 Merge branch 'MDL-49351-master' of git://github.com/jleyva/moodle 2015-03-10 15:21:13 +08:00
David Monllao
2af068596a Merge branch 'MDL-49366' of git://github.com/timhunt/moodle 2015-03-10 14:41:09 +08:00
David Monllao
dbf51f9117 Merge branch 'MDL-49107-master' of git://github.com/FMCorz/moodle 2015-03-10 11:42:58 +08:00
David Monllao
ed1027765e Merge branch 'MDL-49332-master' of git://github.com/merrill-oakland/moodle 2015-03-10 10:42:42 +08:00
David Monllao
11db2e188f Merge branch 'MDL-48572' of git://github.com/rlorenzo/moodle 2015-03-10 10:26:58 +08:00
David Monllao
5091a63fc1 Merge branch 'MDL-46064_master' of git://github.com/markn86/moodle 2015-03-10 10:23:55 +08:00
David Monllao
660ca679f7 Merge branch 'MDL-39262' of git://github.com/jmvedrine/moodle 2015-03-10 10:12:44 +08:00
David Monllao
25ffb8d561 MDL-5583 mod_data: Unify mod_data version 2015-03-10 10:08:32 +08:00
David Monllao
039b74fd01 Merge branch 'MDL-5583-master' of git://github.com/xow/moodle 2015-03-10 10:02:23 +08:00
David Monllao
f966af0da3 Merge branch 'wip-MDL-48437_MASTER' of git://github.com/jason-platts/moodle 2015-03-10 09:56:21 +08:00
Eloy Lafuente (stronk7)
beaceef9ee weekly release 2.9dev 2015-03-09 16:47:28 +01:00
John Okely
1c3b2058c8 MDL-5583 mod_data: Improve required fields 
Fix accidental <tr> in some field modify screens
Update mod_data version
Change required asterisk to image
Improve required error message
Fix required icon positions
Remove required code from date field
Add name in labels for fields
Add required field option for multimenu
Remove old required field title text modifier
Add multimenu to behat
Add more comprehensive behat tests
Reload old input when an input error occurs
Behat grammar fixes
Allow location of 0, 0
Use html_writer
Fix existing mod_data behat tests
 2015-03-09 13:56:16 +08:00
Marina Glancy
51fef1de35 MDL-49418 core: partial revert of MDL-48804 
this is a quick fix for the issue 'Course module with two or more availability restrictions is not accessible'
MDL-49434 is created to deal with the renderer access inside availability check
 2015-03-09 11:26:50 +08:00
Rajesh Taneja
003dc31998 MDL-39752 behat: Updated composer to use step count formatter 2015-03-09 07:49:25 +08:00
Rajesh Taneja
5b9e6b5526 MDL-39752 behat: Added support for behat_wwwroot and behat_dataroot 2015-03-09 07:49:25 +08:00
Rajesh Taneja
b1c36d966e MDL-39752 behat: for drop option don't have to pass parallel option 2015-03-09 07:11:57 +08:00
Rajesh Taneja
52acb7c9aa MDL-39752 behat: Added information about defines in config-dist 2015-03-09 07:11:57 +08:00
Rajesh Taneja
b32b2284fe MDL-39752 behat: Show output of failed install process 2015-03-09 07:11:57 +08:00
Rajesh Taneja
a2754d791b MDL-39752 behat: Moved parallel run checks from setup to behat/lib.php 2015-03-09 07:11:57 +08:00
Rajesh Taneja
1bff616611 MDL-39752 behat: Added Fromrun and torun for running on multiple vms 
https://circleci.com
 2015-03-09 07:11:56 +08:00
Rajesh Taneja
ef95c163e4 MDL-39752 behat: Don't package default step count with moodle 2015-03-09 07:11:56 +08:00
Rajesh Taneja
027212b034 MDL-39752 behat: Use symfony2/process 2015-03-09 06:52:54 +08:00
Rajesh Taneja
3c71c15c26 MDL-39752 behat: Modified following for parallel run: 
1. Create behat datadir within behat_dataroot not at same level
2. Define suffix for link and not use hard-coded values
3. Renamed ns_parallel to run.php
4. Rename variables to best understand them
5. Added support for each run to specify db, prefix, rerun and profile.
6. Showing number of steps in each line of parallel run.
 2015-03-09 06:52:54 +08:00
Tony Levi
08e7f97ee4 MDL-39752 behat: Parallel execution support 2015-03-09 06:52:54 +08:00
Jean-Michel Vedrine
5b0af6e4b1 MDL-39262 mod_lesson: disable shortforms in lesson question display 2015-03-08 11:06:53 +01:00
Juan Leyva
31c202b0ab MDL-49316 webservices: Add core_course_get_courses to mobile service 2015-03-06 11:35:47 +01:00
Juan Leyva
9502a19c3c MDL-49346 ratings: ratingarea should be a required parameter 2015-03-06 11:34:21 +01:00
Juan Leyva
c73b8d85c5 MDL-49351 ratings: Correct check of viewallratings permission 2015-03-06 11:33:56 +01:00
Mark Nelson
71611510a0 MDL-46064 install: prevent install/upgrade with MyISAM 2015-03-05 22:29:34 -08:00
Damyon Wiese
b89cca197e MDL-5583 mod_data: Add required fields 
This is implemented for most fields but not all. The reason is that there are
some fields for which this does not make sense because no entry is a valid entry.

The supported fields are:
    checkbox
    file
    latlong
    menu
    number
    picture
    radio
    text
    textarea
    url

The unsupported fields are:
    date
    multimenu
 2015-03-06 09:55:49 +08:00
John Okely
9776f3dcdb MDL-5583 behat: Add multiline version of 'And I set the field to' 2015-03-06 09:55:49 +08:00
Rex Lorenzo
c288300c3c MDL-48572 gradereport_grader: Average wrong with suspended users 2015-03-05 11:02:58 -08:00
Eric Merrill
17e56698ec MDL-49332 gradebook: Raise time limit if we get into regrade 
Because all regrading should (and does) start from this point, it
is safe and best to call it just once, from this point.
 2015-03-05 10:09:40 -05:00
Tim Hunt
9c75f8dc44 MDL-49366 questions: avoid PHP notices from bad pluginfile URLs 2015-03-05 12:18:20 +00:00
Eloy Lafuente (stronk7)
b90f98dade weekly release 2.9dev 2015-03-05 11:26:30 +01:00
Rajesh Taneja
4ba58b4540 MDL-48962 mod_lesson: New lesson should not be timed 2015-03-05 14:55:18 +08:00
Rajesh Taneja
8b88ba475e MDL-48962 mod_lesson: Fixed behat with new timeout setting and string 2015-03-05 14:55:18 +08:00
Eloy Lafuente (stronk7)
d687c29f26 Merge branch 'MDL-48912' of git://github.com/jmvedrine/moodle 2015-03-05 00:24:49 +01:00
Jean-Michel Vedrine
5df7f12398 MDL-48912 mod_lesson: fix problems found during testing 2015-03-04 21:50:33 +01:00
Jetha Chan
d10ac16a2f MDL-48060 messaging: contact list paging bar style fixup 2015-03-04 17:37:04 +01:00
Eloy Lafuente (stronk7)
de2f05d50d Merge branch 'MDL-49379_master' of git://github.com/markn86/moodle 2015-03-04 10:46:18 +01:00
Mark Nelson
05536ad165 MDL-49379 core_webservice: fixed ability to edit services 2015-03-04 01:36:45 -08:00
David Monllao
553319be03 MDL-49204 core_message: Checking current user 2015-03-04 10:05:26 +08:00
Andrew Nicols
4b38a19aec Merge branch 'MDL-49164_old_rego' of https://github.com/andyjdavis/moodle 2015-03-04 08:57:00 +08:00
Andrew Nicols
8506c95c9f Merge branch 'MDL-49364' of git://github.com/timhunt/moodle 2015-03-04 08:51:21 +08:00
Andrew Davis
858e92fefe MDL-49164 admin: removed unused registration config setting 2015-03-04 08:50:39 +08:00
Andrew Nicols
a1955c1784 Merge branch 'master_MDL-46390' of https://github.com/danmarsden/moodle 2015-03-04 07:52:55 +08:00