mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity
59,903 Commits 36 Branches 519 Tags
Commit Graph

13557 Commits

Author SHA1 Message Date
Damyon Wiese
3dbfd15872 Merge branch 'm25_MDL-38336_SCORM_TOC_links_when_Display_course_structure_is_on' of https://github.com/scara/moodle 2013-03-26 15:40:04 +08:00
Damyon Wiese
d0fd9726d1 Merge branch 'MDL-30438_b' of git://github.com/rwijaya/moodle 2013-03-26 14:29:57 +08:00
Damyon Wiese
8af0dffb50 Merge branch 'MDL-34311-master' of git://github.com/danpoltawski/moodle 
Conflicts:
	course/moodleform_mod.php
	lib/upgrade.txt
 2013-03-26 13:46:29 +08:00
Damyon Wiese
1e425d185b Merge branch 'MDL-38429' of git://github.com/rwijaya/moodle 2013-03-26 12:59:53 +08:00
Rossiani Wijaya
ecea65cace MDL-38429 Lesson Module: improve lesson code by reseting NULL value to use lowercase. 2013-03-25 14:07:18 +08:00
Damyon Wiese
35f155519e Merge branch 'w13_MDL-38654_m25_gdversion' of git://github.com/skodak/moodle 
Conflicts:
	lang/en/admin.php
 2013-03-25 14:02:31 +08:00
Roman Tsukanov
1b58651681 MDL-38429: lesson report - Improve lesson statistics code. 2013-03-25 13:58:13 +08:00
Rossiani Wijaya
41e2a9591f MDL-30438 Lesson Module: improve password field to disabled when password protect is set to no. 2013-03-25 11:26:50 +08:00
Dan Poltawski
b716cd2b70 MDL-34311 mod_url: Missing setType on the external url 2013-03-25 09:39:30 +08:00
Matteo Scaramuccia
724dc929c7 MDL-38336 SCORM: incorrect TOC bulding when 'Display course structure' is on 2013-03-24 11:02:41 +01:00
Petr Škoda
689096bc26 MDL-38654 do not test $CFG->gdversion 
GD PHP extension is now required. Add-ons need to remove $CFG->gdversion tests. The worst case regression is that add-on will think GD is not available.
 2013-03-22 16:57:55 +01:00
Petr Škoda
c3f31a3ded MDL-38581 move forum discussion and post generators to proper place 2013-03-22 13:21:35 +01:00
Eloy Lafuente (stronk7)
b35dd05521 Merge branch 'MDL-38370-master' of git://github.com/ankitagarwal/moodle 2013-03-20 00:30:49 +01:00
Eloy Lafuente (stronk7)
044566f001 Merge branch 'MDL-38166-m' of git://github.com/andrewnicols/moodle 2013-03-20 00:13:51 +01:00
Eloy Lafuente (stronk7)
e73ac7692e Merge branch 'MDL-38433_master' of git://github.com/dmonllao/moodle 2013-03-19 23:27:50 +01:00
Eloy Lafuente (stronk7)
1d790031c2 Merge branch 'MDL-38411_master' of git://github.com/dmonllao/moodle 2013-03-19 23:26:01 +01:00
Eloy Lafuente (stronk7)
eb8a3eeaac Merge branch 'MDL-38410_master' of git://github.com/dmonllao/moodle 2013-03-19 23:20:31 +01:00
Eloy Lafuente (stronk7)
bf2d2aa983 Merge branch 'MDL-38412' of git://github.com/timhunt/moodle 2013-03-19 18:20:47 +01:00
David Monllao
6b6303d9a1 MDL-38411 behat: New test 2013-03-19 16:44:55 +08:00
David Monllao
b7d6c48589 MDL-38433 behat: New tests 
According to MDLQA-48
 2013-03-19 16:44:20 +08:00
David Monllao
4b61cc91ac MDL-38410 behat: Adding basic step and test for mod_choice 2013-03-19 16:42:59 +08:00
Damyon Wiese
43087d02dd Merge branch 'MDL-38368-master' of git://github.com/FMCorz/moodle 2013-03-19 16:17:41 +08:00
Damyon Wiese
20139cbcef MDL-30790 folder : Whitespace fixes 2013-03-19 15:59:41 +08:00
Damyon Wiese
0cabeada65 Merge branch 'MDL-30790_25' of git://github.com/rlorenzo/moodle 2013-03-19 15:47:35 +08:00
Damyon Wiese
db98fa786e Merge branch 'wip-mdl-36395-m' of git://github.com/rajeshtaneja/moodle 
Conflicts:
	version.php
 2013-03-19 15:18:13 +08:00
Damyon Wiese
08f5b90bb7 Merge branch 'MDL-38426_dnd_plain_text' of git://github.com/davosmith/moodle 2013-03-19 14:36:43 +08:00
Damyon Wiese
8fe55f6862 Merge branch 'MDL-37079-master2' of git://github.com/mouneyrac/moodle 2013-03-19 11:13:23 +08:00
Damyon Wiese
23477802b7 Merge branch 'MDL-38367_dnd_ui_improvements' of git://github.com/davosmith/moodle 2013-03-19 09:31:07 +08:00
Jerome Mouneyrac
dd5d933f30 MDL-37079 create/update_module() 2013-03-18 14:41:35 +08:00
Damyon Wiese
7c211f565a Merge branch 'MDL-38005-master' of git://github.com/FMCorz/moodle 2013-03-18 13:45:41 +08:00
Damyon Wiese
1ef6160ade Merge branch 'MDL-38215-workshop-oracle' of git://github.com/mudrd8mz/moodle 2013-03-18 11:41:00 +08:00
Eloy Lafuente (stronk7)
a06900b5b2 MDL-25655 glossary: non full searches now working. 
In the process of updting the module from 1.9 to
2.0 the (non) full search feature was lost without notice.

This restitutes it with the same behavior present in 1.9:

- fullsearch disabled: look into concepts and aliases.
- fullsearch enabled (default): look also into definitions.
 2013-03-16 18:04:57 +01:00
Rex Lorenzo
f295727859 MDL-30790 - Option to collapse or expand sub-folders 2013-03-15 16:19:07 -07:00
Tim Hunt
a4768fe290 MDL-38412 fix quiz reports group mode weirdness. 
Moodle currently selected group uses the session. This can cause weird
effects when you have two tabs open. This is particularly weird in the
quiz reports, where some actions like delete attempt are checked against
the currently selected group.

The solution is to put the currently selected group into the URL for all
actions like delete/regrade attempt, regrade all attempts, download and
sort table.
 2013-03-15 11:58:06 +00:00
Frederic Massart
807cf3d0ae MDL-38005 form: Headers have a proper name 2013-03-15 11:06:25 +08:00
Frederic Massart
9f1b00a85d MDL-38368 folder: No edit button when displayed inline 2013-03-14 14:03:17 +08:00
David Mudrák
c3d0157b0d MDL-38215 Fix cross-db support in workshop SQL queries 
The $sql used in these methods may contain multiple parts glued
together by the UNION operator. Simply appending the ORDER BY statement
to the end of the query does not work in all DBs (failure reported at
Oracle). Following the pattern already applied in MDL-30051, we wrap the
SQL into yet another SELECT statement and perform ordering there.

Credit goes to Sara Cenni for suggesting the fix.
 2013-03-13 14:58:50 +01:00
Aparup Banerjee
e186442497 Merge branch 'MDL-36990_master-neu' of git://github.com/grabs/moodle 2013-03-13 14:59:47 +08:00
Andreas Grabs
205c61898d MDL-36990 mod_feedback - remove single move icon, prevent autoscrolling 2013-03-13 07:32:04 +01:00
Eloy Lafuente (stronk7)
0e5781a7ff Merge branch 'MDL-30166-master' of git://github.com/ankitagarwal/moodle 2013-03-13 01:08:26 +01:00
Davo Smith
3d38777333 MDL-38426 mod_label - correctly handle plain text that has been added by drag and drop upload 2013-03-12 19:46:14 +00:00
Andrew Robert Nicols
6f07bf766b MDL-38166 mod_data Add option to open url in a new window 2013-03-12 11:29:17 +00:00
Rajesh Taneja
9a51c3d95c MDL-36395: Converted hard-coded MAX_USER_PER_PAGE to config setting 
course, cohort, enrol, role, groups and forum used to use hard-coded
MAX_USERS_PER_PAGE=100 for rendering user list. This has been converted
to $CFG->maxusersperpage.
 2013-03-12 17:14:53 +08:00
Damyon Wiese
43c791653b Merge branch 'MDL-34011' of git://github.com/rwijaya/moodle 2013-03-12 16:03:53 +08:00
Rossiani Wijaya
43deb1a4c4 MDL-34011 Lesson module - short answer question: fixed student attempt statistics 2013-03-12 14:16:15 +08:00
Damyon Wiese
ee8640a906 MDL-34011 Lesson module: fixed incorrect display of student attempt for short answer question 2013-03-12 14:08:05 +08:00
Aparup Banerjee
e0567bc2a3 MDL-36990 mod_feedback : minor whitespace clean up 2013-03-12 12:25:38 +08:00
Aparup Banerjee
7b37b805d6 Merge branch 'MDL-36990_master-neu' of git://github.com/grabs/moodle 2013-03-12 12:22:28 +08:00
Ankit Agarwal
6e9d3c19e3 MDL-38370 scorm: Fixing strict standard errors in outline report 2013-03-12 11:43:10 +08:00
Ankit Agarwal
7a241d8102 MDL-30166 Remove deprecated %fullname% from core 
Thanks to Matheus Kautzmann for the initial patch.
 2013-03-12 10:38:09 +08:00