mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
63,764 Commits 36 Branches 519 Tags
Commit Graph

63764 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Petr Škoda
81881cb9d6 MDL-41787 make sure maturity constants are defined before they are used in core_component class 2013-09-20 17:22:20 +02:00
Sam Hemelryk
7f3836d15a weekly release 2.6dev 2013-09-20 14:40:59 +12:00
Sam Hemelryk
0546f1bf8f NOBUG: fixed file permissions 2013-09-20 14:37:30 +12:00
Sam Hemelryk
2e79f57db9 Merge branch 'install_master' of git://git.moodle.org/moodle-install 2013-09-20 14:34:25 +12:00
Sam Hemelryk
6af9ab573b Revert "MDL-41466 theme_formal_white: moved courses action icons once again on the right" 
This reverts commit c724e009960a399170bbddc58ca2f26737504287.
 2013-09-20 08:39:57 +12:00
AMOS bot
f0a617ed82 Automatically generated installer lang files 2013-09-19 00:44:10 +00:00
Sam Hemelryk
669755a423 Merge branch 'master_MDL-38489' of git://github.com/danmarsden/moodle 2013-09-19 09:49:31 +12:00
Dan Marsden
d6d0c4e00b MDL-38489 SCORM: obtain correct section number when getting course_url 2013-09-19 09:36:52 +12:00
Eloy Lafuente (stronk7)
9ea4eedf22 Merge branch 'MDL-38661-m-i' of git://github.com/andrewnicols/moodle 2013-09-18 17:09:25 +02:00
Eloy Lafuente (stronk7)
cae8956648 Merge branch 'MDL-41188-master-fix1' of git://github.com/damyon/moodle 2013-09-18 15:44:31 +02:00
Damyon Wiese
ce5867a178 MDL-41188 javascript: Prevent scrolling to top 
This fix is for dialogues that are not created until some time after the page
has loaded.
 2013-09-18 20:21:34 +08:00
Andrew Nicols
dd834cba33 MDL-38661 JavaScript: Add missing lazy loading on collapseall 2013-09-18 11:04:31 +01:00
AMOS bot
09fd6d9114 Automatically generated installer lang files 2013-09-18 00:45:28 +00:00
Eloy Lafuente (stronk7)
abef633c33 Merge branch 'MDL-41570-master-v2' of git://github.com/jamiepratt/moodle 2013-09-17 21:57:07 +02:00
Eloy Lafuente (stronk7)
5c34952b82 Merge branch 'wip-mdl-41717' of git://github.com/rajeshtaneja/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-09-17 21:22:30 +02:00
Eloy Lafuente (stronk7)
cfcd93dd11 Merge branch 'MDL-41728-master' of git://github.com/sammarshallou/moodle 2013-09-17 21:17:05 +02:00
Eloy Lafuente (stronk7)
e79ca991fb Merge branch 'master_MDL-32506' of git://github.com/danmarsden/moodle 2013-09-17 21:11:26 +02:00
Eloy Lafuente (stronk7)
e60756632a Merge branch 'wip-mdl-41711' of git://github.com/rajeshtaneja/moodle 2013-09-17 20:22:32 +02:00
Eloy Lafuente (stronk7)
1ee2fb5a11 Merge branch 'MDL-41188-master' of git://github.com/damyon/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-09-17 20:04:08 +02:00
Eloy Lafuente (stronk7)
58c9faeaca Merge branch 'MDL-38661-m-wip' of git://github.com/andrewnicols/moodle 
Conflicts:
	theme/base/style/core.css
	theme/bootstrapbase/style/moodle.css
 2013-09-17 19:59:55 +02:00
Marina Glancy
2b7a557c28 Merge branch 'MDL-41622_b' of git://github.com/rwijaya/moodle 2013-09-17 16:43:12 +10:00
Rossiani Wijaya
764d7ba9b4 MDL-41622 workshop mod: fix page heading levels. 
Also, changing couple of the sub header to use notification, which is more appropriate.
 2013-09-17 12:44:25 +08:00
Sam Hemelryk
d4d97627d2 Merge branch 'MDL-41817-master' of git://github.com/sammarshallou/moodle 2013-09-17 15:26:06 +12:00
Sam Hemelryk
26c9c586c9 Merge branch 'MDL-41572-master' of git://github.com/jamiepratt/moodle 2013-09-17 14:30:16 +12:00
Sam Hemelryk
23eed08e1a Merge branch 'MDL-41540-master-v2' of git://github.com/jamiepratt/moodle 2013-09-17 14:02:47 +12:00
Sam Hemelryk
81ece3f7aa Merge branch 'MDL-41571-master' of git://github.com/jamiepratt/moodle 2013-09-17 14:00:15 +12:00
Marina Glancy
9f21d24895 Merge branch 'MDL-41612_b' of git://github.com/rwijaya/moodle 2013-09-17 11:10:44 +10:00
Marina Glancy
4a91055f7c Merge branch 'MDL-39959-master' of git://github.com/ankitagarwal/moodle 2013-09-17 11:08:27 +10:00
Eloy Lafuente (stronk7)
ba57caa349 Merge branch 'MDL-41595_M26' of git://github.com/lazydaisy/moodle 2013-09-17 02:15:06 +02:00
Sam Hemelryk
c8f052dbdd Merge branch 'wip-MDL-41715-master' of git://github.com/marinaglancy/moodle 2013-09-17 11:44:39 +12:00
Sam Hemelryk
29b56cfd09 MDL-38489 mod_scorm: added require to be explicit 2013-09-17 09:12:02 +12:00
Sam Hemelryk
77365f7ff6 Merge branch 'master_MDL-38489' of git://github.com/danmarsden/moodle 2013-09-17 09:02:32 +12:00
Sam Hemelryk
f34af1167a Merge branch 'MDL-41667' of git://github.com/timhunt/moodle 2013-09-17 08:59:08 +12:00
Sam Hemelryk
82b2bb5eca Merge branch 'MDL-37148-master' of git://github.com/damyon/moodle 2013-09-17 08:50:38 +12:00
Sam Hemelryk
c2e7f90427 Merge branch 'MDL-41466_master' of git://github.com/kordan/moodle 2013-09-17 08:48:59 +12:00
Sam Hemelryk
0dd46bb851 Merge branch 'MDL-38317-master' of git://github.com/StudiUM/moodle 2013-09-17 08:39:14 +12:00
sam marshall
6a0189eb3f MDL-41817 Backup/restore without blocks gives error 
Also applies to various other situations where backup includes 0 of
something. This was caused by a problem in the progress-tracking code.
 2013-09-16 17:11:40 +01:00
Marina Glancy
a8fd33b02c MDL-41715 Increase size of char fiels in user table 2013-09-16 17:51:05 +10:00
Rossiani Wijaya
b2970f963a MDL-41612 scorm: fix heading levels 2013-09-16 15:40:01 +08:00
Ankit Agarwal
63deb5c379 MDL-39959 events: Replace add_to_log() calls with events for course module actions (create, delete and update) 2013-09-16 15:29:56 +08:00
Marina Glancy
4ead355143 Merge branch 'MDL-41621' of git://github.com/rwijaya/moodle 2013-09-16 17:14:18 +10:00
Ankit Agarwal
b9b994c7d2 MDL-39959 events: Add unit tests for course module events 
test_course_module_created_event()
test_course_module_created_event_exceptions()
test_course_module_updated_event()
test_course_module_updated_event_exceptions()
test_course_module_deleted_event()
test_course_module_deleted_event_exceptions()
 2013-09-16 13:42:37 +08:00
Ankit Agarwal
0158650f59 MDL-39959 events: Add course module events 
Added event course_module_created
Added event course_module_updated
Added event course_module_deleted
 2013-09-16 13:42:37 +08:00
Marina Glancy
81673647a9 Merge branch 'MDL-41315-master' of git://github.com/damyon/moodle 2013-09-16 15:31:20 +10:00
Sam Hemelryk
31dea4fea4 Merge branch 'master_MDL-41434' of https://github.com/danmarsden/moodle 2013-09-16 15:07:57 +12:00
Sam Hemelryk
da8cd86f17 Merge branch 'MDL-38194-master' of git://github.com/sammarshallou/moodle 
Conflicts:
	lib/upgrade.txt
 2013-09-16 13:56:05 +12:00
Sam Hemelryk
efc2c51712 Merge branch 'MDL-41637_master' of https://github.com/totara/openbadges 2013-09-16 13:51:12 +12:00
Sam Hemelryk
db220c2972 Merge branch 'MDL-41748_master' of https://github.com/markn86/moodle 2013-09-16 13:48:48 +12:00
Sam Hemelryk
a93db28850 Merge branch 'wip-mdl-41557' of git://github.com/rajeshtaneja/moodle 2013-09-16 13:46:07 +12:00
Damyon Wiese
91327d96ca MDL-37148 assign: Fix missing parameter for submit_for_grading webservice. 
It is required to specify if the user has accepted the submission statement
to make sure it goes in the log/event.
 2013-09-16 09:34:32 +08:00