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

72548 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Monllao
42d81ef740 Merge branch 'MDL-49298-master' of git://github.com/merrill-oakland/moodle 
Conflicts:
	version.php
 2015-03-11 08:33:23 +08:00
David Monllao
43e15173dd Merge branch 'MDL-49315' of git://github.com/timhunt/moodle 2015-03-11 08:28:02 +08:00
David Monllao
7f7fd7e1e2 Merge branch 'MDL-49269-master' of git://github.com/andrewnicols/moodle 2015-03-11 08:23:30 +08:00
Andrew Nicols
3acc64e323 MDL-49269 javascript: Add log, and loglevel amd modules 2015-03-11 08:17:54 +08:00
David Monllao
ac28aad351 Merge branch 'MDL-49069' of git://github.com/rlorenzo/moodle 2015-03-11 08:17:29 +08:00
Eloy Lafuente (stronk7)
0cb0cd30f5 Merge branch 'MDL-49159' of https://github.com/spvickers/moodle 2015-03-11 00:17:37 +01:00
Eloy Lafuente (stronk7)
3bafe5ebee Merge branch 'MDL-49224-master' of git://github.com/jethac/moodle 2015-03-11 00:16:01 +01:00
Eloy Lafuente (stronk7)
338de2ed78 Merge branch 'MDL-49242-master' of git://github.com/jleyva/moodle 2015-03-11 00:11:56 +01:00
Rex Lorenzo
c9f2d347f3 MDL-49069 mod_forum: Ability to specify default values for Forum RSS 2015-03-10 14:57:03 -07:00
Dan Poltawski
9be958e2f0 MDL-39752 fix whitespace errors 
(And some others unrelated to above issue, because its spring and i'm
cleaning).
 2015-03-10 14:13:20 +00:00
Rajesh Taneja
17e675a7fc MDL-39752 behat: Return proper behat dir if config set 2015-03-10 13:51:37 +00:00
Dan Poltawski
9fe26fb874 MDL-48595 upgrade.txt: just add some rationale explaining change 2015-03-10 10:00:40 +00:00
Dan Poltawski
6755498637 Merge branch 'MDL-48595_master' of git://github.com/dmonllao/moodle 
Conflicts:
	version.php
 2015-03-10 09:59:28 +00:00
David Monllao
ceba96bbca Merge branch 'MDL-49256-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
 2015-03-10 17:42:35 +08:00
Dan Poltawski
449f3db147 Merge branch 'wip-mdl-49402' of https://github.com/rajeshtaneja/moodle 2015-03-10 08:33:37 +00:00
Dan Poltawski
1151c0cd8b Merge branch 'MDL-48682_master' of git://github.com/dmonllao/moodle 2015-03-10 08:25:30 +00:00
David Monllao
88019507b7 Merge branch 'MDL-49333-master' of git://github.com/jleyva/moodle 2015-03-10 16:23:17 +08:00
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
David Monllao
59aebbed70 MDL-48595 logstore: Replacing references to deprecated interfaces 2015-03-09 08:25:37 +08:00
David Monllao
1cfce08e63 MDL-48595 logstore: Adding new interfaces 
sql_reader and sql_internal_table_reader.
 2015-03-09 08:25:37 +08:00
David Monllao
45a1a16bfc MDL-48595 log: Replacing current interfaces 
Deprecating sql_internal_reader and sql_select_reader in
favour of the new interfaces including get_events_select_iterator.
 2015-03-09 08:25:15 +08:00
David Monllao
ad23227bd6 MDL-48595 core_dml: Adding a recordset walker 2015-03-09 08:25:14 +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