mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-04 08:06:30 +01:00
Code Issues Projects Releases Wiki Activity
64,245 Commits 36 Branches 523 Tags
Commit Graph

64245 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
c58b3ca0ca Merge branch 'MDL-41985-master' of git://github.com/andrewnicols/moodle 2013-10-09 16:27:50 +08:00
Damyon Wiese
c778085550 Merge branch 'w41_MDL-42047_m26_cohortdel' of https://github.com/skodak/moodle 2013-10-09 14:42:23 +08:00
Damyon Wiese
4600853128 Merge branch 'MDL-41659_master' of https://github.com/totara/openbadges 2013-10-09 13:30:40 +08:00
Damyon Wiese
6412c972e3 Merge branch 'wip-MDL-41967-master' of git://github.com/abgreeve/moodle 2013-10-09 12:46:14 +08:00
Damyon Wiese
c2a2580ac9 Merge branch 'wip-MDL-40844-master' of git://github.com/abgreeve/moodle 2013-10-09 12:09:10 +08:00
Damyon Wiese
5cc2c6662d Merge branch 'MDL-41347-master' of git://github.com/FMCorz/moodle 2013-10-09 12:03:54 +08:00
Damyon Wiese
604fc45ee0 Merge branch 'wip-MDL-42098-master' of git://github.com/abgreeve/moodle 2013-10-09 11:48:14 +08:00
Sam Hemelryk
d00b3f19b9 Merge branch 'MDL-40046-master' of git://github.com/ankitagarwal/moodle 2013-10-09 16:25:22 +13:00
Ankit Agarwal
136f4c47b3 MDL-40046 events: Use correct variable for page instance id 2013-10-09 11:20:32 +08:00
Dan Poltawski
e521e0724e Merge branch 'MDL-41230-master' of git://github.com/FMCorz/moodle 2013-10-09 11:16:34 +08:00
Sam Hemelryk
f18f96f767 Merge branch 'wip-MDL-42016-master' of git://github.com/marinaglancy/moodle 
Conflicts:
	lib/db/install.xml
	lib/db/upgrade.php
	version.php
 2013-10-09 15:58:45 +13:00
Dan Poltawski
e9091a28f5 Merge branch 'wip-MDL-42089-master' of git://github.com/abgreeve/moodle 2013-10-09 10:54:24 +08:00
Dan Poltawski
9d841c6c90 Merge branch 'mdl41908-master' of https://github.com/tlock/moodle 2013-10-09 10:27:07 +08:00
Damyon Wiese
869dd1fc6c Merge branch 'MDL-29663_alt' of https://github.com/merrill-oakland/moodle 2013-10-09 09:39:09 +08:00
Eloy Lafuente (stronk7)
7e9dadfd99 Merge branch 'MDL-42026-master' of git://github.com/damyon/moodle 
Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
 2013-10-09 01:48:45 +02:00
Sam Hemelryk
571781fbf6 Merge branch 'MDL-41940' of https://github.com/merrill-oakland/moodle 2013-10-09 12:41:36 +13:00
Eloy Lafuente (stronk7)
8fe9bbde09 Merge branch 'MDL-41761-master' of git://github.com/jamiepratt/moodle 2013-10-09 01:29:17 +02:00
Eloy Lafuente (stronk7)
38c6dc4313 Merge branch 'wip-MDL-42068-m26-showshortnamefilepicker' of git://github.com/henesnarfel/moodle 2013-10-09 01:26:52 +02:00
Petr Škoda
c969753885 MDL-40493 question: set real $USER before testing question walktrough 2013-10-09 11:02:35 +13:00
Petr Škoda
ed661154de MDL-41792 fix calendar test typos 2013-10-08 23:08:27 +02:00
Sam Hemelryk
08f95ac5e5 Merge branch 'w41_MDL-16073_m26_extdbtest_i' of https://github.com/skodak/moodle 2013-10-09 09:23:53 +13:00
Sam Hemelryk
9d1b909a9c Merge branch 'MDL-41956_master' of https://github.com/totara/openbadges 2013-10-09 08:54:46 +13:00
Petr Škoda
6cf2091571 MDL-16073 add test for connection to external database for authentication and enrolments 2013-10-08 21:53:51 +02:00
Eloy Lafuente (stronk7)
7d19bc1353 Merge branch 'MDL-42069' of https://github.com/appalachianstate/moodle 2013-10-08 21:25:46 +02:00
Eloy Lafuente (stronk7)
cef0f4203b Merge branch 'wip-MDL-42141-master' of git://github.com/marinaglancy/moodle 2013-10-08 21:23:56 +02:00
Eric Merrill
bd8f5d459d MDL-29663 forum: Replace constant FORUM_TRACKING_ON with FORUM_TRACKING_FORCED 
Commit for MDL-29663 that renames the FORUM_TRACKING_ON constant
to FORUM_TRACKING_FORCED to allow easier and more consistant reading.

FORUM_TRACKING_ON retained but marked depreciated.
 2013-10-08 08:04:55 -04:00
Eric Merrill
20e6782f10 MDL-29663 forum: Option to allow Forced for read tracking. 
Converts the use of Read Tracking On to Forced. Adds new admin setting
forum_allowforcedreadtracking. If set, Forced will be available when
adding or editing forums. In this state the forced forum overrides the
user preference of off.

With forum_allowforcedreadtracking not set (default) behavior is the
same as now, except forums previously set in the On state are treated
as Optional.

The side effect of forum_allowforcedreadtracking being on, is that users
cannot speed up the loading of course pages with lots of forums by
setting their personal forum read tracking option to off.
 2013-10-08 08:03:54 -04:00
Eloy Lafuente (stronk7)
467fc03982 Merge branch 'w41_MDL-42199_m26_rev' of https://github.com/skodak/moodle 2013-10-08 10:53:03 +02:00
Dan Poltawski
4f0eaf18f4 Merge branch 'MDL-40493-master' of git://github.com/damyon/moodle 
Conflicts:
	lib/db/install.xml
	lib/db/upgrade.php
	version.php
 2013-10-08 16:42:17 +08:00
Damyon Wiese
7bfc69b0c2 Merge branch 'MDL-40053-master' of git://github.com/ankitagarwal/moodle 2013-10-08 16:19:25 +08:00
Damyon Wiese
44585a1ecd Merge branch 'MDL-41792_master' of https://github.com/markn86/moodle 2013-10-08 16:03:46 +08:00
Petr Škoda
307124bed8 MDL-42199 fix course revision test 2013-10-08 09:57:09 +02:00
Dan Poltawski
b56a6981b3 Merge branch 'MDL-41722-master' of git://github.com/sammarshallou/moodle 2013-10-08 15:19:09 +08:00
Ankit Agarwal
c4f9401ce4 MDL-40053 events: Replace add_to_log() with new events in core_notes 2013-10-08 15:12:20 +08:00
Ankit Agarwal
1b486fc501 MDL-40053 events: Write unit tests for note events 2013-10-08 15:12:20 +08:00
Ankit Agarwal
3cc4cc68e4 MDL-40053 events: write events for core_notes 
Following events were added in this commit :-
core\event\note_created
core\event\note_deleted
core\event\note_updated
core\event\notes_viewed
 2013-10-08 15:12:20 +08:00
Ankit Agarwal
34088ad057 MDL-40053 events: Generator for core_notes 2013-10-08 15:12:19 +08:00
Damyon Wiese
6abc173877 Merge branch 'MDL-41520-master-mod_lti-completion-view' of github.com:Trii/moodle 2013-10-08 14:43:14 +08:00
Dan Poltawski
bcb3c375e3 Merge branch 'MDL-40060-master' of git://github.com/FMCorz/moodle 2013-10-08 14:33:27 +08:00
Frederic Massart
7f6e3eefd1 MDL-40060 mod_book: Replace add_to_log with events 2013-10-08 14:11:10 +08:00
Damyon Wiese
43822d89c5 Merge branch 'MDL-32570-master' of git://github.com/danpoltawski/moodle 2013-10-08 13:47:49 +08:00
Dan Poltawski
fa96fb0cea Merge branch 'MDL-42131-master' of git://github.com/damyon/moodle 2013-10-08 13:33:25 +08:00
Dan Poltawski
8431c290fd Merge branch 'MDL-42150-master' of git://github.com/damyon/moodle 2013-10-08 13:25:12 +08:00
Dan Poltawski
6cd7df4df1 Merge branch 'MDL-38655' of git://github.com/aolley/moodle 2013-10-08 13:21:30 +08:00
Damyon Wiese
b242214269 Merge branch 'MDL-42122' of git://github.com/aolley/moodle 2013-10-08 12:48:10 +08:00
Damyon Wiese
944cfe1dec Merge branch 'MDL-40962-master' of git://github.com/ankitagarwal/moodle 2013-10-08 12:45:43 +08:00
Sam Hemelryk
ff8e257867 Merge branch 'MDL-40046-master' of git://github.com/ankitagarwal/moodle 2013-10-08 16:04:05 +13:00
Damyon Wiese
9e950187d5 MDL-23692 login: Revert change to files copyright 2013-10-08 10:31:56 +08:00
Damyon Wiese
18ef6201c0 Merge branch 'passwordreset-2013-10-07-1031Z' of https://github.com/peterbulmer/moodle 
Conflicts:
	lib/db/install.xml
	lib/db/upgrade.php
	version.php
 2013-10-08 10:30:57 +08:00
Sam Hemelryk
cbf34f34cc Merge branch 'MDL-32188' of git://github.com/timhunt/moodle 
Conflicts:
	lib/db/upgrade.php
 2013-10-08 14:43:36 +13:00