32124b0010
Automatically generated installer lang files
2017-05-23 00:05:26 +08:00
976e29a17d
Merge branch 'MDL-58922-calculatedmulti-question-name-multilang' of https://github.com/lucaboesch/moodle
2017-05-22 10:46:47 +01:00
f378fafd3b
MDL-58921 questions: Calculated question name passing multilang.
...
In edit calculated question the question name does pass format_string to process multilang tags.
2017-05-22 11:36:23 +02:00
11252bde86
MDL-58922 questions: Calculatedmulti question name passing multilang.
...
In edit calculatedmulti question the question name does pass format_string to process multilang tags.
2017-05-22 11:31:49 +02:00
13a1e8b50c
Merge branch 'master-MDL-56973' of https://github.com/fwsl/moodle
2017-05-22 15:13:58 +08:00
da2959fe9c
Merge branch 'MDL-56617-course-cbm-grade-to-pass' of https://github.com/lucaboesch/moodle
2017-05-22 14:31:37 +08:00
aec421153e
Merge branch 'MDL-58933' of git://github.com/stronk7/moodle
2017-05-22 14:12:36 +08:00
52ab8b2c16
Merge branch 'MDL-58986_master' of git://github.com/markn86/moodle
2017-05-22 12:21:11 +08:00
905ceff28a
Merge branch 'MDL-58966-master' of git://github.com/danpoltawski/moodle
2017-05-22 10:47:31 +08:00
a5906ac944
Merge branch 'MDL-57957' of https://github.com/bostelm/moodle
2017-05-22 10:41:46 +08:00
a607c1fcb0
Automatically generated installer lang files
2017-05-21 00:04:03 +08:00
5e27228335
MDL-58933 upgrade: add 3.3.0 separation line to all upgrade scripts
2017-05-19 19:22:07 +02:00
16302f85ec
MDL-56617 mod_quiz: No grade to pass check if CBM used
...
When certainty-based marking is used, grades can 'exceed' the maximum grade
(because they are multiplied by factors). Therefore, in such cases, don't show
no warning.
2017-05-19 12:30:38 +02:00
2e241fea56
MDL-56973 wiki: New page title readonly after changing course language
2017-05-19 11:12:55 +02:00
919b5c95e6
MDL-58994 core_calendar: Coalesce event sort field
...
There are situations where we need to sort events on a field called
"timesort", but sometimes it is not set. So we can fall back to
"timestart" in this case.
2017-05-19 15:08:05 +08:00
590292d48e
weekly on-sync release 3.4dev
2017-05-19 13:11:14 +08:00
ead7725c8e
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
2017-05-19 13:11:12 +08:00
373d7d3f28
MDL-46322 mod_assign: Only list enrolled graders as potential markers
2017-05-18 21:58:24 -05:00
b7d26eb3d2
MDL-58966 completion: improve dashboard string
2017-05-18 10:15:08 +01:00
f3dc7a171a
MDL-58986 mod_quiz: add CSS classes to buttons on comment page
2017-05-18 16:49:25 +08:00
fce1d7deb8
MDL-50266 mod_forum: Remove strings deprecated in 3.0
2017-05-18 11:17:13 +05:30
420617061d
MDL-50266 block_tags: Remove strings deprecated in 3.0
2017-05-18 11:17:13 +05:30
715d6ba5f7
MDL-50266 core: Remove strings deprecated in 3.0
2017-05-18 11:17:13 +05:30
aa951785e0
MDL-50266 lesson: Remove strings deprecated in 3.0
2017-05-18 08:34:33 +05:30
3ffd13827e
MDL-46322 mod_assign: Only list enrolled graders as potential markers
2017-05-17 16:12:54 -05:00
92a1ea6870
MDL-58970 themes: Rename login.mustache to loginform.mustache
2017-05-17 20:58:46 +02:00
e9e5295eb3
Automatically generated installer lang files
2017-05-18 00:06:54 +08:00
2e34848348
Merge branch 'MDL-58776_master-fix' of https://github.com/markn86/moodle
2017-05-17 12:11:56 +01:00
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
b991325da2
MDL-58884 core_competency: add exporter required course fields
2017-05-17 13:02:48 +08:00
1f36a0796f
Merge branch 'MDL-58947-master' of https://github.com/sammarshallou/moodle
2017-05-17 09:15:09 +08:00
bb706a6557
Merge branch 'MDL-58795-master' of https://github.com/jebarviabb/moodle
2017-05-17 06:59:36 +08:00
5058a4d199
MDL-49988 wiki: fix broken page layout if html contains line breaks
2017-05-16 19:23:00 +01:00
2ba9d7d8f9
Merge branch 'MDL-58776-master' of git://github.com/ankitagarwal/moodle
2017-05-16 17:48:56 +01:00
aa614927a8
Automatically generated installer lang files
2017-05-17 00:08:41 +08:00
b2e76ba7d8
MDL-57957 mod_assign: show feedback file in absence of grade item
2017-05-16 11:58:05 +01:00
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
9695ca7698
Merge branch 'MDL-58811-master-extra-slash' of https://github.com/dmitriim/moodle
2017-05-16 17:41:51 +08:00
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
c14e697ee6
MDL-58952 admin: use valid default for language selection dropdown.
2017-05-16 15:28:25 +08:00
8e123642e7
Merge branch 'MDL-58723-master' of git://github.com/junpataleta/moodle
2017-05-16 15:15:04 +08:00
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
1d52a56e48
Merge branch 'MDL-58756-statslib-roles-multilang' of https://github.com/lucaboesch/moodle
2017-05-16 13:52:05 +08:00
4bd112e4de
MDL-58756 stats: Use multilang with role.
2017-05-16 07:29:09 +02:00
597c6f2a09
MDL-58811 backup: fix an extra slash on restore for the legacy files
2017-05-16 14:35:16 +10:00
8a0d6655f2
Merge branch 'MDL-58884-master' of git://github.com/StudiUM/moodle
2017-05-16 10:41:41 +08:00
9f13573c43
Merge branch 'MDL-58770' of https://github.com/IMSGlobal/moodle
2017-05-16 09:57:05 +08:00
ec5ec9bce5
MDL-58947 Search: Label URLs not correctly calculated
2017-05-15 17:45:45 +01:00
eaf052890f
Automatically generated installer lang files
2017-05-16 00:06:43 +08:00
5ff3609556
Merge branch 'MDL-58929-master' of git://github.com/ankitagarwal/moodle
2017-05-15 12:07:13 +01:00
AMOS bot