moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
76479 commits 37 branches 540 tags 1.3 GiB
Commit graph

76479 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
David Mudrák
ade03c067a MDL-52214 core: Fix case sensitivity in user agent comparison 
The previous 2.9 implementation of is_web_crawler() used stripos() in
certain cases. The unit tests re-added in the previous commit revealed
that certain crawlers (such as BaiDuSpider) were not correctly detected
in the new refactored implementation.

It seems lesser evil and safe enough to use /i in the regex search even
though it is not 100% same logic as before - as stripos() was used in
some cases only, not always.
 2015-11-23 09:44:43 +01:00
David Mudrák
182d9990f1 MDL-52214 core: Fix the is_web_crawler() regression 
In MDL-50891, the is_web_crawler() was refactored into a core_useragent
method and the function itself was deprecated. However, there were no
unit tests kept to check the backwards compatible behaviour. It turned
out that the deprecated function leads to PHP fatal error due to a typo.

This patch fixes the typo and brings back the previous unit tests. To be
able to explicitly check the raised debugging message, the test case
now must be subclass of advanced_testcase.

Additionally fixes missing info about the function being deprecated.
 2015-11-23 09:44:13 +01:00
David Monllao
965595d405 Merge branch 'MDL-52180-master' of git://github.com/danpoltawski/moodle 2015-11-23 16:40:26 +08:00
David Monllao
dca7e05dbf Merge branch 'MDL-52086' of git://github.com/bostelm/moodle 2015-11-23 16:10:25 +08:00
David Monllao
72dd7162e1 Merge branch 'MDL-52029-31' of git://github.com/vadimonus/moodle 2015-11-23 15:42:27 +08:00
David Monllao
5269e6002d Merge branch 'MDL-52160-master' of git://github.com/FMCorz/moodle 2015-11-23 14:07:21 +08:00
David Monllao
6f77b910ee Merge branch 'MDL-49490-master' of git://github.com/danpoltawski/moodle 2015-11-23 13:56:06 +08:00
David Monllao
6a82d5d04e Merge branch 'MDL-43069-master' of git://github.com/danpoltawski/moodle 2015-11-23 13:32:35 +08:00
Dan Poltawski
b58d059525 MDL-37834 assign: avoid newlines in status column of csv 
Previously we were generating a CSV file with newlines in it, which
seems to cause problems importing into some versions of MS Excel.

Instead seperate status lines by '-' - this column is only used to
provide context to the teacher in the spreadsheet.
 2015-11-20 18:36:30 +00:00
AMOS bot
67f357121a Automatically generated installer lang files 2015-11-21 00:04:07 +08:00
David Monllao
2af06c4cba MDL-52095 themes: Padding to the left on RTL langs 2015-11-20 10:03:38 +08:00
AMOS bot
6026e76349 Automatically generated installer lang files 2015-11-20 00:04:07 +08:00
Dan Poltawski
2b11b94c0c weekly on-sync release 3.1dev 2015-11-19 09:21:07 +00:00
Dan Poltawski
c8407f0109 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2015-11-19 09:21:04 +00:00
Eloy Lafuente (stronk7)
65b70071ca Merge branch 'wip-MDL-52203-master' of https://github.com/marinaglancy/moodle 2015-11-19 09:45:30 +01:00
Dan Poltawski
ef65a6a9c5 Merge branch 'MDL-42571_master-fix2' of git://github.com/dmonllao/moodle 2015-11-19 07:06:16 +00:00
David Monllao
c181efe978 MDL-42571 editpdf: Fix search comments 
They are also hidden instead of destroyed.
 2015-11-19 14:59:03 +08:00
Dan Poltawski
de1519002e Merge branch 'wip-MDL-52194-master' of https://github.com/marinaglancy/moodle 2015-11-19 06:47:30 +00:00
Dan Poltawski
78b2c65c0a Merge branch 'MDL-52162_master' of git://github.com/dmonllao/moodle 2015-11-19 06:33:54 +00:00
David Monllao
402f4a1f53 MDL-42571 editpdf: Fix comments search and multiple views drawing 2015-11-19 12:29:20 +08:00
Stephen Bourget
83f3ac5207 MDL-51097 Lesson: allow resume from within a cluster 2015-11-18 23:03:42 -05:00
Marina Glancy
3be59be349 MDL-52203 qtype_multianswer: avoid fatal error during upgrade 2015-11-19 11:06:48 +08:00
Henning Bostelmann
3847c105b0 MDL-52086 output renderers: show subtree only when tab is activated 2015-11-18 16:11:32 +00:00
AMOS bot
44c4d1406d Automatically generated installer lang files 2015-11-19 00:04:45 +08:00
Pavel Sokolov
4dab33b586 MDL-43069 assign: prevent JS error on grading table 
Previously submission comments failed to expand if you hid
the file submissions column.
 2015-11-18 15:41:42 +00:00
Dan Poltawski
65b26a461e MDL-45934 backup: do not reset completion enabled flag 
The 'completion enabled' flag does not reflect any course data, its a
course setting. Previously when doing a backup deleteting existing
course content this was forced off when it should not have been.
 2015-11-18 11:45:45 +00:00
Dan Poltawski
a49fca44e0 MDL-49490 assign: can't export to portfolio on non-submission 2015-11-18 09:10:20 +00:00
Juan Leyva
705afe6ffc MDL-52108 core_message: Move library inclusion outside the class methods 2015-11-18 09:52:29 +01:00
Marina Glancy
228f66ad7f MDL-52194 flowplayer: do not check request 
$_REQUEST variable may contain cookies in some php configurations. See also MDL-48085
 2015-11-18 15:35:55 +08:00
Marina Glancy
97562c4d7c MDL-52193 questions: add missing require_once 2015-11-18 13:33:34 +08:00
David Monllao
0519a1dabb MDL-52162 question: Removing unnecessary dependency 
APIs dependencies were correctly removed during MDL-38214 review although
this unnecessary require remained here.

Credit to Marina Glancy.
 2015-11-18 13:16:39 +08:00
Vadim Dvorovenko
626ff7c8b8 MDL-52029 installer: Unstyled installer if display_errors is on 
Error in MDL-43839 solution caused inclusion of unexistent file in
install/css.php.
 2015-11-18 08:44:04 +07:00
Dan Poltawski
14c855d8cd Merge branch 'MDL-52140' of git://github.com/stronk7/moodle 2015-11-17 16:27:42 +00:00
Eloy Lafuente (stronk7)
6d29c4acdd MDL-52140 upgrade: add 3.0.0 separation line to all upgrade scripts 2015-11-17 17:08:56 +01:00
Dan Poltawski
8c9dbacd79 MDL-52185 report: remove ugly bullet points 2015-11-17 15:33:58 +00:00
Dan Poltawski
09ca2e85c6 MDL-52180 travis: remove weekly release checker 
To prevent false positives
 2015-11-17 09:43:04 +00:00
Juan Leyva
4bc38ba96a MDL-51925 enrol: Support ordering in get_enrolled_users WS 2015-11-17 09:49:03 +01:00
Rajesh Taneja
8f76de32d9 MDL-50163 behat: Return subcontext from session 
Creating a new context with new mink context
with different session was keeping the session
and was not returning proper session information
 2015-11-17 13:27:10 +08:00
rajesh Taneja
131d4ac2b0 MDL-50163 behat: Restart session after scenario with switch_window 
Restart session after a scenario with switch window
is finished. This will close all open browser windows
and open a new browser window
 2015-11-17 12:12:03 +08:00