19959 Commits

Author SHA1 Message Date
David Monllao
a647e1f053 Merge branch 'MDL-49502-master' of git://github.com/jleyva/moodle
Conflicts:
	lib/db/services.php
2015-04-01 11:49:31 +08:00
David Monllao
0005ce8e4b Merge branch 'MDL-49520-master' of git://github.com/gurgus/moodle 2015-04-01 11:13:28 +08:00
Andrew Nicols
2b53b13ff7 MDL-49627 core: Update uses of generate_image_thumbnail
This removes the need to write tempfiles in these locations.
2015-04-01 11:05:19 +08:00
Andrew Nicols
b7067f065e MDL-49627 core: Improve thumbnail generation
We now abstract the actual file generation to a new function.
We are then able to call this function from the other image generation
sources. This allows us to generate thumbnails in a more efficient manner.

* Stored files stay as stored files and are not temporarily re-written to
  disk;
* Strings containing an image remain as a variable and are not temporarily
  written to disk; and
* Arbitrary files are not captured to string.
2015-04-01 11:05:19 +08:00
David Monllao
47d333857d Merge branch 'MDL-23296-master' of git://github.com/FMCorz/moodle 2015-04-01 10:41:41 +08:00
Eloy Lafuente (stronk7)
e025f20995 Merge branch 'wip-mdl-48605' of https://github.com/rajeshtaneja/moodle 2015-04-01 01:09:25 +02:00
Dan Poltawski
2c92e06106 Merge branch 'MDL-49518-master' of git://github.com/gurgus/moodle 2015-03-31 20:04:54 +01:00
Dan Poltawski
19ffcbe273 Merge branch 'MDL-37864' of https://github.com/serega1394/moodle 2015-03-31 19:53:46 +01:00
Damyon Wiese
2112dd44e8 MDL-49578 TinyMCE: Update to 3.5.11 2015-03-31 19:38:53 +01:00
Dan Poltawski
3d8b835aec Merge branch 'MDL-49564-master' of git://github.com/merrill-oakland/moodle
Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
2015-03-31 19:25:10 +01:00
Dan Poltawski
f0fb1ed518 Merge branch 'MDL-49671-master' of git://github.com/merrill-oakland/moodle 2015-03-31 15:05:37 +01:00
Rajesh Taneja
d83a1c11a2 MDL-48605 unit_test: Only touch real file/dir 2015-03-31 21:45:23 +08:00
Dan Poltawski
22a520231d Merge branch 'MDL-49661-master-pluginfotodo' of git://github.com/mudrd8mz/moodle 2015-03-31 14:37:44 +01:00
Dan Poltawski
a80ff5baa2 Merge branch 'MDL-49643-master-local-nav' of git://github.com/mudrd8mz/moodle 2015-03-31 14:28:08 +01:00
Dan Poltawski
6cb65683d1 Merge branch 'MDL-49598-master' of git://github.com/andrewnicols/moodle 2015-03-31 14:21:37 +01:00
Dan Poltawski
2a9db845f8 Merge branch 'MDL-49641-get_external_files_master' of https://github.com/jpahullo/moodle 2015-03-31 13:15:06 +01:00
Dan Poltawski
7d9df98458 Merge branch 'wip-MDL-46960-master' of https://github.com/marinaglancy/moodle 2015-03-31 09:55:08 +01:00
Dan Poltawski
5b73c94858 Merge branch 'MDL-49525-master' of git://github.com/xow/moodle 2015-03-31 09:24:06 +01:00
David Monllao
4451f89b07 Merge branch 'MDL-44874-master' of git://github.com/andrewnicols/moodle 2015-03-31 15:22:03 +08:00
Rajesh Taneja
d421a973d1 MDL-48605 unit_test: Fixed file_temp_cleanup_task
touch should only work on temp and below
dir's. With path we get temp/.. and temp/.
So we were modfying moodledata dir as well
and it was failing because of permission issues.
2015-03-31 14:59:48 +08:00
Andrew Nicols
70be2642fc MDL-44874 core: Add per-request directory functions
This adds functionality to create individual request directories which can
be only be used for the current request. They are removed by a shutdown
handler.
2015-03-31 13:58:44 +08:00
John Okely
c2260adeff MDL-49525 libraries: Update Jquery to 1.11.2 and JQuery UI to 1.11.4 2015-03-31 11:29:37 +08:00
David Monllao
b8842bcdc7 Merge branch 'MDL-49114-master' of git://github.com/lameze/moodle 2015-03-31 11:29:16 +08:00
Marina Glancy
0cc9d709ab MDL-46960 completionlib: adjustments to caching 2015-03-31 11:06:53 +08:00
Michael Wheeler
3871db0ac2 MDL-46960 completionlib: Move completion cache to MUC. 2015-03-31 09:31:30 +08:00
Eloy Lafuente (stronk7)
02badbb0e6 MDL-32547 unit tests: Make tests match file_temp_cleanup_task impl.
While default value did not change from 7 days... there are subtle
differences between strtotime('-1 week') used in tests and
-(7*24**3600) used in implementation.

This just makes the unit test to follow the implementation by
using the new config setting.
2015-03-31 01:53:56 +02:00
Eloy Lafuente (stronk7)
68632b6d80 MDL-47572 unit tests: make cronlib_testcase DST immune
Disclaimer: I've assigned this commit to MDL-47572 because it's
the issue where I've seen related changes.

Since a couple of days ago, both CI servers were failing. A couple
of days ago it was DST change in Europe/Madrid (that is the PHP
default TZ used by them).

Tests pass perfectly if the TZ is set to any other place not affected
by DST (Australia/Perth, for example).

Really the issue is a wrong mix of functions supporting DST and
functions not supporting them.

But, with current implementation (checking +-60 seconds around a time)
and with a DST change in the middle... this unit tests was going to be
failing for an entire week. And that's not acceptable for CIs.

So, I've changed the intervals, to be bigger than 1h (exactly 1h1s), so
they will be immune to the DST change/partial support.

Ideally all operations should be working in the same way (with or
without DST considered), but that's out from the scope of getting this
test stable enough and passing.
2015-03-31 01:21:18 +02:00
Eloy Lafuente (stronk7)
bdd48b459e MDL-49203 webservices: Increment subsystems count in unit tests. 2015-03-31 00:42:27 +02:00
Eloy Lafuente (stronk7)
f802e1c2c8 Merge branch 'MDL-49203-master' of git://github.com/jleyva/moodle 2015-03-30 20:01:10 +02:00
Dan Poltawski
2b36742f16 Merge branch 'MDL-49528-master' of git://github.com/xow/moodle 2015-03-30 15:04:45 +01:00
Dan Poltawski
b3e6240f22 Merge branch 'wip-MDL-49522-master' of git://github.com/abgreeve/moodle 2015-03-30 12:18:41 +01:00
Andrew Nicols
ad3532dea1 MDL-44874 core: Move uuid generation to setuplib 2015-03-30 11:42:14 +08:00
John Okely
b508047b86 MDL-49528 libraries: Upgrade Markdown to 1.5.0 2015-03-30 11:33:05 +08:00
John Okely
2ff5c0fdb5 MDL-49528 libraries: Update thirdpartylib entry for Markdown to 1.5.0 2015-03-30 11:33:04 +08:00
Simey Lameze
1bd4b9fcb4 MDL-49114 environment: add slasharguments warning message 2015-03-30 10:15:04 +08:00
Sergey Rozhkov
f1e1477142 MDL-37864 lib: Help icon work correctly in table header with sorting 2015-03-29 22:47:55 +03:00
Juan Leyva
449a6304d4 MDL-49502 forum: Add the new function to the mobile service 2015-03-27 11:33:34 +01:00
Eric Merrill
73e144334b MDL-49671 atto: Any pastes that don't have html should clean everything
Browsers may not provide html content in the clipboard object event
though it will really be pasted as such. This includes Firefox on
Windows, Internet Explorer, and some niche cases in Safari.

Because of this, we need to scrub the entire editor anytime we can't
intercept a paste event.

In some magical day in the future when there is better cross browser
support, we can undo this.
2015-03-26 23:31:05 -04:00
Eric Merrill
1b6ce030d3 MDL-49564 atto: Improve empty span removal
Paste from MS word, followed by cleaning, may leave many many unused
spans. Try to remove them.
2015-03-26 23:05:23 -04:00
Juan Leyva
e77a0f368f MDL-49203 webservices: Coding style fixes, ws added to the app service 2015-03-26 15:57:58 +01:00
Costantino Cito
be9854162f MDL-49203 webservices: New WS core_comment_get_comments 2015-03-26 15:57:21 +01:00
David Mudrák
a69ba70ddc MDL-49643 navigation: Fix API for extending navigation in local plugins 2015-03-26 12:17:15 +01:00
David Mudrák
4ad70aede0 MDL-49661 pluginfo: Do not consider missing version.php as correct
All plugins are required to contain valid version.php since Moodle 2.5.
It's time to get rid of this TODO.
2015-03-26 12:16:20 +01:00
David Monllao
cfb32192d6 MDL-47002 editor_atto: Remove all after html when pasting 2015-03-26 16:15:29 +08:00
David Monllao
d784f5edc3 MDL-47002 editor_atto: Clean the comments separately 2015-03-26 14:37:55 +08:00
Dave Cooper
b1c5888daf MDL-49520 libraries: Update password_compat library 2015-03-26 10:05:00 +08:00
Eric Merrill
665829ec2a MDL-47002 atto: Prevent removal of Rangy spans 2015-03-25 10:02:43 -04:00
Jordi Pujol Ahulló
d5f596589b MDL-49641 repository_dropbox: preventing poor performance.
emptied sort default value at get_external_files to prevent poor performance.
2015-03-25 08:00:27 +01:00
David Monllao
67b853ff6b MDL-45619 repository: Don't allow repository_recent to be uninstalled
We have tests that depends on it and it
is a simple repo that can just be disabled.
2015-03-25 09:39:12 +08:00
David Monllao
1c78065ad6 Merge branch 'MDL_45619_m29v5' of git://github.com/sbourget/moodle 2015-03-25 09:38:24 +08:00