Andrew Nicols
29ee3cf789
MDL-44101 Javascript: Apply widget-focusonclose to some core dialogues
...
Conflicts:
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
2014-02-24 16:31:55 +08:00
Andrew Nicols
7ae6ce009e
MDL-44101 Javascript: Introduce a module to focus after widget close
...
This module supports focusing on a specified Node, or attempting to
determine the Node which caused the displayed the Widget to return focus to
that location.
2014-02-24 16:31:09 +08:00
Damyon Wiese
dea614e493
Merge branch 'MDL-44108_master' of git://github.com/dmonllao/moodle
2014-02-24 15:42:32 +08:00
Damyon Wiese
8c3966773b
Merge branch 'MDL-44111_master' of git://github.com/dmonllao/moodle
2014-02-24 15:39:32 +08:00
Damyon Wiese
28a03399b3
Merge branch 'wip-MDL-44168-master' of git://github.com/ds125v/moodle
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2014-02-24 15:20:49 +08:00
Ankit Agarwal
df9a6c0114
MDL-44272 events: Fix incorrect urls in course module events
2014-02-24 15:08:22 +08:00
Damyon Wiese
f08c69aba2
Merge branch 'MDL-44214-master' of git://github.com/andrewnicols/moodle
2014-02-24 14:41:29 +08:00
Damyon Wiese
164ad1a30a
Merge branch 'MDL-18633' of https://github.com/danielneis/moodle
2014-02-24 13:16:41 +08:00
Damyon Wiese
89ede7e12d
Merge branch 'MDL-41767-master' of git://github.com/FMCorz/moodle
2014-02-24 09:57:15 +08:00
David Monllao
74c78e7483
MDL-43837 behat: Adding reduced timeouts
...
There are steps where we want to check that
"something" does not appear in the page
or does not exist. We still have to spin
but we don't need to spin for 6 seconds.
2014-02-24 09:43:24 +08:00
Sam Hemelryk
2ef8ff9e05
MDL-44315 phpdoc: fixed up typos and made up tags
2014-02-24 09:13:31 +13:00
Juan Leyva
cb9d825754
MDL-42923 Add renamed web services to the Mobile app service
...
Keep the deprecated ones for backwards compatibility
2014-02-21 15:26:45 +01:00
David Monllao
702851c071
MDL-44108 behat: Adding a roles data generator
2014-02-21 13:25:44 +08:00
David Monllao
167486b316
MDL-44111 behat: Limiting dump files filename size
2014-02-21 13:21:58 +08:00
David Monllao
3af7eea68d
MDL-43882 dml: New test for perf_get_xxxx() methods
2014-02-21 13:21:13 +08:00
Damyon Wiese
d4e5757992
MDL-44118 question engine: Fix bad merge conflict resolution (again)
...
This time for sure (sorry).
2014-02-19 10:03:37 +08:00
Damyon Wiese
0d7e83c4e4
MDL-44118 question engine: Fix bad merge conflict resolution
...
Version numbers were out of order in upgrade file (my bad).
2014-02-19 09:35:57 +08:00
Damyon Wiese
6071a209fe
Merge branch 'MDL-44118_2' of git://github.com/timhunt/moodle
...
Conflicts:
version.php
2014-02-19 09:08:42 +08:00
Daniel Neis Araujo
9d9361e82d
MDL-18633 User profile: add last ip field to user view
2014-02-18 09:42:28 -03:00
Tim Hunt
30de48d285
MDL-44118 drop old quiz/question attempt data.
...
This data should all have been upgraded when moving to Moodle 2.1. It
was only kept as a back-up, and now, after 3 years have past, we can
clean it up.
2014-02-18 11:55:26 +00:00
Tim Hunt
4e8a07d28b
MDL-44118 remove the qeupgradehelper tool
...
and associated code that was only used by it.
2014-02-18 11:55:21 +00:00
Tim Hunt
e4c20157c0
MDL-44118 new environment check are all quiz attempts upgraded.
...
In Moodle 2.1, there was a major DB upgrade relating to questions, and
it was possible to delay some of that upgrade. Now, those DB tables are
changing again, and the time has come to insist that all the updata has
been upgraded (or deleted).
2014-02-18 11:55:17 +00:00
Damyon Wiese
f68e555684
Merge branch 'MDL-39337' of git://github.com/apsdehal/moodle
2014-02-18 15:37:49 +08:00
Damyon Wiese
b41ea78c39
Merge branch 'MDL-44187-master' of git://github.com/andrewnicols/moodle
2014-02-18 13:56:11 +08:00
Damyon Wiese
0e84ecefcc
Merge branch 'w07_MDL-42541_m27_portevent' of git://github.com/skodak/moodle
...
Conflicts:
version.php
2014-02-18 12:00:45 +08:00
Petr Škoda
114e3209b1
MDL-42889 cleanup obsolete clam relatd code
...
Since 2.0 all uploaded files need to go through the file picker which does the scanning,
the idea is that it is more important to warn users that their computer is crawling
with viruses. All teachers are supposed to have local up-to-date antivirus software!
Since 2.0 we are not scanning existing files on server, in future we might use the
status flag in files table to indicate the file is problematic, but still we should
never detele anthing from the filedir...
2014-02-18 09:22:30 +08:00
Sam Hemelryk
c10affa57b
Merge branch 'MDL-43997-master' of git://github.com/andrewnicols/moodle
...
Conflicts:
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
2014-02-18 09:31:32 +13:00
Sam Hemelryk
38226a3f4a
Merge branch 'MDL-44161-master' of git://github.com/andrewnicols/moodle
2014-02-18 09:30:50 +13:00
Eloy Lafuente (stronk7)
1f09c26298
Merge branch 'MDL-41759-master' of https://github.com/jamiepratt/moodle
2014-02-17 15:45:01 +01:00
James Pratt
9d3d859c7f
MDL-41759 quiz statistics : install.xml & upgrade.php difference
2014-02-17 19:25:10 +07:00
David Scotson
a0b767e741
MDL-44168 html: border=1 on regexdetect table
2014-02-17 11:45:51 +00:00
Damyon Wiese
9e72fa97a9
Merge branch 'MDL-41759-master' of https://github.com/jamiepratt/moodle
2014-02-17 15:32:45 +08:00
Damyon Wiese
1d35590029
Merge branch 'MDL-41755-master-v2' of git://github.com/jamiepratt/moodle
2014-02-17 15:01:45 +08:00
Andrew Nicols
0f722cfbe5
MDL-44214 Javascript: Allow for patching of modules in the simpleyui rollup
...
The moodlesimple (former simpleyui) rollup is included by a slightly
different mechanism to the the other YUI modules and this was missed off
the original yuipatchlevel implementation.
2014-02-17 14:46:09 +08:00
Dan Poltawski
89542d2888
MDL-33099 deprecatedlib: clarify some comments
2014-02-17 14:45:12 +08:00
Dan Poltawski
a24ef7d7cd
Merge branch 'MDL-33099-master' of git://github.com/andrewnicols/moodle
2014-02-17 14:40:36 +08:00
Damyon Wiese
8053854592
Merge branch 'MDL-23514-master' of https://github.com/danielneis/moodle
...
Conflicts:
lang/en/admin.php
2014-02-17 14:12:16 +08:00
Andrew Nicols
af64bc6179
MDL-33099 Javascript: Deprecate the ajaxenabled function
2014-02-17 14:11:21 +08:00
Andrew Nicols
cfa770b47b
MDL-43997 Javascript: Make all informative dialogues display correctly
...
Most of the moodle core dialogue types should be shown modally, and
centred. They should also be shown on instantiation.
Rather than re-define all of these settings, this patch introduces a new
subclass of M.core.dialogue which sets them up with the same settings.
2014-02-17 10:49:45 +08:00
Jerome Mouneyrac
d14f5265b2
MDL-43723 restrict the drag and drop to the move icon instead of dragging the entire block header
2014-02-17 09:16:53 +08:00
Sam Hemelryk
487f74813e
Merge branch 'MDL-42404_master' of git://github.com/dmonllao/moodle
2014-02-17 10:15:36 +13:00
Sam Hemelryk
fa52e6494d
Merge branch 'MDL-44042-master' of git://github.com/andrewnicols/moodle
...
Conflicts:
lib/yui/build/moodle-core-dragdrop/moodle-core-dragdrop-min.js
2014-02-17 09:06:58 +13:00
Sam Hemelryk
87643ff599
Merge branch 'MDL-44079-master' of git://github.com/andrewnicols/moodle
...
Conflicts:
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
2014-02-17 08:48:39 +13:00
Sam Hemelryk
80ce7e1a8d
Merge branch 'MDL-43979-master' of git://github.com/andrewnicols/moodle
2014-02-17 08:27:48 +13:00
Andrew Nicols
4e55f11de2
MDL-44187 JavaScript: Remove data from debug footer
2014-02-16 20:43:30 +08:00
James Pratt
4922e79f3e
MDL-41759 quiz statistics : break down responses for each variant
2014-02-14 15:23:04 +07:00
James Pratt
ac3e5ed7ba
MDL-41755 tablelib : added a function to add multiple rows at once
2014-02-14 14:13:02 +07:00
Andrew Nicols
2173d5532b
MDL-44161 Javascript: Include upstream patch for modal widget position jump
...
This is courtesty of the upstream pull request https://github.com/yui/yui3/pull/1636
2014-02-14 14:15:40 +08:00
Petr Škoda
fd0e019286
MDL-42541 stop using events for porfolion cron
2014-02-13 12:09:24 +08:00
Andrew Nicols
2ab0238ff6
MDL-44042 Javascript: Handle moving to the top of the current section with keyboard
2014-02-13 10:11:00 +08:00