Commit graph

75230 commits

Author SHA1 Message Date
Alistair Spark
8b40604ab9 MDL-50391 format_singleactivity: fix LTI Tool opens in existing window 2015-08-13 14:13:02 +01:00
Marina Glancy
3bacf558d1 MDL-50391 format_singleactivity: fix activity_has_subtypes() 2015-08-13 14:13:02 +01:00
Dan Poltawski
5f92c736e3 MDL-51110 badges: prevent duplicate award of badges
Previously duplicate users could be returned when they had
done duplicate badge criteria - this would lead to a duplicate
constraint being hit as they were attempted to be awarded twice.
2015-08-13 13:21:03 +01:00
Eloy Lafuente (stronk7)
dda862abb5 weekly release 3.0dev 2015-08-13 12:16:31 +02:00
Eloy Lafuente (stronk7)
2e446e9443 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2015-08-13 12:16:24 +02:00
Marina Glancy
ddf4e69762 MDL-50923 theme: add missing content-only css class 2015-08-13 16:55:18 +08:00
Andrew Nicols
d245f6757d MDL-51102 behat: Add a non-JS version of wait 2015-08-13 15:56:22 +08:00
Rajesh Taneja
3d3d2ae529 MDL-51106 behat: Fixed misuse of javascript tag 2015-08-13 13:23:15 +08:00
Andrew Nicols
ff89d94a6f MDL-51100 behat: Remove javascript tag where not required
These tests only needed the javascript tag because of the user menu.
Now that issue has been resolved, they do not need it.

Note: Some were also not using the singleselect feature, so would fail
without changes to use this too as they were not handling proper selection
of the singleselect element.
2015-08-13 13:12:28 +08:00
Marina Glancy
1165cab2b3 MDL-51095 enrol_meta: add missing include
Thanks to Shaun Meyer for providing a patch
2015-08-13 12:29:24 +08:00
Marina Glancy
a039418383 MDL-50303 cache: removed unused cache definition 2015-08-13 11:56:53 +08:00
Andrew Nicols
317fd6fe56 MDL-51100 behat: Correct javascript requirement of user menu step 2015-08-13 08:35:17 +08:00
Eloy Lafuente (stronk7)
28a614a83f Merge branch 'MDL-50371' of https://github.com/danielneis/moodle 2015-08-13 00:38:41 +02:00
AMOS bot
0cbc507b6d Automatically generated installer lang files 2015-08-13 00:04:21 +08:00
AMOS bot
61331bd1ee Automatically generated installer lang files 2015-08-13 00:04:21 +08:00
Skylar Kelty
e074ef4c52 MDL-50920 enrol: Remove pointless DB update in enrol_meta 2015-08-12 11:52:24 +01:00
Marina Glancy
f711237e05 MDL-50791 auth: add heading on signup form page 2015-08-12 13:23:30 +08:00
Marina Glancy
a3c9174b3d MDL-50791 forms: make server validation errors accessible 2015-08-12 13:23:08 +08:00
Marina Glancy
bd7a0fd38b MDL-51087 auth: user client side validation in signup 2015-08-12 13:06:58 +08:00
David Monllao
01fdb048cf Merge branch 'MDL-46860-master' of git://github.com/ryanwyllie/moodle 2015-08-12 10:45:29 +08:00
David Monllao
6413794018 Merge branch 'MDL-37864-master' of git://github.com/xow/moodle 2015-08-12 09:35:46 +08:00
David Monllao
819ab257f7 Merge branch 'MDL-46321-master' of git://github.com/tonyjbutler/moodle 2015-08-12 08:49:14 +08:00
David Monllao
c68b32067e MDL-50839 user: realuseravatar should also read avatarsize 2015-08-12 08:39:07 +08:00
David Monllao
f2e50523d1 Merge branch 'MDL-50839-master' of git://github.com/Dave-B/moodle 2015-08-12 08:32:11 +08:00
David Monllao
3718d2cd17 Merge branch 'MDL-50947_master' of git://github.com/moodlerooms/moodle 2015-08-12 08:30:03 +08:00
David Monllao
fb41850a3c Merge branch 'MDL-50720' of git://github.com/bostelm/moodle 2015-08-12 08:27:09 +08:00
David Monllao
ede96605ac Merge branch 'MDL-51053-master' of git://github.com/sammarshallou/moodle 2015-08-12 08:23:29 +08:00
Eloy Lafuente (stronk7)
20c50b0d5c Merge branch 'MDL-50062-master' of git://github.com/FMCorz/moodle 2015-08-12 01:52:04 +02:00
Eloy Lafuente (stronk7)
4da133199f Merge branch 'MDL-50430' of https://github.com/danielneis/moodle 2015-08-12 00:48:07 +02:00
Eloy Lafuente (stronk7)
1dce5c99c8 Merge branch 'MDL-50446-master' of git://github.com/ryanwyllie/moodle 2015-08-12 00:11:42 +02:00
Eloy Lafuente (stronk7)
b7759a1889 Merge branch 'MDL-50307-master-3' of git://github.com/xow/moodle 2015-08-11 23:44:50 +02:00
Eloy Lafuente (stronk7)
789d40a803 Merge branch 'MDL-49293-master' of git://github.com/andrewnicols/moodle 2015-08-11 22:58:09 +02:00
Eloy Lafuente (stronk7)
30deee105c Merge branch 'MDL-50642' of https://github.com/ecampbell/moodle 2015-08-11 22:32:11 +02:00
Sam Chaffee
5222ab7f4b MDL-50947 mod_lti Add removed grade.php to upgrade_stale_php_files_present 2015-08-11 10:42:08 -06:00
Sam Chaffee
4180d9706b MDL-50947 mod_lti Remove deprecated grade.php 2015-08-11 10:30:06 -06:00
Alain Benoit
acf543c413 MDL-50911 Quiz: edit settings page not responsive 2015-08-11 09:16:43 -04:00
sam marshall
27479b5cc9 MDL-51053 Restore: Static cache breaks unit tests 2015-08-11 14:07:38 +01:00
David Balch
9dcd50358a MDL-50839 user_menu: Allow themes to set User menu avatar size.
Added an @array "options" parameter to user_get_user_navigation_info(),
for passing in avatarsize, and possibly other options in future.

Also removed an errant parameter in the /lib/outputrenderers.php
user_get_user_navigation_info() call, as there was no corresponding
parameter in the function definition.

(Test written by Jetha Chan.)
2015-08-11 13:57:17 +01:00
Eloy Lafuente (stronk7)
1877b7551e Merge branch 'MDL-50894_master' of https://github.com/gedion/moodle 2015-08-11 14:18:34 +02:00
Eloy Lafuente (stronk7)
99c582a19f Merge branch 'master_MDL-51015' of git://github.com/danmarsden/moodle 2015-08-11 14:09:42 +02:00
Henning Bostelmann
0bec64c6a1 MDL-50720 mod_data: Highlight non-approved entries 2015-08-11 11:30:02 +01:00
Marina Glancy
afc6a26938 MDL-49746 course: sorting users by last access 2015-08-11 16:15:58 +08:00
Frederic Massart
c855ced7bb MDL-42634 theme: Action menu is displayed correctly with hidden elements 2015-08-11 14:45:59 +08:00
David Monllao
b84129b11e Merge branch 'MDL-50956' of git://github.com/bostelm/moodle 2015-08-11 13:20:11 +08:00
David Monllao
8c497d8d9f Merge branch 'MDL-51014-master' of git://github.com/sammarshallou/moodle 2015-08-11 13:08:11 +08:00
Marina Glancy
10c82ca307 MDL-50881 calendar: do not throw exception without sesskey 2015-08-11 12:50:41 +08:00
John Okely
dd106c8824 MDL-37864 lib: Change help for headers to match existing table api 2015-08-11 12:18:21 +08:00
Marina Glancy
edbea936c5 MDL-37864 lib: corrections to help icon in tables 2015-08-11 12:18:21 +08:00
Sergey Rozhkov
3fed76e4df MDL-37864 lib: Help icon work correctly in table header with sorting 2015-08-11 12:18:20 +08:00
John Okely
78a713685d MDL-50307 auth_db: Stop using AS to prevent error with some drivers 2015-08-11 12:11:43 +08:00