Commit graph

77316 commits

Author SHA1 Message Date
Andrew Nicols
7367520bb1 Merge branch 'MDL-52371-Activity-Chooser-alignment-of-strings-that-need-line-wrap' of git://github.com/synergylearning/moodle 2016-02-23 11:36:54 +08:00
Andrew Nicols
2a9bce48ac Merge branch 'MDL-53081-master-txtfiles' of git://github.com/mudrd8mz/moodle 2016-02-23 11:13:45 +08:00
Jun Pataleta
eb66223c42 MDL-53071 course: Allow blank space input for section name 2016-02-23 09:41:47 +08:00
Andrew Nicols
91a1fc805e Merge branch 'MDL-52892' of https://github.com/dg711/moodle 2016-02-23 09:39:26 +08:00
Damyon Wiese
30be6c846a MDL-49324 Grades: Use a progress bar when recalculating gradebook grades 2016-02-23 08:35:10 +08:00
Damyon Wiese
b9d2419e39 MDL-49324 Output: The progress bar output is buffered.
Each call to update the progress bar needs to fill the output buffer so that it
gets sent immediately.
2016-02-23 08:35:10 +08:00
Eloy Lafuente (stronk7)
a4a44e2c27 Merge branch 'MDL-52806' of git://github.com/timhunt/moodle 2016-02-22 23:04:43 +01:00
Eloy Lafuente (stronk7)
153fbcd24a Merge branch 'MDL-53065' of git://github.com/timhunt/moodle 2016-02-22 23:01:04 +01:00
Michael Milette
89e68e6c1e MDL-42460 mod_feedback: Fix markup validation 2016-02-22 22:41:32 +08:00
Marina Glancy
8ad534bd9f MDL-44952 mod_feedback: validate required multichoice 2016-02-22 22:01:02 +08:00
Dan Poltawski
c5a4c64fcc Merge branch 'MDL-44093-master-flowplayer' of git://github.com/mudrd8mz/moodle 2016-02-22 09:04:15 +00:00
Davo Smith
b8645d6df5 MDL-52371 theme_base: activity chooser - support long names 2016-02-22 08:57:16 +00:00
Kenny McCormack
3523f77522 MDL-52371 theme_bootstrapbase: activity chooser - support long names 2016-02-22 08:57:14 +00:00
Andrew Nicols
ec1b9de1b0 Merge branch 'wip-mdl-52970' of https://github.com/rajeshtaneja/moodle 2016-02-22 15:20:34 +08:00
Andrew Nicols
ea65e55b51 Merge branch 'wip-mdl-50484' of https://github.com/rajeshtaneja/moodle 2016-02-22 12:22:07 +08:00
Tim Hunt
293f5d1b11 MDL-53065 quiz redo question: avoid PHP notice in edge case
When selecting the variant of the new question, we need to add the
new question to the usage before trying to select a variant.

Also, we need to acutally use the selected variant number!
2016-02-19 12:10:39 +00:00
Tim Hunt
a10bd0d9a8 MDL-52806 quiz manual grading: show right answer for auto-graded Qs 2016-02-19 12:06:24 +00:00
Tim Hunt
de3b803dea MDL-49338 quiz stats: preview urls wrong for question variants 2016-02-19 12:01:05 +00:00
David Mudrák
9e7d95d232 MDL-53081 docs: Improve the text doc files in the root directory
Existing contents of README moved to INSTALL. Added new README,
CONTRIBUTING and PULL_REQUEST_TEMPLATE files. TRADEMARK updated using
the text at https://moodle.com/trademarks/.
2016-02-19 09:11:06 +01:00
Rajesh Taneja
9b4903c8fd MDL-52970 behat: Wait for page to be ready after click
After click enusre to wait so text fields are not
use autosize
2016-02-19 15:23:49 +08:00
Rajesh Taneja
fee2cde5b6 MDL-52970 behat: Navigation step improvement
If navigation node to expand is a link then first
click on it and navigate to next page where it is
expanded, and then click on link within. This is
needed as some drivers click on link and don't open
the navigation node which are links
2016-02-19 15:21:52 +08:00
Rajesh Taneja
f7a73e196e MDL-52970 behat: For single select only click event is enough 2016-02-19 15:21:52 +08:00
Rajesh Taneja
e8ef0e4f63 MDL-52970 behat: don't set select value if already set
In FF 44.0, it fails to click on submit button if
select value is set to the original value
2016-02-19 15:21:51 +08:00
Rajesh Taneja
660b0f0eed MDL-50484 core_lib: No need to cache action_icons
action_icons should not be cached as they
have a unique id and if cache is used then
all icons will have same id.
Other solution is to replace id with some static
but it's not worth a cache for a page, so
removing cache
2016-02-19 14:00:04 +08:00
Rajesh Taneja
7b287e09e2 MDL-50484 core_grade: courseheader id should be unique
grader report show category with courseheader id
which gets replicated for all categories on page.
This will now be courseheader_categoryname.
2016-02-19 14:00:04 +08:00
Rajesh Taneja
7e341eb48f MDL-50484 block_navigation: Set number to be unique
Set number to be unique for unique id's
in navigation
2016-02-19 14:00:04 +08:00
Rajesh Taneja
1ebda3eb8c MDL-50484 lib_formslib: Persistant input should have different id
Persistant input is appended for frozen elements
and should have different id then the actual element
2016-02-19 14:00:04 +08:00
Rajesh Taneja
2aacd415e1 MDL-50484 mod_lesson: Use group to add multiple radio inputs
https://docs.moodle.org/dev/lib/formslib.php_Form_Definition#radio
Radio input should be added in group and not individual, so
that each element created has unique id and template
2016-02-19 14:00:03 +08:00
Eugene Venter
d01cdc5172 MDL-53166 mod_forum: fix fatal error in backup phpunit test
when running mod_forum_testsuite mod_forum_testsuite
2016-02-19 11:14:08 +13:00
dg711
88e1d0ed26 MDL-52892 message: users' pic overrides others
While listing the messages , the logged in users' profile pic used to
override over other users' pics .
2016-02-19 00:58:44 +05:30
David Mudrák
2bc19a7a10 MDL-44093 flowplayer: Provide information about source code location
Moodle ships with compiled binary code of the flowplayer. This patch
adds information about the source code location according to GNU GPLv3
section 6d and provides the original license for the code from
7c39fbe31e/core/LICENSE.txt
2016-02-18 15:47:14 +01:00
Dan Poltawski
83a951023e weekly release 3.1dev 2016-02-18 09:14:12 +00:00
Dan Poltawski
dafff3b84c Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2016-02-18 09:14:09 +00:00
David Monllao
b0f437d8f7 Merge branch 'wip-mdl-52387' of git://github.com/rajeshtaneja/moodle 2016-02-18 11:48:14 +08:00
Rajesh Taneja
b4a5d4fa17 MDL-52387 auth_ldap: Use proper dn to find password age
dn with fine grained password should be used
to get msds-maximumpasswordage attribute.
No checks should be used to see if the array
key is set as entry should always return them.
2016-02-18 11:38:03 +08:00
Jun Pataleta
41d6a25a19 MDL-53154 course: Raise PHP time limit when deleting a course 2016-02-18 10:10:01 +08:00
Eloy Lafuente (stronk7)
12d5994fc7 MDL-52964 Qtype: Small fixes to behat tests
This applies some small changes to proposed behat tests:

- Geting rid of the @javascript tag when it's not needed.
- Adding some missing @_switch_window tags.
- Fixing some scenario names, previously duplicated.
- Fixing some typos and whitespace.
2016-02-18 01:42:22 +01:00
Eloy Lafuente (stronk7)
cad67991d4 Merge branch 'MDL-52964' of https://github.com/mkassaei/moodle 2016-02-18 00:58:10 +01:00
Eloy Lafuente (stronk7)
83fe83e988 Merge branch 'wip-MDL-51802-fix' of https://github.com/marinaglancy/moodle 2016-02-17 17:29:07 +01:00
Marina Glancy
fa4dd0169d MDL-51802 core: change template example 2016-02-17 20:32:55 +08:00
Dan Poltawski
0b14d8612b Merge branch 'MDL-51214-master' of git://github.com/andrewnicols/moodle 2016-02-17 07:58:15 +00:00
Marina Glancy
7c5c80350c MDL-49807 mod_wiki: section detection regexp fix 2016-02-17 13:11:10 +08:00
David Monllao
a6f4866e52 Merge branch 'MDL-48015-master' of git://github.com/junpataleta/moodle 2016-02-17 09:49:04 +08:00
Eloy Lafuente (stronk7)
45cb6145fb Merge branch 'MDL-51852-master' of git://github.com/andrewnicols/moodle 2016-02-17 02:03:48 +01:00
Andrew Nicols
a6fc917168 MDL-51852 mod_forum: Respect timed discussions in emails 2016-02-17 07:57:57 +08:00
Eloy Lafuente (stronk7)
642a4fde4b Merge branch 'wip-MDL-51802-master4' of https://github.com/marinaglancy/moodle 2016-02-16 23:22:35 +01:00
Eloy Lafuente (stronk7)
c70d54405b Merge branch 'MDL-29506-master' of git://github.com/andrewnicols/moodle 2016-02-16 17:50:22 +01:00
Eloy Lafuente (stronk7)
8bd2db2023 Merge branch 'MDL-52997-email-threading' of https://github.com/brendanheywood/moodle 2016-02-16 17:11:10 +01:00
AMOS bot
8753cdbca8 Automatically generated installer lang files 2016-02-17 00:05:41 +08:00
Eloy Lafuente (stronk7)
fa6426a069 Merge branch 'MDL-52814' of git://github.com/timhunt/moodle 2016-02-16 16:48:04 +01:00