David Monllao
b6f7863e77
Merge branch 'MDL-47003-master' of git://github.com/merrill-oakland/moodle
2015-03-24 10:17:28 +08:00
Eloy Lafuente (stronk7)
20e955a18e
Merge branch 'MDL-43770-master' of https://github.com/lucisgit/moodle
2015-03-24 01:38:15 +01:00
Dan Poltawski
68d52a732f
Merge branch 'master_MDL-48419' of https://github.com/danmarsden/moodle
2015-03-23 11:15:55 +00:00
David Monllao
f1d498a62a
MDL-48456 course: Using default max int value
2015-03-23 15:16:18 +08:00
David Monllao
ae9ed08f53
Merge branch 'MDL-48456-master' of git://github.com/dkns/moodle
2015-03-23 15:14:58 +08:00
David Monllao
2572356895
Merge branch 'MDL-47002-master' of git://github.com/merrill-oakland/moodle
2015-03-23 14:59:05 +08:00
Daniel Kosinski
551e64ccb9
MDL-48456 course: Increase timeout when deleting all courses in category
2015-03-22 16:21:51 +01:00
Tony Butler
2f29dd628f
MDL-43770 core_behat: Pass additional params to enrol_user generator
...
Include timestart, timeend and status.
2015-03-20 09:55:16 +00:00
Eric Merrill
3ef9636190
MDL-47003 atto: Make code cleanup more targeted
...
Apply different, stricter, code cleanup when we receive HTML (WYSIWYG)
paste events, but be more lax the rest of the time.
Also, update the regexes to be more targeted for specific code patterns
pasted from office packages.
2015-03-18 11:44:11 -04:00
Eric Merrill
a7fdadc94c
MDL-47002 atto: Improve paste behaviour to ensure propper cleanup
...
Old code failed to clean the editor div which resulted in
undesirable code being being left in the div for editing. To properly
handel incoming code, we should try to intercept and clean before the
paste, or clean the entire editable div.
2015-03-18 09:27:44 -04:00
Dan Marsden
552281e461
MDL-48419 mod_scorm: Check net script too agressive
...
in some cases high latency and network issues result in longer
than 2 sec responses from a server, increase this to avoid
excessive warnings.
2015-03-18 20:06:39 +13:00
Eloy Lafuente (stronk7)
536cf8c298
Merge branch 'MDL-49361-master-stringman' of git://github.com/mudrd8mz/moodle
2015-03-17 12:00:29 +01:00
Dan Poltawski
1fbc0e5f43
Merge branch 'MDL-49371_master' of git://github.com/dmonllao/moodle
2015-03-17 09:06:59 +00:00
Eloy Lafuente (stronk7)
e201bf16a0
Merge branch 'MDL-49389' of git://github.com/timhunt/moodle
2015-03-17 00:28:31 +01:00
Andrew Nicols
1f50bbf184
MDL-49381 message: Remove old useridfrom indexes
2015-03-17 00:26:20 +01:00
Mike Grant
d0c2bc6466
MDL-49276 config-dist: Removed legacy config options
...
Both $CFG->logsql and $CFG->dblogerror had no use in moodle core
since ages ago (just the former had one use for nothing). Good time
to get rid of both as they are 100% misleading.
2015-03-16 23:39:41 +01:00
Dan Poltawski
f4e1913530
Merge branch 'MDL-49152-master' of git://github.com/damyon/moodle
2015-03-16 14:26:15 +00:00
Dan Poltawski
3bec364f35
Merge branch 'MDL-49442-master' of git://github.com/jethac/moodle
2015-03-16 13:31:07 +00:00
Dan Poltawski
e4d0db1769
Merge branch 'MDL-49163-master' of git://github.com/damyon/moodle
2015-03-16 11:01:18 +00:00
Dan Poltawski
6a24f0a796
Merge branch 'MDL-45725-master' of https://github.com/lucisgit/moodle
2015-03-16 10:52:02 +00:00
Tony Butler
60ec267b0b
MDL-45725 core_lib: Add unit test for persistent flexible tables
2015-03-16 10:41:11 +00:00
Tony Butler
f5ba1b93a2
MDL-45725 core_lib: Save user preferences for flexible tables
2015-03-16 10:41:11 +00:00
David Monllao
7035377b58
Merge branch 'MDL-49445' of git://github.com/timhunt/moodle
2015-03-16 15:38:02 +08:00
Damyon Wiese
9bdcf57951
MDL-49152 output: Templates for renderers (JS and PHP)
...
Mustache support for rendering templates from either php or js.
2015-03-14 22:48:40 +08:00
Tim Hunt
ca0ceacd27
MDL-49446 behat: should_not_be_visible steps were not working
...
I fixed all similar problems in this class, even ones where it did
actually work becuase the two exceptions were of different types.
This pattern seems to have been copied and pasted a lot in this class,
and I am sure that will happen again, so I did not want to leave any
dangerous potential examples around.
2015-03-13 14:28:47 +00:00
Tim Hunt
5954a9de10
MDL-49445 behat: selectors should match the most specific tr or li
...
I also fixed the text rule, which already did this, to use the same
idiom. It is unnecessarily inefficient to count all the things and
compare to 0. Not exists should be faster.
Also, updated all the selectors here to consistently start relative to
the current node (.//, not //).
2015-03-13 14:28:13 +00:00
Tim Hunt
e1ace26f11
MDL-49389 blocklib: avoid notices when moving blocks to the bottom
2015-03-13 14:27:11 +00:00
David Mudrák
9bcb0ba894
MDL-49361 lang: Add support for $CFG->customstringmanager
2015-03-13 10:45:10 +01:00
Dan Poltawski
4b83ee9b9f
Merge branch 'wip-mdl-48595' of git://github.com/rajeshtaneja/moodle
2015-03-12 08:03:11 +00:00
Damyon Wiese
72f8324ec5
MDL-49163 Webservices, AJAX: Add support for a new ajax webservice handler.
...
This is a new script that can call any function in the built-in AJAX webservice. This is
a new system service that is added at install time (like the mobile webservice). It has no
protocols added to it, but it accessible by a new ajax script /lib/ajax/service.php.
Requests and responses to the script are required to be in json format, and multiple functions can
be called in a single request.
2015-03-12 15:07:08 +08:00
Rajesh Taneja
f978c3347a
MDL-48595 core_stats: get time everytime it's used
...
Depending on server speed, time might be more then
expected. So rather then using variable, get current
time where required
2015-03-12 12:49:44 +08:00
Eloy Lafuente (stronk7)
aa38c5e98d
Merge branch 'MDL-49094-master' of git://github.com/andrewnicols/moodle
2015-03-11 12:36:34 +01:00
Andrew Nicols
cfb8019b67
MDL-49269 javascript: Set default loglevel to warn
2015-03-11 12:18:31 +08:00
David Monllao
79565fa55a
MDL-49298 admin: Adding upgrade.txt info about enabletgzbackups
2015-03-11 08:41:22 +08:00
David Monllao
42d81ef740
Merge branch 'MDL-49298-master' of git://github.com/merrill-oakland/moodle
...
Conflicts:
version.php
2015-03-11 08:33:23 +08:00
David Monllao
7f7fd7e1e2
Merge branch 'MDL-49269-master' of git://github.com/andrewnicols/moodle
2015-03-11 08:23:30 +08:00
Andrew Nicols
3acc64e323
MDL-49269 javascript: Add log, and loglevel amd modules
2015-03-11 08:17:54 +08:00
Dan Poltawski
9be958e2f0
MDL-39752 fix whitespace errors
...
(And some others unrelated to above issue, because its spring and i'm
cleaning).
2015-03-10 14:13:20 +00:00
Rajesh Taneja
17e675a7fc
MDL-39752 behat: Return proper behat dir if config set
2015-03-10 13:51:37 +00:00
Dan Poltawski
9fe26fb874
MDL-48595 upgrade.txt: just add some rationale explaining change
2015-03-10 10:00:40 +00:00
Dan Poltawski
6755498637
Merge branch 'MDL-48595_master' of git://github.com/dmonllao/moodle
...
Conflicts:
version.php
2015-03-10 09:59:28 +00:00
David Monllao
ceba96bbca
Merge branch 'MDL-49256-master' of git://github.com/andrewnicols/moodle
...
Conflicts:
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
2015-03-10 17:42:35 +08:00
Dan Poltawski
1151c0cd8b
Merge branch 'MDL-48682_master' of git://github.com/dmonllao/moodle
2015-03-10 08:25:30 +00:00
Dan Poltawski
a0941ad0af
Merge branch 'wip-mdl-39752' of https://github.com/rajeshtaneja/moodle
2015-03-10 08:08:51 +00:00
David Monllao
fa91462dfa
Merge branch 'MDL-49316-master' of git://github.com/jleyva/moodle
...
Conflicts:
version.php
2015-03-10 15:50:13 +08:00
David Monllao
2af068596a
Merge branch 'MDL-49366' of git://github.com/timhunt/moodle
2015-03-10 14:41:09 +08:00
David Monllao
dbf51f9117
Merge branch 'MDL-49107-master' of git://github.com/FMCorz/moodle
2015-03-10 11:42:58 +08:00
David Monllao
ed1027765e
Merge branch 'MDL-49332-master' of git://github.com/merrill-oakland/moodle
2015-03-10 10:42:42 +08:00
David Monllao
5091a63fc1
Merge branch 'MDL-46064_master' of git://github.com/markn86/moodle
2015-03-10 10:23:55 +08:00
David Monllao
039b74fd01
Merge branch 'MDL-5583-master' of git://github.com/xow/moodle
2015-03-10 10:02:23 +08:00
