mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-21 16:10:15 +01:00
Code Issues Projects Releases Wiki Activity
82,658 Commits 36 Branches 527 Tags
Commit Graph

82658 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
Juan Leyva
7440c7b298 MDL-50542 mod_label: New WS mod_label_get_labels_by_courses 2017-01-11 10:36:39 +01:00
Juan Leyva
c76d5fd63e MDL-50549 mod_url: New WS mod_url_get_urls_by_courses 2017-01-11 10:28:05 +01:00
Eloy Lafuente (stronk7)
777361983c Merge branch 'wip-mdl-56519-m' of https://github.com/rajeshtaneja/moodle 2017-01-11 02:42:29 +01:00
Eloy Lafuente (stronk7)
122c3aff5c Merge branch 'wip-mdl-57595' of https://github.com/rajeshtaneja/moodle 2017-01-11 02:29:49 +01:00
Eloy Lafuente (stronk7)
e238dcc8b2 MDL-57572 redis: Prevent installation to fail on sites without redis 2017-01-11 02:22:48 +01:00
Eloy Lafuente (stronk7)
7bdbad80d8 Merge branch 'MDL-57572-master' of https://github.com/mwehr/moodle 2017-01-10 19:25:44 +01:00
sam marshall
66234de24c MDL-57515 Resource: 'not very efficient' with a large number of files 
Fixes bug where the resource module loads metadata for all files while
building course modinfo, even though it only needs the first file.
(This causes problems if you have ~10k files.)
 2017-01-10 17:43:46 +00:00
Eloy Lafuente (stronk7)
96733b06d6 Merge branch 'MDL-57282-master' of https://github.com/xow/moodle 2017-01-10 12:38:14 +01:00
Dan Poltawski
38425d9fee Merge branch 'MDL-57480-master' of https://github.com/snake/moodle 2017-01-10 08:40:10 +00:00
Marina Glancy
fdc6656a37 MDL-56271 mod_feedback: recaptcha was not working 2017-01-10 14:08:04 +08:00
David Monllao
b06f33d5cc Merge branch 'MDL-57149-master' of git://github.com/junpataleta/moodle 2017-01-10 06:23:03 +01:00
David Monllao
c9359c562c Merge branch 'MDL-57385-master-2' of git://github.com/junpataleta/moodle 2017-01-10 05:26:37 +01:00
Jun Pataleta
3adf4b1837 MDL-57149 admin: Make langimport page Bootstrap-compatible 
* Create template for the language import page.
* Apply Bootstrap classes to form elements.
* Use core notifications for displaying error/success messages.
 2017-01-10 10:24:17 +08:00
Jun Pataleta
ab1ca45eb0 MDL-57385 core: Set page layouts of non-mydashboard pages to standard 
The following pages are using the "mydashboard" page layout:
* User preferences > Badges > Manage badges
* User preferences > Badges > Backpack settings
* User preferences > Repositories > Manage instances
* Private files
However, the "mydashboard" page layout should only be used for the user's
dashboard page. Changing these to use the "standard" page layout.
 2017-01-10 09:44:13 +08:00
Jake Dallimore
865c4f5df9 MDL-57480 core_course: make drag and drop fire a dom updated event 
When adding media via drag and drop, the notifyFilterContentUpdated
event should be called after the item is added to the DOM. This allows
things like videojs for example, to process the new content.
 2017-01-10 07:42:52 +08:00
Dan Poltawski
feb75612a7 Merge branch 'MDL-57427' of https://github.com/jrchamp/moodle 2017-01-09 16:25:15 +00:00
sam marshall
b5f661b111 MDL-57601 Grade report: Error for ungraded quiz without view hidden 
If a course contains an ungraded quiz (max grade set to 0), and there
is a user account which can view the grader reports but does not have
permission to view hidden grades, they will get errors.
 2017-01-09 15:32:25 +00:00
Jonathan Champ
d3a6b91aec MDL-57427 cache: Use perfdebug only when enabled 2017-01-09 10:18:13 -05:00
David Monllao
461d6d390c Merge branch 'MDL-57392-master' of git://github.com/jleyva/moodle 2017-01-09 13:40:14 +01:00
David Monllao
2e87e3ce90 Merge branch 'wip-mdl-55042' of https://github.com/rajeshtaneja/moodle 2017-01-09 12:54:16 +01:00
Dan Poltawski
1975dcf25c Merge branch 'MDL-55461_atto_equation' of git://github.com/davosmith/moodle 2017-01-09 10:51:23 +00:00
Dan Poltawski
fc893bc42d Merge branch 'MDL-40132_31' of https://github.com/IvannavISer/moodle 2017-01-09 10:23:11 +00:00
Dan Poltawski
66677b7102 Merge branch 'wip-mdl-56211' of https://github.com/rajeshtaneja/moodle 2017-01-09 09:58:57 +00:00
Dan Poltawski
5445df2957 Merge branch 'MDL-57373-master' of git://github.com/ankitagarwal/moodle 2017-01-09 09:42:27 +00:00
Dan Poltawski
3b2c5923f2 Merge branch 'MDL-53367_master' of https://github.com/juancs/moodle 2017-01-09 08:27:18 +00:00
Dan Marsden
6c563ccedf MDL-45821 mod_scorm: Check lesson_status correctly for multi-sco. 2017-01-09 20:07:31 +13:00
Rajesh Taneja
5d2988fc8a
MDL-57595 behat: Added redirect and wait to ensure next step pass 2017-01-09 12:02:53 +08:00