Commit graph

66719 commits

Author SHA1 Message Date
Marina Glancy
7f051de21d MDL-40619 behat: test for creating a one-question quiz 2014-02-17 14:19:32 +08:00
Damyon Wiese
8053854592 Merge branch 'MDL-23514-master' of https://github.com/danielneis/moodle
Conflicts:
	lang/en/admin.php
2014-02-17 14:12:16 +08:00
Andrew Nicols
af64bc6179 MDL-33099 Javascript: Deprecate the ajaxenabled function 2014-02-17 14:11:21 +08:00
Dan Poltawski
97802bea3a MDL-40062 mod_forum: Add discussion_updated event 2014-02-17 14:07:14 +08:00
Dan Poltawski
a52c04d549 MDL-40062 mod_forum: add event unit tests
And bump forum version for new events.
2014-02-17 14:05:54 +08:00
Dan Poltawski
2d3f692bfe MDL-40062 mod_forum: post events
* post_created
* post_updated
* post_deleted

Prune post (split discussion) has been converted to multiple events as
splitting a post actually means new discussion created.
2014-02-17 14:05:54 +08:00
Dan Poltawski
e70ebc55f8 MDL-40062 mod_forum: read tracking events
* readtracking_enabled
* readtracking_disabled
2014-02-17 14:05:54 +08:00
Dan Poltawski
de2770501e MDL-40062 mod_forum: subscription events
Events for forum mail subscriptions

* subscription_created
* subscription_deleted
* subscribers_viewed
2014-02-17 14:05:54 +08:00
Dan Poltawski
71595d0053 MDL-40062 mod_forum: discussion events
* discussion_created
* discussion_deleted
* discussion_moved
* discussion_viewed
2014-02-17 14:05:53 +08:00
Damyon Wiese
09c7f57fd2 Merge branch 'MDL-40061_master' of https://github.com/markn86/moodle 2014-02-17 13:14:45 +08:00
Dan Poltawski
3b854e8c2a Merge branch 'MDL-42618_master' of git://github.com/SWiT/moodle 2014-02-17 12:13:39 +08:00
Dan Poltawski
35a8d26926 Merge branch 'MDL-27414' of git://github.com/jmvedrine/moodle 2014-02-17 12:06:42 +08:00
Andrew Nicols
2ae7e4ddd6 MDL-43504 Course: Include the course/category collapse JS correctly
This was previously only included when there were hidden categories to show
which were not yet visible. As a result, if all categories were visible,
then the JS was not included.
2014-02-17 11:33:52 +08:00
Andrew Nicols
b44b0fdab4 MDL-43504 Javascript: Frontpage collapsing should not depend on enableajax
This is an oversight, but we should not depend on the enableajax setting
which we're trying to deprecate.
2014-02-17 11:25:16 +08:00
Andrew Nicols
cfa770b47b MDL-43997 Javascript: Make all informative dialogues display correctly
Most of the moodle core dialogue types should be shown modally, and
centred. They should also be shown on instantiation.

Rather than re-define all of these settings, this patch introduces a new
subclass of M.core.dialogue which sets them up with the same settings.
2014-02-17 10:49:45 +08:00
Dan Poltawski
0a9f5b66c5 Merge branch 'MDL-42033' of git://github.com/jmvedrine/moodle 2014-02-17 10:32:33 +08:00
Dan Poltawski
2288139207 MDL-40062 mod_forum: convert viewed events
* course_module_instance_list_viewed
* forum_viewed
* course_searched
* userreport_viewed
2014-02-17 10:03:23 +08:00
Dan Poltawski
33c40cc633 MDL-40062 mod_forum: remove invalid add_to_log() calls
* debugging add_to_log() calls - the Moodle log is not the
  place for these kind of messages

* subscribeall/unsusbcribeall - now individual subscriptions
  will fire events, there is no need for a catch all.

* remove read tracking log entries - read tracking individual
  log entries do not provide enough reliable information, as
  the posts can be marked as read automatically after emailing
  or an expiry period.
2014-02-17 10:03:23 +08:00
Damyon Wiese
a47e7a1abb Merge branch 'MDL-44018' of git://github.com/timhunt/moodle 2014-02-17 09:14:46 +08:00
Sam Hemelryk
36520392d4 MDL-44196 theme_base: unified @package use and improved coding style 2014-02-17 11:28:49 +13:00
Sam Hemelryk
0ba796fdee MDL-44195 theme_arialist: unified @package use and improved coding style 2014-02-17 11:28:42 +13:00
Sam Hemelryk
83eb9e0e9d MDL-44194 theme_anomaly: unified @package use and improved coding style 2014-02-17 11:28:34 +13:00
Sam Hemelryk
9be1c873ff MDL-44212 theme_splash: unified @package use and improved coding style 2014-02-17 11:23:15 +13:00
fabmen
fcf2176098 MDL-43405 auth_ldap: Fixed issue with undefined variable: ldap_cookie 2014-02-16 14:22:48 -08:00
Sam Hemelryk
d8c1cddb95 MDL-44211 theme_sky_high: unified @package use and improved coding style 2014-02-17 11:22:44 +13:00
Sam Hemelryk
946e79de45 MDL-44210 theme_serenity: unified @package use and improved coding style 2014-02-17 11:22:10 +13:00
Sam Hemelryk
9ff4d3ef62 MDL-44209 theme_overlay: unified @package use and improved coding style 2014-02-17 11:21:42 +13:00
Sam Hemelryk
cb5e8d0e57 MDL-44208 theme_nonzero: unified @package use and improved coding style 2014-02-17 11:21:11 +13:00
Sam Hemelryk
6a0bb481ac MDL-44207 theme_nimble: unified @package use and improved coding style 2014-02-17 11:20:46 +13:00
Sam Hemelryk
3057d35003 MDL-44206 theme_magazine: unified @package use and improved coding style 2014-02-17 11:20:15 +13:00
Sam Hemelryk
5b43c2afe0 MDL-44205 theme_leatherbound: unified @package use and improved coding style 2014-02-17 11:19:47 +13:00
fabmen
c28694dc38 MDL-34319 auth_cas: Fixed issue with undefined variable: ldapconnection 2014-02-16 14:19:33 -08:00
Sam Hemelryk
3473a16d7a MDL-44204 theme_fusion: unified @package use and improved coding style 2014-02-17 11:19:18 +13:00
Sam Hemelryk
485f8eb3e0 MDL-44203 theme_formfactor: unified @package use and improved coding style 2014-02-17 11:18:50 +13:00
Sam Hemelryk
69f727f82b MDL-44202 theme_clean: unified @package use and improved coding style 2014-02-17 11:18:23 +13:00
Sam Hemelryk
3f4cec2195 MDL-44201 theme_canvas: unified @package use and improved coding style 2014-02-17 11:17:56 +13:00
Sam Hemelryk
35f3ab04ee MDL-44200 theme_brick: unified @package use and improved coding style 2014-02-17 11:17:31 +13:00
Sam Hemelryk
0338d88f63 MDL-44199 theme_boxxie: unified @package use and improved coding style 2014-02-17 11:16:59 +13:00
Sam Hemelryk
c5d91a5db4 MDL-44198 theme_bootstrapbase: unified @package use and improved coding style 2014-02-17 11:16:23 +13:00
Sam Hemelryk
2c8d8a6d8f MDL-44197 theme_binarius: unified @package use and improved coding style 2014-02-17 11:15:40 +13:00
Sam Hemelryk
b4f32f3d3b MDL-44193 theme_afterburner: unified @package use and improved coding style 2014-02-17 11:13:35 +13:00
Sam Hemelryk
afbd791a05 Merge branch 'MDL-44037_master' of git://github.com/dmonllao/moodle 2014-02-17 10:16:33 +13:00
Sam Hemelryk
487f74813e Merge branch 'MDL-42404_master' of git://github.com/dmonllao/moodle 2014-02-17 10:15:36 +13:00
Sam Hemelryk
1fa13df59e Merge branch 'MDL-44142-master' of git://github.com/mrverrall/moodle 2014-02-17 09:16:32 +13:00
Sam Hemelryk
fa52e6494d Merge branch 'MDL-44042-master' of git://github.com/andrewnicols/moodle
Conflicts:
	lib/yui/build/moodle-core-dragdrop/moodle-core-dragdrop-min.js
2014-02-17 09:06:58 +13:00
Sam Hemelryk
9e7fb3e848 Merge branch 'MDL-44055-master' of git://github.com/andrewnicols/moodle 2014-02-17 09:04:48 +13:00
Sam Hemelryk
87643ff599 Merge branch 'MDL-44079-master' of git://github.com/andrewnicols/moodle
Conflicts:
	lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
2014-02-17 08:48:39 +13:00
Sam Hemelryk
80ce7e1a8d Merge branch 'MDL-43979-master' of git://github.com/andrewnicols/moodle 2014-02-17 08:27:48 +13:00
Sam Hemelryk
37fdd9c051 MDL-44184 qtype_match: fixed @package typo 2014-02-17 08:06:15 +13:00
Jean-Michel Vedrine
624ff5ba57 MDL-42033 Files in subdirs not exported correctly by question XML format 2014-02-16 19:37:09 +01:00