68799 Commits

Author SHA1 Message Date
Mark Nelson
05c0d19a5d MDL-45381 mod_forum: updated unit tests for subscription created/deleted events 2014-06-30 23:32:43 -07:00
Mark Nelson
f09561cbb5 MDL-45381 mod_forum: changed event URL for subscription created/deleted events 2014-06-29 18:37:44 -07:00
Eloy Lafuente (stronk7)
7a4832ecb9 weekly release 2.8dev 2014-06-26 10:35:37 +02:00
Eloy Lafuente (stronk7)
2d2864d606 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2014-06-26 10:35:27 +02:00
Eloy Lafuente (stronk7)
078379a9aa Revert " MDL-45044 filter_tex: properly escape excutable pathnames for Windows"
This reverts commit f0da509835e3b8740c1693216a430dc3195cdb92.
2014-06-26 10:06:20 +02:00
Marina Glancy
d70fe4f8d9 Merge branch 'wip-mdl-46061' of git://github.com/rajeshtaneja/moodle 2014-06-26 10:26:59 +08:00
Rajesh Taneja
d7a0b72160 MDL-46061 behat: Fixed blur event problem for atto_image
atto_image look for blur event after changing width/height
Added a new step to get focus off the element, so this can
work.
2014-06-26 09:59:49 +08:00
Damyon Wiese
2b472c83b5 MDL-45983 Atto equation editor: Exclude phantomjs from this behat test because it's buggy 2014-06-25 15:04:20 +08:00
Damyon Wiese
c33634c7e4 Merge branch 'wip-mdl-43835' of https://github.com/rajeshtaneja/moodle 2014-06-25 13:55:19 +08:00
David Monllao
e20392edc0 MDL-42716 mod_assign: Lang str for the viewblinddetails capability 2014-06-25 13:20:41 +08:00
Rajesh Taneja
004d7e35b0 MDL-43835 behat: Use proper step for navigation expansion 2014-06-25 12:54:53 +08:00
Rajesh Taneja
6c396b6bb4 MDL-43835 behat: Added new step to set field with xpath defined 2014-06-25 12:54:52 +08:00
Rajesh Taneja
11f69d4165 MDL-43835 behat: Fixed backup behat test
Disabling section, disables all checkboxes in section,
So we don't have to unset them manually
2014-06-25 12:54:52 +08:00
Rajesh Taneja
955118d831 MDL-43835 behat: Fixed matches for select form field 2014-06-25 12:54:52 +08:00
Eloy Lafuente (stronk7)
7c74cfe45c MDL-46031 output: remove leftover line 2014-06-25 03:05:24 +02:00
AMOS bot
de9b7ab5a4 Automatically generated installer lang files 2014-06-25 00:45:19 +00:00
AMOS bot
a7a7dc4770 Automatically generated installer lang files 2014-06-25 00:45:19 +00:00
Eloy Lafuente (stronk7)
0518b6a26a Merge branch 'MDL-28420_master' of https://github.com/jrchamp/moodle 2014-06-25 02:07:34 +02:00
Eloy Lafuente (stronk7)
eaa504cd67 Merge branch '43365-28' of git://github.com/samhemelryk/moodle 2014-06-25 01:35:17 +02:00
Eloy Lafuente (stronk7)
8b8c78946f Merge branch 'MDL-46079-master' of https://github.com/sammarshallou/moodle 2014-06-25 01:32:11 +02:00
Eloy Lafuente (stronk7)
025fa4fc74 Merge branch 'MDL-45645_LTIUsernameParam' of https://github.com/moodlerooms/moodle 2014-06-25 01:28:35 +02:00
Sam Hemelryk
78c12cdb0f MDL-43365 lib: converted text and plugin deprecated classes to new scheme
Four core library classes renamed for autoloading with deprecated stubs
have been converted to the new scheme for autoloading.
They are:

 * textlib
 * collatorlib
 * plugin_manager
 * plugininfo_base

These will be removed in 2.9 by MDL-46124
2014-06-25 09:30:38 +12:00
Sam Hemelryk
37e600076d MDL-43365 lib: added better means of renaming classes for autoloading
I've added a better means of renaming classes for autoloading and
handling the deprecation of the original class name.
This system records renamed classes in db/renamedclasses.php and
when a renamed class is requested a debugging notice is printed
and a class alias is created so that the calling code both works
and is informed of the deprecation.
2014-06-25 09:28:30 +12:00
Eloy Lafuente (stronk7)
c45754d840 Merge branch 'MDL-45445_master' of https://github.com/markn86/moodle 2014-06-24 21:54:58 +02:00
Eloy Lafuente (stronk7)
85ee901b5e MDL-46045 whitespace fix 2014-06-24 21:50:05 +02:00
Eloy Lafuente (stronk7)
046930cfba Merge branch 'MDL-46045-master' of git://github.com/damyon/moodle 2014-06-24 21:48:30 +02:00
Eloy Lafuente (stronk7)
e5d7c55151 Merge branch 'MDL-41258-master' of git://github.com/andrewnicols/moodle
Conflicts:
	mod/forum/tests/maildigest_test.php
2014-06-24 20:25:58 +02:00
Damyon Wiese
dd6279788d Merge branch 'MDL-45652_master' of https://github.com/markn86/moodle 2014-06-24 16:58:04 +08:00
Marina Glancy
89d91403f9 Merge branch 'MDL-1626-master' of git://github.com/andrewnicols/moodle 2014-06-24 16:14:31 +08:00
Damyon Wiese
582abd9414 Merge branch 'MDL-10115-master' of git://github.com/xow/moodle 2014-06-24 16:03:21 +08:00
John Okely
3e40c056e8 MDL-10115 User profile: Use title to aid in the ellipsis link being understood by screen readers 2014-06-24 15:38:15 +08:00
Andrew Nicols
ca14c76f3b MDL-1626 mod_forum: Correct SQL syntax when fetching subscriptions 2014-06-24 14:48:23 +08:00
Damyon Wiese
2ef26ad94f Merge branch 'wip_MDL-45985_m28_dbschema' of https://github.com/skodak/moodle 2014-06-24 14:19:20 +08:00
Damyon Wiese
d9640a99ba Merge branch 'MDL-46022-master' of git://github.com/jethac/moodle
Conflicts:
	theme/bootstrapbase/less/moodle/modules.less
	theme/bootstrapbase/style/moodle.css
2014-06-24 14:10:51 +08:00
Damyon Wiese
e9018b50a2 Merge branch 'MDL-46031' of git://github.com/timhunt/moodle 2014-06-24 14:05:54 +08:00
Marina Glancy
9cd5966168 Merge branch 'MDL-45933-master' of git://github.com/damyon/moodle 2014-06-24 13:52:30 +08:00
Marina Glancy
8d879f3928 Merge branch 'MDL-45983-master' of git://github.com/damyon/moodle 2014-06-24 13:51:30 +08:00
Marina Glancy
bb9fd6b29d Merge branch 'MDL-41448-master' of git://github.com/damyon/moodle 2014-06-24 13:51:20 +08:00
Damyon Wiese
c10fa5da47 MDL-41448 Assign: Add note to theme/upgrade.txt about CSS changes in mod_assign 2014-06-24 13:43:42 +08:00
Damyon Wiese
e70f8d0a30 MDL-41448 assign: Fix all plugin styles - they should be restricted to mod assign pages. 2014-06-24 13:42:53 +08:00
Marina Glancy
5c5d182301 Merge branch 'MDL-46061-master' of git://github.com/FMCorz/moodle 2014-06-24 13:32:13 +08:00
Marina Glancy
245697d7bd Merge branch 'MDL-45044-master' of git://github.com/dthies/moodle 2014-06-24 13:28:51 +08:00
Damyon Wiese
2b48432da2 Merge branch 'wip-MDL-46038-master' of git://github.com/marinaglancy/moodle 2014-06-24 13:10:32 +08:00
Damyon Wiese
b63bf750bd Merge branch 'MDL-46035_survey' of https://github.com/andyjdavis/moodle 2014-06-24 13:07:57 +08:00
Marina Glancy
e28d6b29dc MDL-42716 assign: whitespace fix 2014-06-24 13:04:49 +08:00
Michael Hughes
323f221b11 MDL-42716 Assign: Implemented capability based viewing of blind details (squashed) 2014-06-24 12:27:10 +08:00
Andrew Nicols
035746504a MDL-1626 mod_forum: Update discussion subscriptions when moving discussions 2014-06-24 12:16:34 +08:00
Andrew Nicols
ebfb73db7b MDL-1626 mod_forum: Update user interface to reflect per-discussion subscriptions
AMOS BEGIN
  MOV [forcessubscribe,mod_forum],[forcesubscribed,mod_forum]
AMOS END
2014-06-24 12:16:34 +08:00
Barbara Ramiro
a42d781864 MDL-1626 mod_forum: Add icons for subscription status 2014-06-24 12:16:34 +08:00
Andrew Nicols
49566c8a67 MDL-1626 mod_forum: Make cron handle discussion subscriptions 2014-06-24 12:16:34 +08:00