mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-26 18:42:40 +01:00
Code Issues Projects Releases Wiki Activity
82,896 Commits 36 Branches 527 Tags
Commit Graph

82896 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jake Dallimore
b167b415a3 MDL-57287 themes: fix buttons in default dashboard page header 
This fix modifies styling for pages having no navbar, such as the
dashboard, site home and default dashboard pages and fixes an overlap
problem with the buttons and context header.
 2017-01-17 14:47:08 +08: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
Dan Poltawski
97ac35c05f MDL-57488 js: remove M.util.focus_login_form/error 
These are replaced by some simple jquery instead.
 2017-01-15 20:42:35 +00:00
Pau Ferrer Ocaña
db3c9ff83f MDL-57554 forum: Mark as read on view_forum_discussion calls 2017-01-13 09:27:20 +01:00
Pau Ferrer Ocaña
4669389d1a MDL-57627 forum: Return if the user is tracking forum 2017-01-13 09:25:48 +01:00
John Okely
ab887f8de9 MDL-57613 enrol_lti: Allow longer nonces 2017-01-13 10:52:24 +08:00
David Bogner
726adbc22a MDL-57374 editor: Pasting plain text in Atto removes all styles/classes 2017-01-12 18:01:30 +01:00
AMOS bot
3482ddeda5 Automatically generated installer lang files 2017-01-13 00:05:06 +08:00
Michael Aherne
55b2a33ce1 MDL-57634 messaging: Ensure test uses a configured plugin 2017-01-12 12:30:39 +00:00
gthomas2
3982685a3c MDL-57452 behat: Make completion check work with manual completion input 2017-01-12 11:45:21 +00:00
Dan Poltawski
d97582fd27 weekly release 3.3dev 2017-01-12 07:42:26 +00:00
Dan Poltawski
25d6611788 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2017-01-12 07:42:24 +00:00
Jake Dallimore
195f646dfc MDL-57368 mod_feeback: fix drag and drop question reordering in boost 2017-01-12 11:32:03 +08:00
Jake Dallimore
a1f95d48b9 MDL-57368 templates: add example context to core_form/element-template 2017-01-12 11:31:47 +08:00
Dan Poltawski
da06c81947 MDL-57608 media_videojs: lazily load videojs on demand 
The videojs javascript is over 1MB of javascript which we don't need to
load on every page, now that we only require it demand, the js can be
lazily loaded when its needed, which keeps the first.js smaller and more
likely to stay in browser cache.
 2017-01-12 10:55:18 +08:00
Dan Poltawski
65b593a95c MDL-57608 media_videojs: fix third party locations 2017-01-12 10:55:18 +08:00
Marina Glancy
357e9654ba MDL-57608 media_videojs: load youtube module only when requested 2017-01-12 10:55:11 +08:00