11918 Commits

Author SHA1 Message Date
Rajesh Taneja
86b0e3b308 MDL-40058 Events: Replaced add_to_log for page comments to event 2013-12-11 13:53:00 +11:00
Sam Hemelryk
e453c70d14 Merge branch 'MDL-42932_master' of https://github.com/markn86/moodle 2013-12-11 12:30:26 +13:00
Eloy Lafuente (stronk7)
1c432ae6e1 Merge branch 'wip-MDL-43135' of https://github.com/jennymgray/moodle 2013-12-10 19:43:33 +01:00
Jenny Gray
a080716fa6 MDL-43135 Lang: removed redundant opentoguests 2013-12-10 11:05:22 +00:00
Mark Nelson
8bf0f20795 MDL-42932 core_calendar: introduced calendar type system setting 2013-12-09 18:40:46 -08:00
Ankit Agarwal
bad8b60009 MDL-43044 events: Add a course_module_instance_list_viewed abstract class 2013-12-06 13:18:50 +08:00
Dan Poltawski
d22147667d Merge branch 'wip-mdl-42597' of https://github.com/rajeshtaneja/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-12-04 08:53:25 +08:00
Rajesh Taneja
f487a8f825 MDL-42597 Administration: Modified maintenance mode countdown to display nicely
Added Style and JS to display maintenance mode timer similar
to what is done on moodle demo site for rest.
2013-12-04 08:31:56 +08:00
Eloy Lafuente (stronk7)
2574b28b81 Merge branch 'w49_MDL-43117_m27_releaseinfo' of https://github.com/skodak/moodle 2013-12-03 23:45:54 +01:00
Eloy Lafuente (stronk7)
200fcba737 Merge branch 'MDL-43142_master' of https://github.com/markn86/moodle 2013-12-03 23:40:19 +01:00
Sam Hemelryk
4f13423663 Merge branch 'wip-mdl-40079' of git://github.com/rajeshtaneja/moodle 2013-12-04 09:49:29 +13:00
Damyon Wiese
53741d32a6 Merge branch 'MDL-42962-master' of git://github.com/ankitagarwal/moodle 2013-12-03 15:15:25 +08:00
Dan Poltawski
6ca388028e Revert "MDL-42932 core_calendar: introduced calendar type system setting"
This reverts commit bb32a499e10abc3bb88e715fb0575e5b7fb66e8e.
2013-12-03 14:57:10 +08:00
Ankit Agarwal
df2ac49f72 MDL-42962 events: Add a abstract class course_module_viewed
AMOS BEGIN
 CPY [eventcoursemoduleviewed,core],[eventcoursemoduleviewed,mod_feedback]
AMOS END
2013-12-03 14:24:31 +08:00
Dan Poltawski
8d8e6f9607 Merge branch 'MDL-42932_master' of https://github.com/markn86/moodle 2013-12-03 10:07:10 +08:00
Damyon Wiese
13410584be Merge branch 'MDL-40939-master' of https://github.com/timgus/moodle
Conflicts:
	filter/tex/version.php
	lang/en/admin.php
2013-12-03 09:26:58 +08:00
Sam Hemelryk
a59a423926 Merge branch 'MDL-42084-master' of git://github.com/sammarshallou/moodle 2013-12-03 11:12:34 +13:00
Damyon Wiese
df68e73824 Merge branch 'MDL-40040-master' of git://github.com/ankitagarwal/moodle 2013-12-02 12:16:59 +08:00
Ankit Agarwal
6b36411587 MDL-40040 Cleanup some blog methods and replace add_to_log
Cleaned up add_association()
cleaned up add_associations()
Replaced remaining add_to_log() in blogs with events
2013-12-02 12:06:32 +08:00
Rajesh Taneja
c1b3ac4358 MDL-40079 repositories: Replaced const with configs 2013-12-02 09:41:41 +08:00
Damyon Wiese
ecfbb657f3 Merge branch '43033-27' of git://github.com/samhemelryk/moodle 2013-12-02 09:33:39 +08:00
Sam Hemelryk
06ef842707 Merge branch 'wip-mdl-33618' of https://github.com/rajeshtaneja/moodle 2013-12-02 10:35:46 +13:00
Sam Hemelryk
d31fd615eb MDL-43033 cache: added a warning icon for mappings
We now show a warning icon with an explanatory alt if the user
has mapped a store as a mode default that doesn't not fulfill the
requirements of every known definition.
2013-12-02 09:30:03 +13:00
Petr Škoda
2f98f5d541 MDL-43117 Add release column to Plugins Overview page
This patch is based on previous patch by Marko Vidberg, thanks a lot!
2013-12-01 18:57:49 +08:00
Mark Nelson
f9b4143a8e MDL-43142 mnet: fixed typo in variable passed to get_string 2013-11-29 14:15:07 -08:00
Damyon Wiese
e359857e41 Merge branch 'wip-MDL-43008-master' of git://github.com/abgreeve/moodle 2013-11-26 16:56:20 +08:00
Adrian Greeve
b404b1f41c MDL-43008 calendar: Allow calendar plugins to display setting pages. 2013-11-26 15:44:57 +08:00
Mark Nelson
bb32a499e1 MDL-42932 core_calendar: introduced calendar type system setting 2013-11-25 23:11:17 -08:00
Dan Poltawski
25da2fe065 Merge branch 'wip-MDL-42925-master' of git://github.com/marinaglancy/moodle 2013-11-25 15:43:44 +08:00
Marina Glancy
60261b8c59 MDL-42925 course: Changed help string for course format selection 2013-11-21 13:29:31 +11:00
Rajesh Taneja
fd0f7ac5c2 MDL-33618 Messages: Added support to disable message provider 2013-11-21 09:40:34 +08:00
Adrian Greeve
a2071fbf7c MDL-42850 administration: Updated bulk user upload errors to be more descriptive. 2013-11-18 11:36:16 +08:00
Petr Škoda
ea7aa014f9 MDL-42860 improve db session help string 2013-11-13 10:54:15 +01:00
Sam Hemelryk
aa861f6297 MDL-42832 course: management viewmode string improvements 2013-11-12 15:32:59 +08:00
Marina Glancy
b544b09636 Merge branch 'MDL-42824-master-int' of git://github.com/FMCorz/moodle 2013-11-12 15:00:57 +11:00
Sam Hemelryk
6f4a169d8e Merge branch 'MDL-42215_lang' of https://github.com/andyjdavis/moodle 2013-11-12 11:34:39 +08:00
Frederic Massart
eb59e0ed3b MDL-42824 backup: Typo in description of setting backup_general_questionbank 2013-11-12 08:51:44 +08:00
Sam Hemelryk
cd96b7d3e4 MDL-41392 course: management checkbox accessibility improvement 2013-11-11 17:10:14 +08:00
Sam Hemelryk
d0647301a0 MDL-41392 course: management accessibility tweaking 2013-11-11 17:09:44 +08:00
Damyon Wiese
d5c0f0453c Merge branch 'MDL-39923_master' of https://github.com/totara/openbadges
Conflicts:
	version.php
2013-11-11 10:17:07 +08:00
Yuliya Bozhko
f5d17c14ea MDL-39923 badges: Send badge messages through internal messaging system 2013-11-07 14:49:27 +13:00
Dan Poltawski
02c6bd358f Merge branch 'MDL-42728-en_fix' of git://github.com/mudrd8mz/moodle
Conflicts:
	lang/en/moodle.php
2013-11-07 09:34:31 +08:00
sam marshall
366b19a954 MDL-42084 Core: Create new static class for use instead of set_time_limit 2013-11-06 16:39:57 +00:00
sam marshall
3749c94627 MDL-42714 Backup: For tgz packer, handle missing zlib extension 2013-11-06 12:34:46 +00:00
Damyon Wiese
951b414b65 Merge branch 'MDL-40975-master' of git://github.com/andrewnicols/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-11-06 13:06:01 +08:00
Andrew Nicols
d881e0bb84 MDL-40975 Course: Remove groupmode when forced at course level 2013-11-06 11:40:53 +08:00
Andrew Nicols
a83d83e42b MDL-40975 Course: Change which actions are in the menu and which are outside it 2013-11-06 11:40:49 +08:00
Helen Foster
5a25566060 MDL-42728 Merge English strings from the en_fix language pack 2013-11-05 23:41:44 +01:00
Sam Hemelryk
e69a0251dc MDL-42710 course: management cat sorting perfecting taking place 2013-11-05 21:52:45 +08:00
Sam Hemelryk
38a15200b9 MDL-42629 course: management peer-review alterations
* Added confirmation when bulk moving courses.
* Increased min-width of category course count to allow for 3 digits.
* Fixed sub-category => subcategory
* Renamed console JS vars to managementconsole
* Added typeof operator
* Renamed oldcatcourses and newcatcourses as suggested
* Added a span around course count and interacted with that.
* Fixed icon sizing
* Fixed management behat tests
* Fixed wrapping of strings in menus
2013-11-05 13:57:01 +08:00