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

66225 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Marsden
9d22765723 MDL-43247 SCORM: improve pop-up handling and redirect to homepage on close. 2014-01-17 10:09:26 +13:00
Eloy Lafuente (stronk7)
f05e25d208 weekly release 2.7dev 2014-01-16 18:50:54 +01:00
Eloy Lafuente (stronk7)
8273055fb1 NOBUG: Fixed file access permissions 2014-01-16 18:50:54 +01:00
Eloy Lafuente (stronk7)
54add634bb Merge branch 'install_master' of git://git.moodle.org/moodle-install 2014-01-16 18:50:44 +01:00
Damyon Wiese
8e3be93572 Merge branch 'MDL-40056-master' of git://github.com/ankitagarwal/moodle 2014-01-16 16:35:22 +08:00
Ankit Agarwal
5971f6266a MDL-40056 events: Use correct course module id while fetching context 2014-01-16 16:31:06 +08:00
Dan Poltawski
c8c8e6c2de Merge branch 'MDL-33952-master-fix2' of git://github.com/damyon/moodle 2014-01-16 09:40:58 +08:00
AMOS bot
e1c7c4a5cc Automatically generated installer lang files 2014-01-16 00:43:15 +00:00
Eloy Lafuente (stronk7)
da272e6b6b Merge branch 'master_MDL-43222' of git://github.com/danmarsden/moodle 2014-01-15 22:02:12 +01:00
Dan Marsden
eb07f2d8d0 MDL-43222 SCORM: Fix invalid sql 2014-01-16 09:48:04 +13:00
Kyle Temkin
a4f765eb1d MDL-39756 add advanced attachment options to essay question type 
Adds a set of options to the essay question type which implement
the following new features:

-Adds an input format which accepts only file uploads, and no
 inline text.
-Adds an option to make the inline text response optional when
 attachments are enabled, so students can choose to upload
 an essay file.
-Adds an option to make attachments required, so essays without
 attachments will be marked incomplete.
 2014-01-15 12:43:04 -05:00
Damyon Wiese
15f9dfad09 MDL-33952: mod_assignment Don't hide the modules on upgrade. 2014-01-15 16:47:30 +08:00
Damyon Wiese
efbed79063 Merge branch 'MDL-43621_master' of https://github.com/totara/openbadges 2014-01-15 13:17:31 +08:00
Damyon Wiese
57fbd5f91f MDL-28448 Assign: Add a new capability that lets teachers mess with student submissions. 2014-01-15 12:52:08 +08:00
Adrian Greeve
5e9c9e0e39 MDL-43700 reports: Update to the sql in the comment locallib to include additional name fields. 2014-01-15 12:03:19 +08:00
Dan Poltawski
b19608d682 Merge branch 'MDL-40912_master' of https://github.com/markn86/moodle 2014-01-15 11:41:05 +08:00
Yuliya Bozhko
e477ec0a39 MDL-43621 badges: Fix has_awards() result when deleted users are the only recipients of a badge 2014-01-15 16:24:37 +13:00
Mark Nelson
001f09548d MDL-40912 coursecat: replaced 'hide' and 'show' add_to_log calls with an event 2014-01-14 19:24:15 -08:00
Mark Nelson
d86c7206aa MDL-40912 coursecat: replaced 'move' add_to_log calls with an event 2014-01-14 19:24:14 -08:00
Mark Nelson
c4cea8cb5d MDL-40912 coursecat: replaced 'update' add_to_log call with an event 2014-01-14 19:24:14 -08:00
Mark Nelson
03ea10e6d3 MDL-40912 coursecat: replaced 'add' add_to_log call with an event 2014-01-14 19:24:08 -08:00
Eloy Lafuente (stronk7)
19c32aacea Merge branch 'MDL-43439_master-dateformat' of git://github.com/dmonllao/moodle 2014-01-15 03:59:51 +01:00
Rajesh Taneja
8acec2a693 MDL-43306 restore: Fix grade_item sortorder after restoring course 
While restoring course/activity, restore will blindly insert grade_item
sortorder. Which cause dulicate sortorder and lead to unpredicatble sorting
results.

Now we will call grade_item::fix_duplicate_sortorder() after restore is finished
to fix duplicate sortorder and order grade items to the closest order possible
 2014-01-15 10:28:00 +08:00
Damyon Wiese
7508094a87 Merge branch 'MDL-43461_master' of git://github.com/dmonllao/moodle 2014-01-15 09:39:03 +08:00
David Monllao
4234011a1a MDL-43439 behat: Dir date without - separators 2014-01-15 09:17:44 +08:00
Dan Poltawski
852c34e509 Merge branch 'MDL-43619-master' of git://github.com/sammarshallou/moodle 2014-01-15 08:19:49 +08:00
Eloy Lafuente (stronk7)
75bdb2bfc7 Merge branch 'MDL-43439_master' of git://github.com/dmonllao/moodle 2014-01-15 00:03:34 +01: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)
988c6ba1b8 Merge branch 'wip-MDL-31597-master' of git://github.com/abgreeve/moodle 
Conflicts:
	grade/tests/behat/behat_grade.php
	grade/tests/behat/grade_view.feature
 2014-01-14 22:03:02 +01:00
Yuliya Bozhko
7f964cfdc7 MDL-43621 badges: Don't display deleted users in badge recipients list 2014-01-15 09:31:45 +13:00
Frederic Massart
f15aff3802 MDL-40533 block_html: Remove styles specific to the block 2014-01-14 19:00:31 +01:00
Ruslan Kabalin
534fc27649 MDL-43693: assignment: Fix JS error on grading page. 2014-01-14 16:19:40 +00:00
Eloy Lafuente (stronk7)
372a612221 Merge branch 'MDL-43332_master' of https://github.com/markn86/moodle 2014-01-14 16:48:22 +01:00
Eloy Lafuente (stronk7)
e5f7cce1c1 Merge branch 'master_MDL-43222' of git://github.com/danmarsden/moodle 2014-01-14 16:44:11 +01:00
Eloy Lafuente (stronk7)
da47e297da Merge branch '35597-27' of git://github.com/samhemelryk/moodle 2014-01-14 16:39:00 +01:00
Eloy Lafuente (stronk7)
1b92203ef3 Merge branch 'w02_MDL-43537_m27_env' of https://github.com/skodak/moodle 2014-01-14 16:01:27 +01:00
sam marshall
0f1882ed1f MDL-43619 Roles: reset_role_capabilities unit test, cache fix 2014-01-14 13:46:25 +00:00
sam marshall
3978da9e2f MDL-43619 Roles: reset_role_capabilities function destroys overrides 2014-01-14 13:46:24 +00:00
Frederic Massart
810a3da133 MDL-41506 theme_bootstrapbase: Implement highlight class 2014-01-14 11:19:43 +01:00
Dan Poltawski
473924dfd5 Merge branch 'MDL-43664-master' of git://github.com/andrewnicols/moodle 2014-01-14 16:50:07 +08: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
824dccead3 Merge branch 'm27_MDL-43577_Incorrect_Variable_Expansion' of https://github.com/scara/moodle 2014-01-14 15:57:05 +08:00
Dan Poltawski
2c9c8c7f46 Merge branch 'MDL-43642_master' of git://github.com/dmonllao/moodle 2014-01-14 15:48:49 +08:00
Dan Poltawski
00ae4c4ead Merge branch 'm27_MDL-43575_Typo_In_The_Overridden_setOption' of https://github.com/scara/moodle 2014-01-14 15:36:58 +08:00
Dan Poltawski
b901d0e9dd Merge branch 'MDL-43178_forum' of https://github.com/andyjdavis/moodle 2014-01-14 15:26:52 +08:00
Damyon Wiese
a1ac22b815 Merge branch 'MDL-43531-master' of git://github.com/andrewnicols/moodle 2014-01-14 15:18:37 +08:00
David Monllao
5c0dfe32eb MDL-43439 behat: Save the screenshots to the specified location 2014-01-14 15:17:28 +08:00
Dan Poltawski
2be353c195 Merge branch 'master_MDL-41577' of git://github.com/danmarsden/moodle 2014-01-14 15:00:11 +08:00
Dan Poltawski
88457992ba Merge branch 'w02_MDL-43529_m27_globals' of https://github.com/skodak/moodle 2014-01-14 14:46:55 +08:00
Dan Poltawski
4198f7f903 Merge branch 'MDL-40918_master' of https://github.com/markn86/moodle 2014-01-14 14:43:45 +08:00