Eloy Lafuente (stronk7)
28a614a83f
Merge branch 'MDL-50371' of https://github.com/danielneis/moodle
2015-08-13 00:38:41 +02:00
David Monllao
6413794018
Merge branch 'MDL-37864-master' of git://github.com/xow/moodle
2015-08-12 09:35:46 +08:00
David Monllao
f2e50523d1
Merge branch 'MDL-50839-master' of git://github.com/Dave-B/moodle
2015-08-12 08:32:11 +08:00
David Monllao
3718d2cd17
Merge branch 'MDL-50947_master' of git://github.com/moodlerooms/moodle
2015-08-12 08:30:03 +08:00
David Monllao
ede96605ac
Merge branch 'MDL-51053-master' of git://github.com/sammarshallou/moodle
2015-08-12 08:23:29 +08:00
Eloy Lafuente (stronk7)
20c50b0d5c
Merge branch 'MDL-50062-master' of git://github.com/FMCorz/moodle
2015-08-12 01:52:04 +02:00
Eloy Lafuente (stronk7)
b7759a1889
Merge branch 'MDL-50307-master-3' of git://github.com/xow/moodle
2015-08-11 23:44:50 +02:00
Eloy Lafuente (stronk7)
789d40a803
Merge branch 'MDL-49293-master' of git://github.com/andrewnicols/moodle
2015-08-11 22:58:09 +02:00
Sam Chaffee
5222ab7f4b
MDL-50947 mod_lti Add removed grade.php to upgrade_stale_php_files_present
2015-08-11 10:42:08 -06:00
sam marshall
27479b5cc9
MDL-51053 Restore: Static cache breaks unit tests
2015-08-11 14:07:38 +01:00
David Balch
9dcd50358a
MDL-50839 user_menu: Allow themes to set User menu avatar size.
...
Added an @array "options" parameter to user_get_user_navigation_info(),
for passing in avatarsize, and possibly other options in future.
Also removed an errant parameter in the /lib/outputrenderers.php
user_get_user_navigation_info() call, as there was no corresponding
parameter in the function definition.
(Test written by Jetha Chan.)
2015-08-11 13:57:17 +01:00
David Monllao
8c497d8d9f
Merge branch 'MDL-51014-master' of git://github.com/sammarshallou/moodle
2015-08-11 13:08:11 +08:00
John Okely
dd106c8824
MDL-37864 lib: Change help for headers to match existing table api
2015-08-11 12:18:21 +08:00
Marina Glancy
edbea936c5
MDL-37864 lib: corrections to help icon in tables
2015-08-11 12:18:21 +08:00
Sergey Rozhkov
3fed76e4df
MDL-37864 lib: Help icon work correctly in table header with sorting
2015-08-11 12:18:20 +08:00
John Okely
c8bde450a1
MDL-50307 auth_db: Fix associative fetching in ADODB 2.19
2015-08-11 12:11:43 +08:00
Rajesh Taneja
b9432e1a7d
MDL-50926 phpunit: Advanced testcase should extend base_testcase
2015-08-11 02:37:28 +02:00
Tony Levi
b80b35d0fc
MDL-50926 phpunit: Upgrade to phpunit 4.x
2015-08-11 02:35:11 +02:00
Mark Johnson
c5639c9118
MDL-51014 behat: Wait for filepicker to load repository
2015-08-10 13:37:24 +01:00
Marina Glancy
7f0c7f01c0
MDL-51062 behat: permission steps should work without js
2015-08-09 20:33:27 +08:00
Frederic Massart
b13afc368e
MDL-50062 behat: Handle category mapping for grade items generator
2015-08-06 11:56:44 +08:00
Frederic Massart
01a088e0a2
MDL-50062 grades: Tests for item::set_aggregation_fields_for_aggregation
2015-08-06 10:24:25 +08:00
Frederic Massart
5419cbc9eb
MDL-50062 grades: Carry agg. settings between categories when possible
2015-08-06 10:24:25 +08:00
Dave Cooper
135efd5116
MDL-50062 gradebook: Fixed behaviour when changing aggregation mathods.
2015-08-06 10:24:25 +08:00
Eloy Lafuente (stronk7)
1f65da81f5
Merge branch 'MDL-50416-master' of git://github.com/lameze/moodle
2015-08-04 20:04:27 +02:00
Andrew Nicols
3c81333aa4
Merge branch 'MDL-50008-master' of git://github.com/jleyva/moodle
2015-08-04 16:20:55 +08:00
Andrew Nicols
121eaa6cfe
Merge branch 'MDL-49792-master' of git://github.com/jleyva/moodle
2015-08-04 16:17:43 +08:00
Andrew Nicols
673b3c730b
Merge branch 'MDL-49791-master' of git://github.com/jleyva/moodle
2015-08-04 16:07:11 +08:00
Andrew Nicols
719af68938
Merge branch 'wip-MDL-45113-master' of https://github.com/mackensen/moodle
2015-08-04 15:21:22 +08:00
Andrew Nicols
ac41247254
Merge branch 'MDL-50532-master' of git://github.com/FMCorz/moodle
2015-08-04 12:09:30 +08:00
Andrew Nicols
8e8e8de93d
Merge branch 'MDL-50771' of git://github.com/stronk7/moodle
2015-08-04 10:19:04 +08:00
Andrew Nicols
fec4959809
Merge branch 'MDL-45772-master-4' of git://github.com/xow/moodle
2015-08-04 09:56:47 +08:00
John Okely
380001929a
MDL-45772 admin: Stop browsers from autofilling passwords incorrectly
2015-08-04 09:54:34 +08:00
Eloy Lafuente (stronk7)
7b82add579
Merge branch 'wip-MDL-19748-master' of https://github.com/marinaglancy/moodle
2015-08-03 21:20:04 +02:00
Eloy Lafuente (stronk7)
15c0a85071
MDL-50771 oracle: Bind long (>4000byte) text as CLOB
...
While we already were detecting @ normalise_value()
both BLOBs and CLOBs properly on insert and update
statements (by introspectind the column specs), when
a long TEXT is being passed as part of an arbitrary
SQL, or within the conditions... it was being bound
as VARCHAR, leading to problems if used in combination
with DBMS_LOB functions.
This patch just ensures that any TEXT > 4000 bytes not
detected by normalise_value() will be, always, bound as CLOB,
unconditionally.
Covered with tests both covering its use with DBMS_LOB (the
reported bug) and also in general raw statements.
2015-08-03 10:50:56 +02:00
Andrew Nicols
4314797382
Merge branch 'MDL-50624-master' of git://github.com/ryanwyllie/moodle
2015-08-03 09:19:17 +08:00
Ryan Wyllie
19452dc4be
MDL-50624 environment: add PHP7 as unsupported version
...
Added PHP7 as an unsupported version for Moodle 2.8 and 2.9 in
the environment checks
2015-08-03 00:58:50 +00:00
Charles Fulton
b6f28375b7
MDL-45113 auth: add is_configured method and convert auth_db to use it
2015-07-31 15:16:08 +00:00
Simey Lameze
e284ac02c3
MDL-50416 environment: remove slasharguments warning from install
2015-07-31 11:34:42 +08:00
Juan Leyva
734c7452d3
MDL-50008 folder: New Web Service mod_folder_view_folder
2015-07-30 23:02:47 +02:00
Juan Leyva
3c779961ad
MDL-49792 resource: New WS mod_resource_view_resource
2015-07-30 23:01:21 +02:00
Juan Leyva
0918811037
MDL-49791 page: New Web Service mod_page_view_page
2015-07-30 22:59:30 +02:00
Daniel Neis Araujo
b6d1812dd7
MDL-50371 gradebook: gradepointdefault for manual itens and categories
2015-07-29 17:08:27 -03:00
Frederic Massart
b2f6f88dc2
MDL-50532 tasks: Delete obsolete tasks during upgrade
2015-07-29 11:25:16 +08:00
Dan Poltawski
dbceb531a7
Merge branch 'MDL-50868-master' of git://github.com/jethac/moodle
2015-07-28 12:10:55 +01:00
Andrew Nicols
8a53c3f433
Merge branch 'wip-MDL-50874-master' of https://github.com/marinaglancy/moodle
2015-07-28 14:08:54 +08:00
Andrew Nicols
335adbe919
Merge branch 'MDL-50295-master' of git://github.com/danpoltawski/moodle
2015-07-28 14:02:07 +08:00
Andrew Nicols
588cf28082
Merge branch 'MDL-35148-master' of git://github.com/FMCorz/moodle
2015-07-28 11:06:38 +08:00
Frederic Massart
e32af34f76
MDL-35148 themes: Updated checks deciding when mobile themes are used
...
Now, if a site-theme is set for tablet/phone AND the user is using
a tablet/phone that site-theme will be used, always. In any other
case the normal theme resolution will be used: course, category, ...
2015-07-28 10:59:18 +08:00
Dan Poltawski
b860082e13
Merge branch 'MDL-43785-master' of git://github.com/andrewnicols/moodle
2015-07-27 14:49:18 +01:00