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

18839 Commits

Author SHA1 Message Date
David Monllao
375b9ce0e7 Merge branch 'wip-MDL-57316-master' of git://github.com/marinaglancy/moodle 2017-02-08 13:11:28 +01:00
John Okely
1abd43763c MDL-57316 media: Setup media plugins in media_manager::instance() 2017-02-07 09:16:01 +08:00
Eloy Lafuente (stronk7)
470ae44956 Merge branch 'wip-mdl-57851' of https://github.com/rajeshtaneja/moodle 2017-02-07 01:26:03 +01:00
Dan Poltawski
808d652e81 Merge branch 'MDL-57660-master' of git://github.com/junpataleta/moodle 2017-02-06 13:46:50 +00:00
Rajesh Taneja
a30e1c3192
MDL-57851 behat: Add some more wait for scenario to pass 
On slow machine with phnatomjs profile
this scenario keeps failing. Add some more
wait to ensure the page is stable and next
step can be executed
 2017-02-03 12:53:24 +08:00
Eloy Lafuente (stronk7)
326cd6f661 Merge branch 'MDL-57592-master' of https://github.com/mwehr/moodle 2017-02-01 13:01:27 +08:00
Dan Poltawski
7a6b7f0b75 Merge branch 'MDL-57586-master' of https://github.com/nashtechdev01/moodle 2017-02-01 13:01:25 +08:00
Andrew Nicols
7a2121d7f2 Merge branch 'wip-MDL-57785-master' of git://github.com/amygroshek/moodle 2017-01-31 12:19:13 +08:00
Andrew Nicols
ca12fb5458 Merge branch 'master_MDL-56808' of git://github.com/danmarsden/moodle 2017-01-31 12:10:48 +08:00
wehr
f58861051f MDL-57592 assignment: Adds filtering of assignment name in grader view 2017-01-30 18:27:22 +01:00
Mike Churchward
559cfa03f4 MDL-36233 mod_assign: fixed submission time comparison sql and test. 2017-01-30 09:06:55 +08:00
Amy Groshek
c178ba7275 MDL-57785 scorm: Prevents SCORM nav refresh when nav not shown. 
This improvement prevents refresh of SCORM 1.2 navigation menu
when the navigation menu is not displayed.
 2017-01-27 09:11:16 -06:00
Jun Pataleta
1da58a1a75 MDL-57660 mod_forum: Preserve forum ID selection after form submission 2017-01-27 10:09:37 +08:00
Dan Marsden
e62e8545dc MDL-56808 scorm: remove some eval function that aren't needed. 2017-01-26 09:56:29 +13:00
Andrew Nicols
e0e5407e77 MDL-57550 mod_forum: Set dates to initial checkbox state 2017-01-25 14:04:47 +08:00
Eloy Lafuente (stronk7)
ae8e8e6aa1 Merge branch 'MDL-55915_master' of https://github.com/rezaies/moodle 2017-01-24 22:03:48 +01:00
Dan Poltawski
9f43d5052a Merge branch 'MDL-57639-master' of git://github.com/andrewnicols/moodle 2017-01-24 10:11:30 +00:00
Dan Poltawski
8120cbd939 Merge branch 'MDL-50539-master' of git://github.com/jleyva/moodle 2017-01-24 09:15:59 +00:00
Dan Poltawski
48034807ee Merge branch 'MDL-50545-master' of git://github.com/jleyva/moodle 2017-01-24 09:15:50 +00:00
Dan Poltawski
79b717ec04 Merge branch 'MDL-56449_assign_groups' of git://github.com/davosmith/moodle 2017-01-24 09:01:59 +00:00
Andrew Nicols
34dc92849f Merge branch 'MDL-57550-master' of git://github.com/danpoltawski/moodle 2017-01-24 14:57:53 +08:00
Andrew Nicols
d68d5ce337 Merge branch 'MDL-50547-master' of git://github.com/jleyva/moodle 2017-01-24 13:26:47 +08:00
Andrew Nicols
214eef2e1a Merge branch 'master_MDL-46782' of git://github.com/danmarsden/moodle 2017-01-24 08:47:54 +08:00
Dan Marsden
225965bd4f MDL-46782 mod_scorm: fix completion test, remove redundant test. 2017-01-24 13:05:50 +13:00
Dan Poltawski
4bd0a8a64a Merge branch 'wip-MDL-57511-master' of git://github.com/Beedell/moodle 2017-01-23 15:39:55 +00:00
Dan Poltawski
d602810fd5 Merge branch 'mdl57668-master' of https://github.com/tlock/moodle 2017-01-23 12:05:32 +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
1847d4c5ea MDL-57550 forum: fix template validation issues 
* Add some missing example contexts
* Stop using obsolete cell attributes
 2017-01-23 09:45:11 +00:00
Dan Poltawski
56882be67e MDL-57550 forum: remove legacy js file 2017-01-23 09:42:58 +00:00
Dan Poltawski
22526ad9ed MDL-57550 forum: remove legacy forum.js uses 
The search form options can be achieved in jquery rather than using
global js function/vars.

forum_get_subscribe_link legacylink had not been useful for some time
 2017-01-23 09:42:29 +00:00
Dan Poltawski
c7f9bbf6c1 Merge branch 'master_MDL-46782' of git://github.com/danmarsden/moodle 2017-01-23 09:28:32 +00:00
Pau Ferrer Ocaña
ef75a648c9 MDL-57737 glossary: Add entry description accepts HTML 2017-01-20 12:57:36 +01:00
Shamim Rezaie
05fdbe378a MDL-55915 mod_assign: let fullname() know if user has viewfullnames cap 
Instruct fullname() to format names on the assignment grading page with alternativefullnameformat when user
has moodle/site:viewfullnames capability.
 2017-01-20 20:28:57 +11:00
Juan Leyva
429cc9365e MDL-50547 mod_resource: New WS mod_resource_get_resources_by_courses 2017-01-20 09:47:11 +01:00
John Beedell
8b0d254f05 MDL-57511 Quiz: Attempts report shows non-unique debugging 2017-01-19 14:27:55 +00:00
Andrew Nicols
6c63574607 MDL-57639 mod_forum: Removed unused $forum param from tp function 2017-01-19 13:43:50 +08:00
Tim Lock
32a7986422 MDL-57668 mod_assign: Fix optional_param() form processing 2017-01-19 08:41:12 +10:30
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
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)
36102596d7 Merge branch 'MDL-57604-master' of git://github.com/danpoltawski/moodle 2017-01-18 01:10:45 +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
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
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