Commit graph

84018 commits

Author SHA1 Message Date
Helen Foster
ecfe6f58ce MDL-58064 lang: Merge English strings from the en_fix language pack 2017-02-27 10:14:34 +01:00
Rajesh Taneja
26bf6d4ead
MDL-57940 behat: Allow behat parallel run to start with delay
Behat parallel run if executed together
then selenium might fail to launch browser
and timeout. It would be nice to have a
custom delay between the start of each process
2017-02-27 16:15:31 +08:00
Andrew Nicols
d21b71fb1a MDL-53978 usertours: Coding style fix 2017-02-27 15:21:36 +08:00
Andrew Nicols
d9a5f82086 Merge branch 'MDL-53978-render-callbacks' of https://github.com/brendanheywood/moodle 2017-02-27 15:20:28 +08:00
Andrew Nicols
71cc1e529d Merge branch 'MDL-50719-fast-locks' of https://github.com/brendanheywood/moodle 2017-02-27 13:42:55 +08:00
Andrew Nicols
696099b94f Merge branch 'MDL-35980-master' of git://github.com/snake/moodle 2017-02-27 11:58:23 +08:00
Ankit Agarwal
1f3556b010 MDL-55762 assignpdf: Handle errored pages better 2017-02-27 09:24:07 +05:30
Ankit Agarwal
b6d06a5f78 MDL-55762 assignpdf: Fix bug in phpdocs 2017-02-27 09:24:07 +05:30
Andrew Nicols
50d567767c Merge branch 'MDL-58032-master' of git://github.com/ankitagarwal/moodle 2017-02-27 11:45:30 +08:00
Andrew Nicols
b117fb3db9 MDL-33483 repository: Coding style tidyup 2017-02-27 11:31:00 +08:00
Andrew Nicols
eccbea3dd0 Merge branch 'MDL-33483_m33v2' of https://github.com/sbourget/moodle 2017-02-27 10:40:21 +08:00
Ryan Wyllie
0531ce1a29 MDL-57280 javascript: add modal registry
Add a modal registry for the types and make the factory use it to allow
code to register modal types at run time and use the factory for
non-core modals.
2017-02-27 01:05:44 +00:00
Adrian Greeve
7c8afa8ff8 MDL-51833 tool_monitor: Improve access check for monitor. 2017-02-27 08:59:45 +08:00
Matteo Scaramuccia
203c5bce27 MDL-57789 files: Reviewed lifetime value 2017-02-25 23:42:37 +01:00
Matteo Scaramuccia
ed0a1cd708 MDL-57789 files: Use immutable Cache-Control extension. 2017-02-25 23:42:35 +01:00
Matteo Scaramuccia
f2de8226a8 MDL-57789 files: Used if-then instead of ternary operators 2017-02-25 23:36:07 +01:00
Matteo Scaramuccia
7338ce0182 MDL-57789 files: Let send_stored_file() rely on send_file(). 2017-02-25 23:36:04 +01:00
Nadav Kavalerchik
f9c1a7515a MDL-57524 theme_boost: Fix ignored input size on admin pages 2017-02-24 21:52:41 +02:00
Juan Leyva
eeae783ca3 MDL-58071 user: Return usernotfullysetup exception in WS
If there is an empty required custom user profile field, Web Services
should return the usernotfullysetup exception instead ignoring it.
The mobile app already handles this exception for core fields
redirecting the user to web in order to fill the missing field.
2017-02-24 20:11:27 +01:00
Mike Churchward
85d9ed8b3b MDL-58072 theme_boost: Added quotes to title; removed extra spaces. 2017-02-24 11:15:30 -05:00
sam marshall
38fa1ca558 MDL-55980 Scheduled tasks: Run individual scheduled tasks from web 2017-02-24 10:42:28 +00:00
Brendan Heywood
504d569b71 MDL-50719 cron: Fixed parallel task lock contention issues 2017-02-24 13:13:23 +11:00
Brendan Heywood
3e050643c7 MDL-53978 usertours: Swap to better callback 2017-02-24 13:06:54 +11:00
Brendan Heywood
5ebd1fb976 MDL-53978 core: Added callbacks for all major render stages 2017-02-24 13:06:54 +11:00
Jake Dallimore
35fcaac78b MDL-56364 javascript: Prevent bad prototype chains in core dialogue
The DIALOGUE object was using Y.clone to copy the input config, messing
up the prototype chains for any objects in the config param. Really,
this doesn't need to clone the config, so I've refactored to avoid doing
so. Also moved some of the other attribute init and setup calls to the
appropriate places (initializer and modifyAttrs).
2017-02-24 08:25:31 +08:00
Jake Dallimore
cb1cb9575f MDL-35980 comment: deprecate deletecomment string 2017-02-24 08:15:40 +08:00
Jake Dallimore
86f1d1bb86 MDL-35980 comment: add comment info to delete button for screen readers
For each delete button in the comments widget, make the spoken text a
string containing the name of the poster and the datetime.
2017-02-24 08:15:40 +08:00
AMOS bot
18f050062e Automatically generated installer lang files 2017-02-24 00:06:38 +08:00
David Monllao
0f59b6dd75 weekly release 3.3dev 2017-02-23 08:07:39 +01:00
David Monllao
8cdd8312d5 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2017-02-23 08:07:37 +01:00
Rajesh Taneja
acdda4f5f7
MDL-58056 behat: Ensure form element exists
Before getting form field, ensure node is
visible. Else it may fail to get form
field
2017-02-23 14:44:44 +08:00
Rajesh Taneja
ade50a118a
MDL-58056 behat: Catch webdriver exception if element removed
While checking for element visibility, ensure
that element is there in dom
2017-02-23 14:44:43 +08:00
AMOS bot
be5e864416 Automatically generated installer lang files 2017-02-23 00:05:13 +08:00
David Mudrák
bb2924d018 MDL-58050 message: Commit the transaction before the early return
If there was no conversation found and the method returned early, the
active transaction was not marked as committable and the error was
reported by the request shutdown handler.

Attaching a unit test for the case just because it did not seem to be
covered. I was trying to reproduce the thrown error in the unit test but
it can't be used in this case. The shutdown handler puts the warning
directly into the error_log and it is not guaranteed where such messages
go (depending on the PHP configuration). And we do not even raise it
during the unit test execution (presumably due to noise it would
produce) anyway.
2017-02-22 13:56:02 +01:00
David Mudrák
0c44da7887 MDL-58050 message: Fix the DB transaction handling
Consumer code is not supposed to call commit_delegated_transaction()
method directly, this was incorrect usage of the delegated transactions.
2017-02-22 13:42:05 +01:00
Daniel Thee Roperto
b80caca188 MDL-57840 libraries: Fixed missing fields in get_users_by_field(). 2017-02-22 16:07:14 +11:00
Ankit Agarwal
3e40dc8c61 MDL-58032 core_user: Fix case when acting user is a visitor 2017-02-22 09:00:45 +05:30
Eloy Lafuente (stronk7)
492099d929 Merge branch 'MDL-57527-master' of git://github.com/danpoltawski/moodle 2017-02-22 00:52:03 +01:00
Eloy Lafuente (stronk7)
5c73061bb9 Merge branch 'wip-mdl-57765' of https://github.com/rajeshtaneja/moodle 2017-02-21 23:53:39 +01:00
Eloy Lafuente (stronk7)
edc44ac356 Merge branch 'MDL-57633-master' of git://github.com/jleyva/moodle 2017-02-21 23:45:14 +01:00
Sam Chaffee
29be72373c MDL-58041 tool_monitor: Fix event monitor subscription behat failures 2017-02-21 11:19:40 -07:00
Tim Hunt
898da28afd MDL-58040 blocklib: never use global in block manager class
This switches everything to ->page, including coverting static method to real one.
2017-02-21 15:19:11 +00:00
David Monllao
73eceea93f Merge branch 'wip-MDL-40838-master-2' of git://github.com/marinaglancy/moodle 2017-02-21 09:30:31 +01:00
David Monllao
b98b37c670 Merge branch 'MDL-57602-master' of https://github.com/lucisgit/moodle 2017-02-21 08:43:16 +01:00
Adam Olley
767761b7d8 MDL-58030 gradingform_guide: Init $commentchooser before use
The initialisation of $commentschooser was moved into an IF condition,
whilst still using it outside of that IF conditions scope. As such, if
there are no comments to choose from, the variable is never init'd but
it still goes to use it, emitting a PHP notice.
2017-02-21 14:31:20 +10:30
Eloy Lafuente (stronk7)
3cb7fc4f9a Merge branch 'MDL-57619-master' of git://github.com/ankitagarwal/moodle 2017-02-21 01:06:29 +01:00
Eloy Lafuente (stronk7)
ac1837e6d6 Merge branch 'wip-MDL-57113-master' of https://github.com/kwiliarty/moodle 2017-02-21 00:59:54 +01:00
Eloy Lafuente (stronk7)
860b099f46 Merge branch 'wip-mdl-56616' of https://github.com/rajeshtaneja/moodle 2017-02-21 00:56:26 +01:00
Eloy Lafuente (stronk7)
aedde678c7 Merge branch 'MDL-55867_m33v1' of https://github.com/sbourget/moodle 2017-02-21 00:52:20 +01:00
Eloy Lafuente (stronk7)
fbbda1ec6e Merge branch 'MDL-56206-text-enrolled-users-page-aligned' of https://github.com/lucaboesch/moodle 2017-02-20 19:15:23 +01:00