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

82740 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
0db24a200a Merge branch 'MDL-49423-master' of git://github.com/jleyva/moodle 2017-01-24 19:05:51 +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
948aec4a09 Merge branch 'MDL-57667-master' of https://github.com/snake/moodle 2017-01-24 09:38:14 +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
6b8e5ce307 Merge branch 'MDL-57408-master' of git://github.com/jleyva/moodle 2017-01-24 13:01:45 +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
cffa0ec79b Merge branch 'wip_master_mdl-50625_ldap_better_check_paged_results_support' of https://github.com/iarenaza/moodle 2017-01-23 16:21:02 +00: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
e3ee9d4884 Merge branch 'MDL-57415_m33v1' of https://github.com/sbourget/moodle 2017-01-23 12:24:10 +00:00
Dan Poltawski
1342a1c605 Merge branch 'MDL-57287-master' of git://github.com/snake/moodle 2017-01-23 12:19:22 +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
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
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
Dan Poltawski
c44913b845 Merge branch 'MDL-57737-master' of git://github.com/crazyserver/moodle 2017-01-23 09:26:57 +00:00
Juan Leyva
b2551b4c86 MDL-49423 tool_mobile: New setting for disabling features 2017-01-20 13:10:49 +01:00
Juan Leyva
1295885084 MDL-49423 admin: Support optgroup in admin_setting_configmultiselect 2017-01-20 13:09:02 +01:00
Juan Leyva
25905de518 MDL-49423 admin: Support optgroup in admin_setting_configselect 2017-01-20 13:09:01 +01:00
Pau Ferrer Ocaña
ef75a648c9 MDL-57737 glossary: Add entry description accepts HTML 2017-01-20 12:57:36 +01:00
Juan Leyva
af1b6043a1 MDL-57408 tool_mobile: New setting for renaming app strings 2017-01-20 10:29:31 +01:00
Juan Leyva
429cc9365e MDL-50547 mod_resource: New WS mod_resource_get_resources_by_courses 2017-01-20 09:47:11 +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
Jake Dallimore
93b6aed000 MDL-57667 theme: change base layout for boost to columns2 
Ensures capability errors are displayed on a page with full navigation.
 2017-01-20 08:47:53 +08:00
John Beedell
8b0d254f05 MDL-57511 Quiz: Attempts report shows non-unique debugging 2017-01-19 14:27:55 +00:00
Iñaki Arenaza
e47863e840 MDL-50625 auth_ldap: Better check for paged results support 
There is at least one LDAP server (Sun Directory Server) that doesn't
support Paged Results extension, even if it supports LDAP version 3. So
checking just for LDAP version is not enough.

If possible, we check the supportedControl attribute of the LDAP rootDSE
and see if the paged results control is available. This needs an LDAP
connection, which might not be possible to establish before we configure
some essential LDAP settings (server, bind user, password, etc.). Thus
we try to establish the connection and check the supportedControl
attribute. But if we fail, we perform only basic checks that are less
accurate and err on the side of cautiousness.
 2017-01-19 10:55:26 +01:00
Andrew Nicols
6c63574607 MDL-57639 mod_forum: Removed unused $forum param from tp function 2017-01-19 13:43: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
Tim Lock
32a7986422 MDL-57668 mod_assign: Fix optional_param() form processing 2017-01-19 08:41:12 +10:30
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
Stephen Bourget
b27c8d8156 MDL-57415 user: Add missing bootstrap classes to participants page 2017-01-18 10:35:11 -05: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