Tim Lock
9c390d62ed
MDL-41908 QuickForm: Fix PEAR Non-static method error
2013-10-01 09:53:26 +09:30
Eloy Lafuente (stronk7)
b744b90df5
Merge branch 'w40_MDL-41707_m26_exttests' of https://github.com/skodak/moodle
2013-10-01 02:14:23 +02:00
Marina Glancy
f09ecc6d8b
Merge branch '41988-26' of git://github.com/samhemelryk/moodle
2013-10-01 10:01:17 +10:00
Eloy Lafuente (stronk7)
b1698e9ac5
Merge branch 'MDL-41962-master' of git://github.com/FMCorz/moodle
2013-10-01 01:52:53 +02:00
Sam Hemelryk
53be2d782a
Merge branch 'MDL-41926_master' of git://github.com/dmonllao/moodle
2013-10-01 12:07:22 +13:00
Sam Hemelryk
5e319f5101
Merge branch 'wip-MDL-37559-m26-showshortname' of git://github.com/henesnarfel/moodle
2013-10-01 11:18:14 +13:00
Sam Hemelryk
7da590c11b
Merge branch 'MDL-40572_master' of https://github.com/totara/openbadges
2013-10-01 11:05:59 +13:00
Sam Hemelryk
8e5f86bcb3
MDL-41988 behat: improvements to spin
2013-10-01 10:24:36 +13:00
Sam Hemelryk
7bd5d84fd8
Merge branch 'wip-MDL-32773-master' of git://github.com/marinaglancy/moodle
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2013-10-01 10:17:13 +13:00
Sam Hemelryk
bd5797e6cc
Merge branch 'wip-MDL-41676-master' of git://github.com/marinaglancy/moodle
2013-10-01 10:14:04 +13:00
Sam Hemelryk
c392392725
Merge branch 'MDL-37973' of https://github.com/merrill-oakland/moodle
2013-10-01 09:54:26 +13:00
Eloy Lafuente (stronk7)
94211c02c3
Merge branch 'MDL-40050-master' of git://github.com/FMCorz/moodle
2013-09-30 21:55:41 +02:00
Eloy Lafuente (stronk7)
833d1eb0e2
Merge branch 'MDL-26408-master' of git://github.com/danpoltawski/moodle
2013-09-30 16:01:38 +02:00
Jamie Pratt
6dd9362e84
MDL-41761 statistics should be calculable for last or highest attempts
...
as well as for first or all attempts.
This commit drops a database table and then recreates it. This is in
order to be able to have some new columns in the table be NOT NULL with
no default value, which would not be possible if I added fields to an
existing table.
The quiz_statistics table is used for caching calculated values only
and thus we can safely drop it and recreate it.
2013-09-30 18:05:46 +07:00
Marina Glancy
9e11059326
Merge branch 'MDL-12403-master' of git://github.com/danpoltawski/moodle
2013-09-30 18:04:38 +10:00
Marina Glancy
e6ec2366a8
Merge branch 'MDL-41885-master' of git://github.com/danpoltawski/moodle
...
Conflicts:
mod/upgrade.txt
2013-09-30 17:57:30 +10:00
Mark Nielsen
50ae8814e4
MDL-40248 mod: Allow xxx_get_types() to use default display
...
* Added new constant: MOD_SUBTYPE_NO_CHILDREN
* When MOD_SUBTYPE_NO_CHILDREN is returned from xxx_get_types()
then default display is used for activity chooser.
* Updated mod/upgrade.txt
* Removed dead code from navigationlib.php instead of updating
it for new behavior of xxx_get_types
* Updated lib/upgrade.txt
2013-09-30 16:49:37 +10:00
Marina Glancy
f13511451c
Merge branch 'MDL-41954-workshop-zero-variance' of git://github.com/mudrd8mz/moodle
2013-09-30 16:09:40 +10:00
Sam Hemelryk
d55c29562b
Merge branch 'MDL-16464' of git://github.com/timhunt/moodle
2013-09-30 16:34:51 +13:00
Sam Hemelryk
73cc3bdeb0
Merge branch 'MDL-41227_dd' of https://github.com/andyjdavis/moodle
...
Conflicts:
course/yui/toolboxes/toolboxes.js
2013-09-30 16:15:53 +13:00
Sam Hemelryk
5e8331c814
NOBUG fixed up whitespace
2013-09-30 15:51:08 +13:00
Sam Hemelryk
4754755625
Merge branch 'wip-MDL-33416-master' of git://github.com/marinaglancy/moodle
2013-09-30 15:42:03 +13:00
Sam Hemelryk
00a2879412
Merge branch 'master_MDL-41848' of git://github.com/danmarsden/moodle
2013-09-30 12:09:50 +13:00
Sam Hemelryk
28a2ecc6c4
Merge branch 'w40_MDL-41176_m26_useredit' of https://github.com/skodak/moodle
2013-09-30 11:55:19 +13:00
Sam Hemelryk
f88787b604
NOBUG: rebuilt bootstrap CSS
2013-09-30 11:10:21 +13:00
Sam Hemelryk
e2c4c4202d
Merge branch 'MDL-33569_M26' of git://github.com/lazydaisy/moodle
2013-09-30 10:48:36 +13:00
Sam Hemelryk
2f0a996b10
Merge branch 'MDL-41888-master' of git://github.com/jamiepratt/moodle
2013-09-30 10:38:11 +13:00
Sam Hemelryk
1582ee126f
MDL-41997 cache: dummy store now uses static acceleration for session + request
2013-09-30 09:41:03 +13:00
Sam Hemelryk
7310a6637a
MDL-41997 cache: added unit tests for disabled stores
2013-09-30 09:41:03 +13:00
Paul Charsley
e8b443df33
MDL-41738 added web service function mod_assign_set_user_flags
2013-09-30 08:20:52 +13:00
Mary Evans
0402812161
MDL-42017 theme_afterburner: Additional improvements to make afterburner fully responsive.
2013-09-29 01:40:40 +01:00
Mary Evans
c528917d3f
MDL-33569 theme_bootsrapbase: adding re-compiled style/moodle.css
2013-09-28 16:26:01 +01:00
Mary Evans
336c57575b
MDL-33569 themes: Labels create extra margin below content.
2013-09-28 15:07:22 +01:00
AMOS bot
7800935d19
Merge branch 'master' into install_master
2013-09-28 00:40:24 +00:00
Jamie Pratt
d50b05e696
MDL-41751 changes to api of question_response_analyser
...
and code refactoring and clean up.
2013-09-27 17:38:13 +07:00
Tim Hunt
0aa04a7faf
MDL-16464 remove multichoice answers field.
...
This field is not used, but sometimes causes errors when we try to
instert a value that is too long to fit. Therefore remove it.
At the same time, rename tables and columns to match the coding
guidelines.
2013-09-27 10:57:58 +01:00
Jamie Pratt
59abb70716
MDL-41752 question statistics class moved and improved
...
quiz_question_statistics_stats renamed to question_statistics_calculator
separate class question_statistics used to store calculated stats
and api changed, also code generally cleaned up.
2013-09-27 16:24:18 +07:00
Rossiani Wijaya
43601cdf73
MDL-41798 imscp module: fix heading levels.
2013-09-27 17:22:41 +08:00
Petr Škoda
5fed843324
MDL-41999 warn developers to not use $USER->password directly
2013-09-27 10:51:38 +02:00
Petr Škoda
2aaf332bb1
MDL-41999 do not use $USER->password directly
2013-09-27 10:51:13 +02:00
Petr Škoda
a9d2f1b414
MDL-41707 allow custom location of external test files used from unit tests
2013-09-27 10:47:56 +02:00
Marina Glancy
6b0b05b32f
MDL-41942 course: Allow course listings to work with caches disabled
2013-09-27 18:34:20 +10:00
Petr Škoda
cf361a9501
MDL-41176 do not set description and pw fields in $USER when editing own profile
2013-09-27 10:33:48 +02:00
Petr Škoda
e113214618
MDL-41176 make sure fresh full user record is used when mailing email confirmation
2013-09-27 10:33:48 +02:00
Petr Škoda
6c3ad77ea5
MDL-41176 fix obvious bugs and typos in new user API
2013-09-27 10:33:48 +02:00
Marina Glancy
47164284f7
MDL-41921 mod_url: less restrictions on URL field
...
Restoring functionality from 2.4 accidentally removed in MDL-34311
2013-09-27 18:33:27 +10:00
Marina Glancy
ba3a8f3231
MDL-41676 Corrected logic when to dim the activity name and content
2013-09-27 18:29:36 +10:00
Marina Glancy
0fb7a8a3dd
MDL-32773 Add a help icon for button 'Set main file' in filemanager
2013-09-27 18:12:11 +10:00
Damyon Wiese
bb76233dd2
MDL-42026 Atto: Remove the styles from the headings menu + focus when opened
2013-09-27 15:55:46 +08:00
Jamie Pratt
515b3ae6a7
MDL-41752 question statistics class moved and improved
...
quiz_question_statistics_stats renamed to question_statistics_calculator
separate class question_statistics used to store calculated stats
and api changed, also code generally cleaned up.
2013-09-27 14:10:53 +07:00