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

82705 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dan Poltawski
81b3aefc31 Merge branch 'wip-mdl-57700' of https://github.com/rajeshtaneja/moodle 2017-01-23 11:59:11 +00:00
Dan Poltawski
ee2af37e84 Merge branch 'MDL-57677-master-usermodified' of git://github.com/mudrd8mz/moodle 2017-01-23 09:48:11 +00:00
Dan Poltawski
c7f9bbf6c1 Merge branch 'master_MDL-46782' of git://github.com/danmarsden/moodle 2017-01-23 09:28:32 +00:00
Dan Poltawski
c44913b845 Merge branch 'MDL-57737-master' of git://github.com/crazyserver/moodle 2017-01-23 09:26:57 +00:00
Pau Ferrer Ocaña
ef75a648c9 MDL-57737 glossary: Add entry description accepts HTML 2017-01-20 12:57:36 +01:00
Rajesh Taneja
bb5671c21e
MDL-57700 behat: Updated behat to 3.3.0 and fixed exception 2017-01-20 11:01:50 +08:00
Andrew Nicols
5130953c8a weekly release 3.3dev 2017-01-19 12:17:46 +08:00
Andrew Nicols
80409ac1b5 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2017-01-19 12:17:44 +08:00
Andrew Nicols
59925af580 MDL-57613 enrol_lti: Correct location of upgrade step 2017-01-19 07:56:27 +08:00
Eloy Lafuente (stronk7)
121c17a72e MDL-57570 static store: Basic serialize tests with igbinary 
This unit test is not really verifying that internally igbinary
in being used but just igbinary availability and, by double
serializing, that it works for a semi-complex object.

The test will be skipped if igbinary is not available.
 2017-01-18 19:23:59 +01:00
Dan Marsden
4d3fb5b879 MDL-46782 mod_scorm: Load first incomplete sco on re-entry. 2017-01-18 21:02:56 +13:00
Andrew Nicols
22f1426b44 Merge branch 'MDL-57604-master' of git://github.com/danpoltawski/moodle 2017-01-18 16:00:06 +08:00
Dan Poltawski
fef5718182 MDL-57604 mod_assign: fix empty case in user selector 
Sadly the js arguments object gives an arguments.length of 1 when
no arguments are passed, so we have to explicitly check for it.
 2017-01-18 07:47:00 +00:00
Andrew Nicols
93c15c77d7 Merge branch 'wip-mdl-45821' of https://github.com/rajeshtaneja/moodle 2017-01-18 12:51:59 +08:00
Rajesh Taneja
01095dbfd6 MDL-45821 behat: navigate back to scorm to avoid scroll 
On Exiting scrom activity, it goes back to course
and scrolls to section. On slow machines next step
fails. To avoid such case navigate to home screen
and then follow next step.
 2017-01-18 12:46:11 +08:00
Andrew Nicols
81c226d451 Merge branch 'MDL-57634-m' of https://github.com/micaherne/moodle 2017-01-18 12:36:45 +08:00
Andrew Nicols
40566af6d5 Merge branch 'MDL-57490-master' of git://github.com/danpoltawski/moodle 2017-01-18 12:09:20 +08:00
Andrew Nicols
3dc3305936 Merge branch 'wip_MDL-57590_master_forum_search' of https://github.com/mchurchward/moodle 2017-01-18 08:36:58 +08:00
Eloy Lafuente (stronk7)
c5bd22b1ea Merge branch 'MDL-57570-master' of https://github.com/mwehr/moodle 2017-01-18 01:27:36 +01:00
Eloy Lafuente (stronk7)
36102596d7 Merge branch 'MDL-57604-master' of git://github.com/danpoltawski/moodle 2017-01-18 01:10:45 +01:00
Andrew Nicols
2156bb454c Merge branch 'MDL-42266_m33v2' of https://github.com/sbourget/moodle 2017-01-18 07:46:02 +08:00
Eloy Lafuente (stronk7)
d7cee87d24 Merge branch 'MDL-57488-master' of git://github.com/danpoltawski/moodle 2017-01-18 00:00:13 +01:00
Eloy Lafuente (stronk7)
6214e08f6a Merge branch 'MDL-57629-master' of git://github.com/jleyva/moodle 2017-01-17 20:55:05 +01:00
Eloy Lafuente (stronk7)
a7068a85bf Merge branch 'MDL-57409-master' of git://github.com/jleyva/moodle 2017-01-17 20:52:04 +01:00
Eloy Lafuente (stronk7)
4a237e932a Merge branch 'wip-MDL-57608-master-3' of git://github.com/marinaglancy/moodle 2017-01-17 20:40:48 +01:00
David Mudrák
106f23730a MDL-57677 mod_forum: Fix wrong user displayed as the last post's author 
In the recent issue MDL-56225, we started to record the current user as
the usermodified in the forum_discussions table when updating a forum
post. It made sense but it was a mistake.

Even if the current user really modifies the discussion by updating the
post, the field usermodified has actually been always interpreted and
displayed as the last post' author. Not as the last user who touched the
discussion.

This patch reverts that particular change to the previous behaviour and
adds explicit unit test for it.
 2017-01-17 19:45:17 +01:00
AMOS bot
bb408e0b2b Automatically generated installer lang files 2017-01-18 00:07:09 +08:00
Dan Poltawski
419b2f1741 Merge branch 'wip-mdl-57669-m' of https://github.com/rajeshtaneja/moodle 2017-01-17 10:28:31 +00:00
Dan Poltawski
bb72d31944 Merge branch 'MDL-57515-master' of https://github.com/sammarshallou/moodle 2017-01-17 10:20:08 +00:00
Dan Poltawski
5bd052f809 Merge branch 'MDL-50542-master' of git://github.com/jleyva/moodle 2017-01-17 07:32:38 +00:00
Dan Poltawski
fb0d86f671 Merge branch 'MDL-50549-master' of git://github.com/jleyva/moodle 2017-01-17 06:52:07 +00:00
Rajesh Taneja
ada21cb0c8
MDL-57669 behat: Exit with error code if step undefined 2017-01-17 10:30:45 +08:00
Dan Poltawski
cd0e2e89f2 Merge branch 'MDL-57368-master-2' of https://github.com/snake/moodle 2017-01-16 16:20:05 +00:00
Dan Poltawski
afcb080014 Merge branch 'MDL-57613-master' of https://github.com/xow/moodle 2017-01-16 16:17:09 +00:00
Mike Churchward
d679a45f73 MDL-57590 mod_forum: fixed search form with forumid and actionurl. 2017-01-16 11:13:03 -05:00
AMOS bot
4b19c44b4f Automatically generated installer lang files 2017-01-17 00:07:54 +08:00
Stephen Bourget
9820c67cf9 MDL-42266 Lib: Allow additional max upload file sizes 2017-01-16 10:54:33 -05:00
Dan Poltawski
7043676ec3 Merge branch 'MDL-57452_behat_completion_fix_master' of https://github.com/gthomas2/moodle 2017-01-16 13:34:06 +00:00
Dan Poltawski
f8abbbe29e MDL-57490 javascript-static: remove legacy functions 
1) Some previous deprecations are removed to reduce the amount of
 code sent to the client
2) Other very-old functions are also sent to final deprecation

This is more agressive than our standard deprecation process, but with
the nature of this old js it seems the best way forward to reduce the
amount of obsolete js sent to clients.
 2017-01-16 13:23:08 +00:00
Dan Poltawski
0ad39883b7 MDL-57490 lesson: convert legacy js to jquery 2017-01-16 13:22:50 +00:00
Dan Poltawski
d574114aed MDL-57490 scorm: convert legacy js to jquery 2017-01-16 13:22:50 +00:00
Dan Poltawski
6db06d0e2a MDL-57490 quiz: convert legacy js to jquery 2017-01-16 13:22:50 +00:00
Dan Poltawski
75cb891b5a Merge branch 'MDL-57601-master' of https://github.com/sammarshallou/moodle 2017-01-16 12:23:55 +00:00
Dan Poltawski
42d80f2b9d Merge branch 'MDL-57374_master' of https://github.com/dasistwas/moodle 2017-01-16 12:10:44 +00:00
Dan Poltawski
a04ad3675a Merge branch 'MDL-57554-master' of git://github.com/crazyserver/moodle 2017-01-16 11:17:58 +00:00
Dan Poltawski
41dd0ac8d4 Merge branch 'master_MDL-45821' of git://github.com/danmarsden/moodle 2017-01-16 08:57:52 +00:00
Dan Poltawski
0893bb0897 Merge branch 'MDL-57627-master' of git://github.com/crazyserver/moodle 2017-01-16 08:22:25 +00:00
David Monllao
a3936db57f Merge branch 'wip-mdl-57659' of https://github.com/rajeshtaneja/moodle 2017-01-16 09:09:53 +01:00
Dan Poltawski
bd17f93f28 Merge branch 'wip-MDL-56271-master' of git://github.com/marinaglancy/moodle 2017-01-16 08:01:23 +00:00
Rajesh Taneja
464a79ba6d
MDL-57659 cache: Set default serializer to SERIALIZER_PHP 2017-01-16 14:35:53 +08:00