64752 Commits

Author SHA1 Message Date
Dan Poltawski
295e4fa8f4 MDL-29070 enrol_imsenterprise: more code cleanups
Including:
* fix whitespace
* coding style fixes:
* Declare method visibility
* Don't have variable names with underscores
* Comments without .
* if/for loop spacing
* Unused variables
* Split long lines
* Removed outdates files
* moodlecheck warnings
* code checker warnings
2013-10-23 17:10:56 +08:00
Brian Biggs
1ee378bbdc MDL-29070 enrol_imsenterprise: Code cleanup
In preparation for new features.
2013-10-23 17:10:35 +08:00
David Monllao
2a9275c4c5 MDL-40976 behat: Updating tests according to new behaviour
We only open the actions menu when is collapsed.
2013-10-23 16:19:33 +08:00
Rajesh Taneja
3f038d6d97 MDL-42283 Behat: Automated MDLQA-1777
MDLQA-1777: A teacher can set grade conditions to restrict availability of a section
2013-10-23 15:57:53 +08:00
Dan Poltawski
b8a5092f2e Merge branch 'MDL-42342-master' of git://github.com/ankitagarwal/moodle 2013-10-23 15:26:54 +08:00
Dan Poltawski
276c451b2a Merge branch 'MDL-42343_master' of git://github.com/dmonllao/moodle 2013-10-23 15:12:22 +08:00
Dan Poltawski
0f136c1a5b Merge branch 'MDL-42290-master' of git://github.com/ankitagarwal/moodle 2013-10-23 14:36:07 +08:00
Ankit Agarwal
b2b50d92f6 MDL-42219 quiz: Fix alternate name warnings in quiz
Fix the alternate name warning which is generated when submitting an attempt for a quiz
2013-10-23 14:36:00 +08:00
Marina Glancy
90eb4ddd9a Merge branch '42246-26' of git://github.com/samhemelryk/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-10-23 17:22:28 +11:00
Ankit Agarwal
b469c5e750 MDL-42220 quiz: Fix name fields warning in quiz
Fix warnings generated when manually grading a quiz attempts
2013-10-23 14:21:15 +08:00
Damyon Wiese
19becd541a Merge branch 'MDL-42210_master' of git://github.com/grabs/moodle 2013-10-23 14:06:04 +08:00
Damyon Wiese
db812f5e5a Merge branch 'w43_MDL-42208_m26_authunmask' of https://github.com/skodak/moodle 2013-10-23 13:37:24 +08:00
Petr Škoda
a668a7e420 MDL-42208 fix JS get_string usage and remove unnecessary params from auth password unmask init 2013-10-23 07:32:24 +02:00
Dan Poltawski
40f0a3abed Merge branch 'wip-MDL-42278-master' of git://github.com/marinaglancy/moodle 2013-10-23 13:20:08 +08:00
Dan Poltawski
8c8a844f2b Merge branch '42277-26' of git://github.com/samhemelryk/moodle 2013-10-23 13:18:45 +08:00
Dan Poltawski
d0041fb110 Merge branch 'w43_MDL-38743_m26_private' of https://github.com/skodak/moodle 2013-10-23 13:15:48 +08:00
rwijaya
5639454509 MDL-41251 forum_mod: add aria label and role to forum discussion page for accessibility purpose.
Thanks to Nate Baxley for creating the original patch.
2013-10-23 12:43:35 +08:00
Dan Poltawski
de3d8fda10 Merge branch 'MDL-40531' of https://github.com/stronk7/moodle 2013-10-23 12:37:45 +08:00
Marina Glancy
d82a3b9f76 Merge branch 'MDL-42427-master' of git://github.com/ankitagarwal/moodle 2013-10-23 15:34:47 +11:00
Ankit Agarwal
f3218d15b0 MDL-42427 backup: Fix undefined errors during automated backups 2013-10-23 12:03:13 +08:00
Damyon Wiese
f45d62e792 MDL-41339 Tags - use uppercase for SQL keywords (AS) 2013-10-23 12:00:01 +08:00
Damyon Wiese
549ce3fa76 Merge branch 'wip-mdl-41339' of https://github.com/jennymgray/moodle 2013-10-23 11:50:50 +08:00
Marina Glancy
ab864f2c36 Merge branch 'MDL-42426-master' of git://github.com/damyon/moodle 2013-10-23 13:59:50 +11:00
Marina Glancy
4f10bc6bb0 Merge branch '42301-26' of git://github.com/samhemelryk/moodle 2013-10-23 13:51:00 +11:00
Marina Glancy
63e77f410d Merge branch 'w43_MDL-42414_m26_rev' of https://github.com/skodak/moodle 2013-10-23 13:11:13 +11:00
Marina Glancy
c5df0a63bc Merge branch '42170-26' of git://github.com/samhemelryk/moodle 2013-10-23 11:43:23 +11:00
Marina Glancy
f9c86035c9 Merge branch '42316-26' of git://github.com/samhemelryk/moodle 2013-10-23 11:05:59 +11:00
Marina Glancy
0d7b312247 MDL-42486 enrol: fixed bug in URL on manage enrol plugins page 2013-10-23 10:44:22 +11:00
Marina Glancy
295825feb6 Merge branch 'w43_MDL-37813_m26_filterall' of https://github.com/skodak/moodle 2013-10-23 10:17:00 +11:00
Davo Smith
6e67d80d50 MDL-42482 assignfeedback_editpdf - prevent blank comments from disappearing when the menu is opened 2013-10-22 18:26:44 +01:00
Dan Poltawski
34fb3545ea on demand release 2.6beta+
Thanks to all who entered the competition to find the mistake in the
last commit. It was spotted by none other than super-awesome Moodler
Justin Filip.

He collects a beer from me at our next available meeting.
2013-10-22 23:05:02 +08:00
Davo Smith
114913e31f MDL-42352 assignfeedback_editpdf - prevent scrolling when clicking on buttons 2013-10-22 15:09:15 +01:00
Dan Poltawski
129ceb5849 on demand release 2.5beta+ 2013-10-22 20:52:44 +08:00
Dan Poltawski
174df12acb Merge branch 'install_master' of git://git.moodle.org/moodle-install 2013-10-22 20:51:30 +08:00
Jerome Mouneyrac
6bdb788679 MDL-24380 Chat: autoscroll help popup incorrect and doesn't display fully 2013-10-22 12:35:23 +02:00
Dan Poltawski
8c3ebb1a9f Merge branch 'w43_MDL-42440_m26_authenable' of https://github.com/skodak/moodle 2013-10-22 12:16:53 +02:00
Dan Poltawski
2d79065013 Merge branch 'MDL-42112-master' of git://github.com/damyon/moodle 2013-10-22 12:16:53 +02:00
Dan Poltawski
6f4747d7b4 Merge branch 'MDL-42340-master' of git://github.com/andrewnicols/moodle
Conflicts:
	lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
	theme/bootstrapbase/style/moodle.css
2013-10-22 12:16:50 +02:00
Dan Poltawski
d4256630e7 Merge branch '40976-26' of git://github.com/samhemelryk/moodle 2013-10-22 12:14:41 +02:00
Dan Poltawski
3481222e57 MDL-42459 upgrade: fix upgrade step ordering
Also incremented version to be safe
2013-10-22 12:14:40 +02:00
Eloy Lafuente (stronk7)
bf928b2933 Merge branch 'MDL-42459-master' of git://github.com/damyon/moodle
Conflicts:
	version.php
2013-10-22 12:14:29 +02:00
Dan Poltawski
a8261e2830 Merge branch 'MDL-29441-master' of git://github.com/andrewnicols/moodle 2013-10-22 12:11:48 +02:00
Dan Poltawski
0c7c5e767c Merge branch 'MDL-42115-master' of git://github.com/jamiepratt/moodle 2013-10-22 12:11:45 +02:00
Dan Poltawski
616e57d926 Merge branch 'MDL-40045_master' of https://github.com/markn86/moodle 2013-10-22 12:11:45 +02:00
Marina Glancy
a90e023b4a Merge branch 'MDL-26170_rss' of https://github.com/andyjdavis/moodle 2013-10-22 12:11:44 +02:00
Dan Poltawski
59dca9505b Merge branch 'wip-mdl-31405-new' of git://github.com/rajeshtaneja/moodle 2013-10-22 12:11:42 +02:00
Dan Poltawski
181b0b3c3e Merge branch 'MDL-42117-master' of git://github.com/andrewnicols/moodle 2013-10-22 12:11:42 +02:00
Damyon Wiese
775a32c9b8 MDL-42459 Atto: Bye bye - see you in the plugins db! 2013-10-22 12:01:56 +08:00
Andrew Davis
54eb02a45c MDL-26170 RSS: fixed RSS cache clearing when items are deleted 2013-10-22 10:29:05 +07:00
Andrew Nicols
d5367fb566 MDL-42117 JavaScript: Ensure that new activities are fully set up
We don't need to set up anything specifically for toolboxes any more, but
other third-party JS may require additional setup following new module
creation.
2013-10-22 11:26:44 +08:00