mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
84,516 Commits 36 Branches 519 Tags
Commit Graph

84516 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
5e27228335 MDL-58933 upgrade: add 3.3.0 separation line to all upgrade scripts 2017-05-19 19:22:07 +02:00
David Monllao
590292d48e weekly on-sync release 3.4dev 2017-05-19 13:11:14 +08:00
David Monllao
ead7725c8e Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2017-05-19 13:11:12 +08:00
AMOS bot
e9e5295eb3 Automatically generated installer lang files 2017-05-18 00:06:54 +08:00
Dan Poltawski
2e34848348 Merge branch 'MDL-58776_master-fix' of https://github.com/markn86/moodle 2017-05-17 12:11:56 +01:00
Mark Nelson
f92e27d84e MDL-58776 core_tag: removed whitespace from id attribute 
This was preventing the JS from finding the element.
 2017-05-17 18:42:28 +08:00
Simey Lameze
b991325da2 MDL-58884 core_competency: add exporter required course fields 2017-05-17 13:02:48 +08:00
Jake Dallimore
1f36a0796f Merge branch 'MDL-58947-master' of https://github.com/sammarshallou/moodle 2017-05-17 09:15:09 +08:00
Andrew Nicols
bb706a6557 Merge branch 'MDL-58795-master' of https://github.com/jebarviabb/moodle 2017-05-17 06:59:36 +08:00
Dan Poltawski
2ba9d7d8f9 Merge branch 'MDL-58776-master' of git://github.com/ankitagarwal/moodle 2017-05-16 17:48:56 +01:00
AMOS bot
aa614927a8 Automatically generated installer lang files 2017-05-17 00:08:41 +08:00
Iñaki Arenaza
67bebb69eb MDL-57558 ldap: fix ldap_get_entries_moodle() 
While ldap_get_entries_moodle() PHPdocs state that it returns "array
ldap-entries with lower-cased attributes as indexes.", this is not true. It
uses ldap_get_attributes() internally, which returns both numerically indexed
attribute names, and dictionary-like entries indexed by attribute names.

Current code lowercases the dictionary-like entries, but then uses the
numerically indexed entries for the attribute names used as keys in the
returned array. The numerically indexed names might or might not be lowercased,
depending on the LDAP server and PHP version) version. E.g., OpenLDAP 2.x,
Novell eDirectory 8.x and MS Active Directory return mixed-cased attribute
names, and PHP 5.x and PHP 7.x don't lowercase them inside ldap_get_entries().

This is probably why all calls to ldap_get_entries_moodle() are followed by
calls to array_change_key_case(), even if that shouldn't be necessary.

So make sure we always return lower-cased attributs as indexes and add some
unit tests to avoid regressions in the future.
 2017-05-16 10:48:27 +01:00
Jun Pataleta
9695ca7698 Merge branch 'MDL-58811-master-extra-slash' of https://github.com/dmitriim/moodle 2017-05-16 17:41:51 +08:00
Josh Ebarvia
0a0e2843fd MDL-58795 gradereport_grader: Prevent duplicates in grader report 
Currently, the sorting being used for the grader report table
(asc/desc arrows) is just the grade_grades.finalgrade.
This adds grade_grades.userid in the sort to prevent duplicate
in records returned when using pages.
 2017-05-16 18:29:24 +09:30
Jake Dallimore
8e123642e7 Merge branch 'MDL-58723-master' of git://github.com/junpataleta/moodle 2017-05-16 15:15:04 +08:00
Jun Pataleta
4eec39e2b2 MDL-58723 calendar: Better testing of forever recurring events 
* Change the start date of the parent event to the current date
  for tests that with events that recur forever.
* Limit query results to 100 for events that recur forever that can
  generate more than 100 event records.
 2017-05-16 14:39:53 +08:00
Andrew Nicols
1d52a56e48 Merge branch 'MDL-58756-statslib-roles-multilang' of https://github.com/lucaboesch/moodle 2017-05-16 13:52:05 +08:00
Luca Bösch
4bd112e4de MDL-58756 stats: Use multilang with role. 2017-05-16 07:29:09 +02:00
Dmitrii Metelkin
597c6f2a09 MDL-58811 backup: fix an extra slash on restore for the legacy files 2017-05-16 14:35:16 +10:00
David Monllao
8a0d6655f2 Merge branch 'MDL-58884-master' of git://github.com/StudiUM/moodle 2017-05-16 10:41:41 +08:00
Jake Dallimore
9f13573c43 Merge branch 'MDL-58770' of https://github.com/IMSGlobal/moodle 2017-05-16 09:57:05 +08:00
sam marshall
ec5ec9bce5 MDL-58947 Search: Label URLs not correctly calculated 2017-05-15 17:45:45 +01:00
AMOS bot
eaf052890f Automatically generated installer lang files 2017-05-16 00:06:43 +08:00
Dan Poltawski
5ff3609556 Merge branch 'MDL-58929-master' of git://github.com/ankitagarwal/moodle 2017-05-15 12:07:13 +01:00
Dan Poltawski
52836e3c73 Merge branch 'MDL-58936_master' of git://github.com/markn86/moodle 2017-05-15 11:45:17 +01:00
Dan Poltawski
ca4f5a68bc Merge branch 'MDL-58496-master' of git://github.com/cameron1729/moodle 2017-05-15 11:14:19 +01:00
Dan Poltawski
6dbfda8109 Merge branch 'MDL-58916-master' of https://github.com/xow/moodle 2017-05-15 11:01:13 +01:00
Dan Poltawski
4010466614 Merge branch 'MDL-58841-master' of git://github.com/cameron1729/moodle 2017-05-15 10:46:00 +01:00
Dan Poltawski
a4cc28017f Merge branch 'MDL-58852-choice-chart-options-multilang' of https://github.com/lucaboesch/moodle 2017-05-15 10:23:02 +01:00
Dan Poltawski
bbc9e4f540 Merge branch 'MDL-58932' of git://github.com/stronk7/moodle 2017-05-15 08:57:09 +01:00
Andrew Nicols
86ef13916d Merge branch 'MDL-58893-master-missing-div' of https://github.com/dmitriim/moodle 2017-05-15 15:12:38 +08:00
Andrew Nicols
ffd795ab95 Merge branch 'MDL-58920-calculated-question-edit-name-multilang' of https://github.com/lucaboesch/moodle 2017-05-15 13:57:04 +08:00
Dmitrii Metelkin
f62497ce8e MDL-58893 portfolio: add missing closing div 2017-05-15 15:53:21 +10:00
Mark Nelson
004dcb4f58 MDL-58936 core: ensure 'page->context' is not null 
When using $page->context it calls magic_get_context() in lib/pagelib.php.
This method sets the context to context_system::instance() if it is currently
null and returns that as the context. However, when installing a new site
context_system::instance() also returns null.
 2017-05-15 12:29:15 +08:00
Ankit Agarwal
b5eff76621 MDL-58929 converters: Make link title consistent 2017-05-15 09:45:09 +05:30
John Okely
40ca0bd914 MDL-58916 user_profile: Pass site context when determining menu options 2017-05-15 12:12:54 +08:00
Eloy Lafuente (stronk7)
1820d0bb6d MDL-58932 backup: Bump release to 3.4 2017-05-15 00:43:40 +02:00
Luca Bösch
46470ad02c MDL-58852 choice: Use multilang for choice options in charts 2017-05-14 21:31:10 +02:00
Luca Bösch
06147c5ab3 MDL-58920 questions: Calculated question name passing multilang. 
In "Shared wild cards" table calculated question name do pass format_string to process multilang tags.
Thus, not breaking the layout any more.
 2017-05-14 21:30:18 +02:00
Eloy Lafuente (stronk7)
17fb1d84a2 weekly back-to-dev release 3.4dev 2017-05-14 11:53:28 +02:00
Eloy Lafuente (stronk7)
8f568743d7 NOBUG: Change travis.yml back to master 2017-05-14 11:46:35 +02:00
Eloy Lafuente (stronk7)
b87a580aa3 Moodle release 3.3 v3.3.0 2017-05-14 11:46:35 +02:00
Eloy Lafuente (stronk7)
206da19cd8 NOBUG: Change travis.yml to MOODLE_33_STABLE 2017-05-14 11:46:34 +02:00
AMOS bot
5c3287d5d8 Automatically generated installer lang files 2017-05-14 00:04:26 +08:00
AMOS bot
cc9857b71a Automatically generated installer lang files 2017-05-13 00:04:20 +08:00
Dan Poltawski
49fa410dd1 Moodle release 3.3rc3 v3.3.0-rc3 2017-05-12 10:02:41 +01:00
Dan Poltawski
f0cba09e16 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2017-05-12 10:02:40 +01:00
Dan Poltawski
4f3962e4b4 Merge branch 'MDL-58904-master-fix' of https://github.com/snake/moodle 2017-05-12 15:49:02 +08:00
Jake Dallimore
c0af95d789 MDL-58904 restore: temp fix for event priority notices 2017-05-12 15:10:23 +08:00
Jun Pataleta
ae9da6a222 Merge branch 'MDL-58905_master' of git://github.com/dmonllao/moodle 2017-05-12 14:57:49 +08:00