moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-10 03:16:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
76161 commits 37 branches 544 tags 1.3 GiB
Commit graph

76161 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Monllao
0ee52b8214 Merge branch 'MDL-51830-master' of git://github.com/lucisgit/moodle 2015-12-03 11:11:04 +01:00
Dan Poltawski
3c2f70aeb6 Merge branch 'master_MDL-51757' of git://github.com/danmarsden/moodle 2015-12-03 11:11:04 +01:00
Dan Poltawski
c20577b9f2 Merge branch 'MDL-51925-master' of git://github.com/jleyva/moodle 2015-12-03 11:11:03 +01:00
David Monllao
00419a7a0b Merge branch 'MDL-52237-master' of git://github.com/StudiUM/moodle 2015-12-03 11:11:02 +01:00
Eloy Lafuente (stronk7)
e070165f57 Merge branch 'MDL-52219-master' of git://github.com/danpoltawski/moodle 2015-12-01 00:50:10 +01:00
Eloy Lafuente (stronk7)
71a2aaabd4 Merge branch 'MDL-44598_master' of https://github.com/jonof/moodle 2015-11-30 23:52:45 +01:00
Dan Poltawski
20232ed9a9 Merge branch 'MDL-52013-m' of https://github.com/micaherne/moodle 2015-11-30 15:42:58 +00:00
Dan Poltawski
92efb347b0 Merge branch 'MDL-52074-master' of git://github.com/jleyva/moodle 2015-11-30 15:29:29 +00:00
Dan Poltawski
ca593e5f69 Merge branch 'MDL-52108-master' of git://github.com/jleyva/moodle 2015-11-30 15:25:22 +00:00
Dan Poltawski
df64cfa624 Merge branch 'MDL-50661_master' of git://github.com/dmonllao/moodle 2015-11-30 13:50:22 +00:00
Dan Poltawski
8fea53a0b1 Merge branch 'MDL-51718-set-scheme' of https://github.com/brendanheywood/moodle 2015-11-30 13:37:47 +00:00
Dan Poltawski
1db15fe9a7 Merge branch 'MDL-52042-master' of git://github.com/ryanwyllie/moodle 2015-11-30 13:20:35 +00:00
Dan Poltawski
c2c97208f1 Merge branch 'MDL-51900_master' of https://github.com/jinhofer/moodle 2015-11-30 12:23:09 +00:00
Dan Poltawski
88f50b3551 Merge branch 'MDL-52283-master' of git://github.com/marinaglancy/moodle 2015-11-30 11:27:52 +00:00
Dan Poltawski
8ffdb1309c Merge branch 'MDL-52332-master' of git://github.com/marinaglancy/moodle 2015-11-30 10:23:07 +00:00
David Monllao
58fe694167 Merge branch 'MDL-51204_lang_coding_style' of git://github.com/andyjdavis/moodle 
Conflicts:
	lang/en/deprecated.txt
	lang/en/grades.php
 2015-11-30 15:52:46 +08:00
David Monllao
c256bac879 Merge branch 'MDL-35982-master' of git://github.com/danpoltawski/moodle 2015-11-30 15:45:44 +08:00
Marina Glancy
49f3c89324 MDL-52332 calendar: load settings using API 2015-11-30 11:36:50 +08:00
Rajesh Taneja
096b98ba34 MDL-52279 core_lib: Remove php4 style constructor 
filterobject is called from core and as it's
using php4 style constructor, global USER is
not set properly because of deprecation warning
 2015-11-30 11:25:55 +08:00
David Monllao
52d57db5c3 MDL-50661 theme_more: New small logo setting 
Adding required bits so theme_more can also set a small logo.
 2015-11-30 09:14:22 +08:00
David Monllao
c08b52aa74 MDL-50661 theme_clean: New small logo setting 
Introduces new settings to set a small logo in the navbar next
to the site name on pages where the logo is not displayed.
 2015-11-30 09:14:20 +08:00
jinhofer
c8b276a851 MDL-51900 grade/report/singleview: Added ctrl+arrow navigation 
Also, added functionality for tab to traverse down the columns and
shift+tab to traverse up the columns.
 2015-11-27 11:15:22 -06:00
Tony Levi
79d4558a58 MDL-52283 core: password_hash() deprecation in PHP7 2015-11-27 09:12:20 +08:00
Michael Aherne
72797e6845 MDL-52013 assign: Allow subplugins to add calendar events 2015-11-26 14:28:53 +00:00
Dan Poltawski
3e0f5665cf MDL-35982 behat: delete blog entry coverage 2015-11-26 14:10:25 +00:00
Dan Poltawski
366f05f323 MDL-35982 blog: improve the delete entry confirmation string 
So that there is more context about what is being deleted.
 2015-11-26 14:10:25 +00:00
Dan Poltawski
bf12b089e6 MDL-35982 blog: reorder blog delete confirmation 
Improves accessibility to be ordered logically in page
 2015-11-26 14:10:25 +00:00
Dan Poltawski
afb7ec92ff MDL-35982 blog: prevent index throwing errors with 0 courseid 
Regression from MDL-49845 where Dave made the page not handle courseid = 0
and so now some urls will send you back to a db error..
 2015-11-26 14:10:25 +00:00
Dan Poltawski
8be9cffb8b MDL-52219 phpunit: updated for new defaults 
The externallib assertion was previously never being run and had a typo..
 2015-11-26 14:07:17 +00:00
Dan Poltawski
aa306e7bc8 MDL-52219 behat: remove steps which turn on avaibility/completion 
Now its the default, we can reduce test time by relying on the default
state rather than going around turning it on
 2015-11-26 14:07:17 +00:00
Dan Poltawski
e354bf1e67 MDL-52219 admin: Enable completion and restricted access by default 2015-11-26 14:07:17 +00:00
David Monllao
c18acb8997 weekly on-sync release 3.1dev 2015-11-26 11:02:40 +08:00
David Monllao
0e3851ddd7 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2015-11-26 11:02:38 +08:00
AMOS bot
2d9950cfd5 Automatically generated installer lang files 2015-11-26 00:04:22 +08:00
Dan Poltawski
4e1648cc34 Merge branch 'MDL-52291' of git://github.com/stronk7/moodle 2015-11-25 11:22:17 +00:00
Frederic Massart
42dcfffc4f MDL-52160 navigation: Mark category and module settings nodes as branch 2015-11-25 13:03:25 +08:00
Tony Levi
72af939f6e MDL-51757 mod_scorm: Remove duplicate function param 
convert invalid break calls to exceptions for PHP 7
 2015-11-25 14:06:02 +13:00
Eloy Lafuente (stronk7)
e716c18fb9 MDL-52291 questions: fix upgrade from 2.5 and earlier 
Because of some changes performed to the multichoice qtype
for Moodle 2.6, older sites are not able to upgrade properly.

This commits does introduce DB introspection to decide which
table and column names must be used. Nasty but enough.

Note MDL-52298 has been created about to avoid/minimize the
chances of this happening again.
 2015-11-25 00:19:30 +01:00
AMOS bot
88a6b9fde3 Automatically generated installer lang files 2015-11-25 00:04:12 +08:00
David Monllao
c506af7786 Merge branch 'MDL-44330' of git://github.com/NeillM/moodle 2015-11-24 17:03:06 +08:00
David Monllao
2bc40fc889 Merge branch 'MDL-45934-master' of git://github.com/danpoltawski/moodle 2015-11-24 16:53:18 +08:00
Neill Magill
3fca693751 MDL-44330 Assign: Assignment grading may not display expected student 
Before this patch it was possible for the student displayed on the grading page to
not be the student that the user selected to grade. This would occur if:

1) The user had the table ordered by a value that could be modified,
   for example Last modified (submission), Grade, Last modified (grade)
2) Another user performed an action that was recorded in Moodle in the time
   between the user generating the table and clicking on a grade link.

If a user did not notice a different user had been loaded it could result in them giving
a grade to the incorrect user.

This patch ensures that the state of the table is cached every time it is viewed by a user
who has the capability to grade.
 2015-11-24 08:42:00 +00:00
Rajesh Taneja
a3f22d315f MDL-50163 behat: wait to ensure elements are placed properly by js. 2015-11-24 11:16:44 +08:00
Eloy Lafuente (stronk7)
6842738157 Merge branch 'MDL-52095_master' of git://github.com/dmonllao/moodle 2015-11-23 19:29:35 +01:00
Eloy Lafuente (stronk7)
11780411c6 Merge branch 'MDL-52185-master' of git://github.com/danpoltawski/moodle 2015-11-23 19:26:57 +01:00
Jean-Philippe Gaudreau
20dde5e674 MDL-52237 navigationlib: Plugins can extend navigation user profile 2015-11-23 11:04:44 -05:00
AMOS bot
45e4f75acd Automatically generated installer lang files 2015-11-24 00:04:21 +08:00
Dan Poltawski
14248189b7 Merge branch 'wip-mdl-50163' of https://github.com/rajeshtaneja/moodle 2015-11-23 11:33:55 +00:00
Dan Poltawski
6bef09a490 Merge branch 'MDL-52166' of https://github.com/timhunt/moodle 2015-11-23 09:43:31 +00:00
David Monllao
57d4e11334 Merge branch 'MDL-52214-master-crawler' of git://github.com/mudrd8mz/moodle 2015-11-23 17:00:24 +08:00