15734 Commits

Author SHA1 Message Date
Sam Hemelryk
5c8f681713 MDL-39216 url: moodle_url now handles empty param values properly 2013-04-30 11:09:47 +12:00
Sam Hemelryk
45d9752205 MDL-39216 url: updated tests to show desired outcome 2013-04-30 11:09:47 +12:00
Sam Hemelryk
616396a6cf MDL-39216 url: new moodle_url tests for valueless params 2013-04-30 11:09:47 +12:00
Dan Poltawski
1c97061a35 MDL-39341 boostrapbase: fix some missing renames 2013-04-26 09:54:21 +01:00
Damyon Wiese
4f1008202d MDL-39341 Themes Rename bootstrap to bootstrapbase 2013-04-26 13:01:06 +08:00
Eloy Lafuente (stronk7)
29b8b7e11a Merge branch 'MDL-39358-standard-clean' of git://github.com/mudrd8mz/moodle 2013-04-25 23:50:08 +02:00
David Mudrák
e18597fa15 MDL-39358 Mark the new theme_clean as a standard plugin 2013-04-25 22:23:58 +02:00
Dan Poltawski
78129ff0be Merge branch 'MDL-29258_master' of git://github.com/dmonllao/moodle 2013-04-25 10:19:45 +01:00
Eloy Lafuente (stronk7)
274511f0cb Merge branch 'MDL-35364' of git://github.com/timhunt/moodle 2013-04-24 23:35:46 +02:00
Damyon Wiese
11b6045b09 Merge branch 'wip-MDL-32946-master' of git://github.com/phalacee/moodle 2013-04-24 16:10:30 +08:00
Jason Fowler
473327030e MDL-32946 - Blocks - Improving image alts for accessibility. 2013-04-24 13:06:22 +08:00
Eloy Lafuente (stronk7)
14559e1849 MDL-38972 xmldb: amend comments. 2013-04-24 02:09:34 +02:00
Eloy Lafuente (stronk7)
01159be8de Merge branch 'w16_MDL-38972_m25_oraindex' of git://github.com/skodak/moodle 2013-04-24 02:02:20 +02:00
Eloy Lafuente (stronk7)
bdeda339b4 Merge branch 'wip-MDL-38441-m25' of git://github.com/samhemelryk/moodle 2013-04-23 23:41:47 +02:00
Petr Škoda
cc1e433286 MDL-39306 fix course search regression
Oracle handling of NULLs is totally wrong and crazy!
2013-04-23 12:36:50 +02:00
Damyon Wiese
a4fea69fde MDL-34933 Fix bad merge (grr) 2013-04-23 12:15:17 +08:00
David Monllao
f14d4122df MDL-29258 core_portfolio: Fixing broken default breadcrumb 2013-04-23 11:12:51 +08:00
Damyon Wiese
b0c4e47499 Merge branch 'MDL-34933_master' of https://github.com/mchurchward/moodle
Conflicts:
	lib/db/upgrade.php
	version.php
2013-04-23 09:20:05 +08:00
Sam Hemelryk
7376692527 Merge branch 'MDL-39281-master' of git://github.com/danpoltawski/moodle 2013-04-23 10:17:03 +12:00
Tim Hunt
4a7cc24808 MDL-35364 shorten text: don't return invalid HTML.
I also broke the unit tests into more, smaller, named tests, so that
when things start failing, more tests are run, and it is clearer what
the problem is.

In a couple of cases, I adjusted the $ideal lenght in the test. A
careful counting of the characters in the test input (added as comments)
suggests that the new values make for better tests.
2013-04-22 19:21:40 +01:00
Dan Poltawski
596791eb69 MDL-39281 portfolio: missing setType call 2013-04-22 17:01:37 +01:00
Dan Poltawski
789ce8202b Merge branch 'MDL-39148-uninstall' of git://github.com/mudrd8mz/moodle
Conflicts:
	theme/bootstrap/style/generated.css
2013-04-22 14:33:28 +01:00
Mike Churchward
d750d41e66 MDL-34933 core_message: Adding index to improve database access on message_working table. 2013-04-22 08:39:25 -04:00
Dan Poltawski
816659ed9e Merge branch 'MDL-39249-upgrade-wizard' of git://github.com/mudrd8mz/moodle 2013-04-22 13:12:48 +01:00
Dan Poltawski
e39ef3d124 Merge branch 'wip-MDL-37942-master' of git://github.com/jason-platts/moodle 2013-04-22 12:42:10 +01:00
Dan Poltawski
4bb3f29e02 Merge branch 'w16_MDL-39141_m25_toolbar' of git://github.com/skodak/moodle 2013-04-22 12:38:47 +01:00
Damyon Wiese
946f2b0826 MDL-36959 file_storage: Preserve each file in a hash collision 2013-04-22 12:07:43 +08:00
Damyon Wiese
e9cd87eef2 Merge branch 'w16_MDL-36959_m25_poolhashes' of git://github.com/skodak/moodle 2013-04-22 11:38:07 +08:00
Sam Hemelryk
9c2cbcdc04 Merge branch 'MDL-39220' of git://github.com/colchambers/moodle 2013-04-22 11:37:34 +12:00
Petr Škoda
fd4592bbbc MDL-36959 test reworked adding of files to sha1 content pool 2013-04-20 21:59:08 +02:00
Petr Škoda
d91e2c15db MDL-36959 rework adding of content files to the file pool
This patch includes refreshing of borked files in file pool and basic prevention of race conditions. It also helps with diagnosing of file pool permission problems, detects coding errors and some other type of problems including sha1 collision jackpot.
2013-04-20 21:41:41 +02:00
David Mudrák
7b1e0645c1 MDL-39249 Fix typo in available_update_deployer class
I have accidentally spotted this typo while working on this branch. It
has never caused any harm as both parameters callerurl and returnurl are
always passed. Blame copy/pasting of code blocks.
2013-04-20 03:01:36 +02:00
David Mudrák
5d7a4bab3f MDL-39249 Return to the correct page after successful update deployment
The method available_update_deployer::make_execution_widget() used to
have hard-coded return URL. Now it accepts the return URL as the second
parameter and passes it to the mdeploy.php utility.

The callerurl parameter is now correctly passed and used.
2013-04-20 03:00:19 +02:00
Dan Poltawski
00a850b33e Merge branch 'wip-MDL-38565-m25' of git://github.com/samhemelryk/moodle 2013-04-19 13:29:07 +01:00
David Mudrák
badf464792 MDL-39148 Non-installed plugins cannot be uninstalled
If the plugin has been only deployed to the disk without installing into
the database, do not allow going through the uninstallation procedure.
Not only it does not have much sense. But it can also lead to some
tricky situation due to dependencies. Better to block it and wait till
the plugin is either fully installed or removed from the disk.
2013-04-19 11:24:43 +02:00
Damyon Wiese
747230d564 Merge branch 'wip-MDL-39211-m25' of git://github.com/marinaglancy/moodle 2013-04-19 13:53:14 +08:00
Sam Hemelryk
476554bbca Merge branch 'MDL-38777-m' of git://github.com/andrewnicols/moodle 2013-04-19 15:20:44 +12:00
Sam Hemelryk
5cba0c4ba3 MDL-38565 cache: tidy up pre-integration 2013-04-19 10:13:36 +12:00
Sam Hemelryk
fbf76dcd17 MDL-38565 cache: upgrade code to amend default stores 2013-04-19 10:12:59 +12:00
Sam Hemelryk
059102e728 MDL-38565 cache: cron routine to clean up old session data 2013-04-19 10:11:48 +12:00
Sam Hemelryk
0678958015 MDL-38411 css: new unit tests to cover chunking 2013-04-19 10:09:45 +12:00
Sam Hemelryk
e10750279d MDL-38441 css: implemented chunking of large sheets 2013-04-19 10:09:45 +12:00
Petr Škoda
9a1c818d28 MDL-39141 fix customtoolbar notices during upgrade 2013-04-18 20:22:01 +02:00
Petr Škoda
2d97513d12 MDL-38972 add upgrade info for duplicate index-key problems 2013-04-18 20:21:03 +02:00
Petr Škoda
02e5f81c94 MDL-38972 detect key-index duplicates 2013-04-18 20:21:02 +02:00
Colin Chambers
919834f2eb MDL-39220 Javascript: Editor shrinks using collapse button 2013-04-18 15:46:07 +01:00
Damyon Wiese
1d0c0c4a23 MDL-38592: Add major version redirect for settings used frontpage. 2013-04-18 16:42:33 +08:00
Dan Poltawski
5ca1899e6e Merge branch 'MDL-39203-master' of git://github.com/FMCorz/moodle 2013-04-18 08:50:29 +01:00
Frederic Massart
926a3512a5 MDL-39203 repository: Fixed authentication errors with Dropbox 2013-04-18 14:47:22 +08:00
Marina Glancy
473d5f74c7 MDL-39211 forgotten include of /course/lib.php 2013-04-18 13:47:04 +10:00