Sam Hemelryk
b7a9846a26
Merge branch 'MDL-46138-master' of git://github.com/damyon/moodle
2014-07-14 10:39:54 +12:00
Tony Butler
817b202018
MDL-46286 lib_htmlpurifier: Add allowed URI scheme for RTMP
...
Signed-off-by: Tony Butler <tonyjbutler@gmail.com>
2014-07-11 15:52:34 +01:00
David Monllao
93d14b8ad1
MDL-44523 events: Changing edulevels to make them consistent with other events
2014-07-11 10:36:00 +08:00
Damyon Wiese
ab57368a72
MDL-46138 tasks: The adhoc task is being too helpful with json_encoding/decoding.
2014-07-11 09:43:32 +08:00
Ray Morris
3120e06440
MDL-46290 Completion: Remove unused function get_incomplete_criteria(), it doesn't work
2014-07-10 15:42:01 -05:00
Brian Barnes
40ebfaeefd
MDL-46226 core: pix_icon no longer sets title to the alt text
2014-07-11 08:41:11 +12:00
Syxton
9a4231e993
MDL-45847 resort: Add more course sorting options
...
MDL-45847 resort: Add more course sorting options
Add descending sort options and course timecreated sort options.
Includes behat and unit test changes.
2014-07-10 16:15:26 -04:00
Russell Smith
9462323b13
MDL-46193 phpunit: Replace value in component config.
...
There are two phpunit.xml build locations, one for overall
and another for individual components. To reduce id changes
when running different components, we use the same initial ID
in all component files when building.
2014-07-10 09:53:23 +02:00
Damyon Wiese
a77e8b7b7b
Merge branch 'MDL-19270_master' of https://github.com/nadavkav/moodle
...
Conflicts:
lib/graphlib.php
2014-07-10 09:57:06 +08:00
Nadav Kavalerchik
94e2dc1daf
MDL-19270 - Quiz graph - Fix reverse display of Hebrew legend text in RTL mode
2014-07-09 14:57:31 +03:00
Frederic Massart
cd6e149c86
MDL-45471 javascript: Escape content of exception dialogs
2014-07-08 12:59:59 +01:00
Marina Glancy
de5009f4a2
MDL-43948 forms: setting types to filemanager and editor elements
2014-07-08 10:47:29 +01:00
Marina Glancy
9f7379e9b4
MDL-37812 user: apply default values for user preferences when creating user
2014-07-08 12:35:44 +08:00
Sam Hemelryk
1c194014bf
MDL-19270 core_text: added unit tests for strrev
2014-07-08 14:14:51 +12:00
Sam Hemelryk
d320391099
Merge branch 'MDL-19270_master' of https://github.com/nadavkav/moodle
2014-07-08 13:53:40 +12:00
Sam Hemelryk
7044c6be1f
Merge branch 'MDL-46200-master' of git://github.com/danpoltawski/moodle
2014-07-08 13:38:04 +12:00
Sam Hemelryk
2f8cf35811
Merge branch 'MDL-46193' of git://github.com/mr-russ/moodle
2014-07-08 13:10:24 +12:00
Sam Hemelryk
a5dcdd4bd9
Merge branch 'MDL-46240-master' of git://github.com/danpoltawski/moodle
2014-07-08 10:34:28 +12:00
Eloy Lafuente (stronk7)
292803a4f9
Merge branch 'wip_MDL-45945_m28_mssqlcol' of https://github.com/skodak/moodle
2014-07-08 00:31:54 +02:00
Sam Hemelryk
03ecddb440
MDL-45678 cache: renamed new cache and better comments
2014-07-08 09:52:41 +12:00
Sam Hemelryk
207891d791
Merge branch 'MDL-45678-006-master' of https://github.com/dbezborodovrp/moodle
2014-07-08 09:42:35 +12:00
Sam Hemelryk
a02656b75a
Merge branch 'wip_MDL-46126_m28_passnulls' of https://github.com/skodak/moodle
2014-07-08 09:37:08 +12:00
Sam Hemelryk
744c77c057
Merge branch 'MDL-16474-master' of git://github.com/FMCorz/moodle
2014-07-08 08:29:45 +12:00
Adrian Greeve
005402f503
MDL-46201 events: Sanitization of username before returning the description.
2014-07-07 18:18:45 +01:00
Charles Fulton
65d7932ca3
MDL-46247 auth: Add new language for unauthorised external user
2014-07-07 10:16:09 -07:00
Dan Poltawski
20490cbb2b
MDL-43848 messages: do not display message content in popups
...
The user is not in control of when these popups show up and it
may not be appropiate to have part of this content display whilst
in the presence of other users.
2014-07-07 13:37:10 +08:00
Brian Barnes
ef56323c7f
MDL-46250 core_filepicker: Changed headings to be heading tags instead of spans
2014-07-07 10:24:39 +12:00
Nadav Kavalerchik
cdf8a0c262
MDL-19270 - Quiz graph - Fix reverse display of Hebrew legend text in RTL mode
2014-07-06 18:46:45 +03:00
Dan Poltawski
46fa062894
MDL-46200 fix missing space in failed login message
2014-07-04 14:49:13 +01:00
Dan Poltawski
e1673b58ec
MDL-46240 atto_collapse: fix icon url
2014-07-04 14:33:39 +01:00
Russell Smith
529495f7ce
MDL-46193 phpunit: Use random starting value on initialization.
2014-07-04 16:33:13 +10:00
Damien Bezborodov
eeb9ee8ebf
MDL-45678 assignsubmission_comments: Improve performance for permissions checking
2014-07-04 14:24:31 +09:30
Petr Skoda
ffda0ca360
MDL-46126 upgrade: fix bogus nulls in user.password before changing precission
...
Note: there is no need to deal with Oracle empty strings here
because only MySQL running in non-strict mode is affected.
2014-07-04 16:28:59 +12:00
Petr Skoda
b86912431e
MDL-45945 mssql: force default database collation in all tables including temp table
2014-07-04 15:04:50 +12:00
Marina Glancy
9422f6ee42
MDL-46163 question/quiz: fix elements ids and their labels
2014-07-03 10:13:00 +01:00
Sam Hemelryk
ebdcb2924c
MDL-41663 output: fix for methods with _renderable suffix
2014-07-02 14:59:31 +12:00
Sam Hemelryk
da6ddbf8e6
Merge branch 'wip-MDL-46147-master' of git://github.com/marinaglancy/moodle
2014-07-02 09:31:34 +12:00
Dan Poltawski
9b19282346
Merge branch 'MDL-46161_files_reference_index' of git://github.com/davosmith/moodle
...
Conflicts:
lib/db/upgrade.php
version.php
2014-07-01 13:37:56 +01:00
Dan Poltawski
99fbe16211
Merge branch 'wip_MDL-46099_m28_userglobal' of https://github.com/skodak/moodle
2014-07-01 10:39:14 +01:00
Dan Poltawski
5474aa7a6d
Merge branch 'MDL-32450_master' of https://github.com/markn86/moodle
2014-07-01 10:37:50 +01:00
Marina Glancy
acbf4579d5
MDL-46147 modinfo: performance improvement for course page (check filterall)
2014-07-01 15:28:54 +08:00
Damyon Wiese
0d9805dc14
MDL-46147 modinfo: performance improvement for course page
...
This is a big win in a specific situation, ie filters enabled for content+headings,
and no activity descriptions visible on the course page.
2014-07-01 15:26:06 +08:00
Sam Hemelryk
a0145560b9
Merge branch 'MDL-40805-master' of git://github.com/lameze/moodle
2014-07-01 09:06:12 +12:00
Petr Skoda
2e00d01db4
MDL-46099 session: fix use of references for session globals
...
This reverses the references used for global $USER and $SESSION,
the reason is that PHP does not allow references to references.
$USER is a reference to $GLOBALS['USER'] which means we cannot
put any references to it. Solution is to store the current user and session
objects in $GLOBALS['USER'] and $GLOBALS['SESSIOn'] are reference
them in $_SESSION.
This patch makes the session code behave the same way in CLI,
phpunit and normal web requests - this allows use to finally
unit test most aspects of the session code in Moodle.
2014-07-01 08:38:00 +12:00
Mark Nelson
c9b0e9769a
MDL-32450 editor_tinymce: documented removal of DragMath
2014-06-30 13:08:00 -07:00
Mark Nelson
07f8f2f559
MDL-32450 editor_tinymce: removed DragMath from the 'customtoolbar' setting
2014-06-30 13:07:33 -07:00
Dan Poltawski
f74b3cd8bc
Merge branch 'wip-mdl-45641' of https://github.com/rajeshtaneja/moodle
2014-06-30 15:12:30 +01:00
Dan Poltawski
6f90b157f3
Merge branch 'MDL-41663-master' of git://github.com/damyon/moodle
2014-06-30 09:24:39 +01:00
Frederic Massart
3774d40f8c
MDL-16474 scale: Allow scales with 1 item
2014-06-30 14:24:24 +08:00
Mark Nelson
e3e4ea97ff
MDL-32450 upgrade: do not remove DragMath settings if the files still exist
2014-06-29 15:48:21 -07:00