Sam Hemelryk
48d253c100
Merge branch 'MDL-39241-master' of git://github.com/danpoltawski/moodle
2013-04-22 09:23:54 +12:00
Dan Poltawski
b93945e9b9
Merge branch 'MDL-39219_scorm_ie7' of git://github.com/davosmith/moodle
...
Conflicts:
mod/scorm/module.js
2013-04-19 15:20:02 +01:00
Dan Poltawski
aa15c5f3ff
Merge branch 'MDL-38361' of https://github.com/prateeksachan/moodle
2013-04-19 15:11:33 +01:00
Dan Poltawski
35626ff4dd
MDL-39241 groups import: missing type
2013-04-19 14:51:27 +01:00
Dan Poltawski
00a850b33e
Merge branch 'wip-MDL-38565-m25' of git://github.com/samhemelryk/moodle
2013-04-19 13:29:07 +01:00
Damyon Wiese
42d2b9fbcc
MDL-39163 Version bump for css changes
2013-04-19 15:51:31 +08:00
Damyon Wiese
35490f6357
Merge branch 'MDL-39163-master' of git://github.com/FMCorz/moodle
2013-04-19 15:49:16 +08:00
Damyon Wiese
43d3124816
Merge branch 'MDL-31194-master' of git://github.com/mouneyrac/moodle
2013-04-19 15:15:10 +08:00
Damyon Wiese
d9c22e944d
Merge branch 'MDL-39084-master' of github.com:StudiUM/moodle
2013-04-19 13:58:15 +08:00
Damyon Wiese
747230d564
Merge branch 'wip-MDL-39211-m25' of git://github.com/marinaglancy/moodle
2013-04-19 13:53:14 +08:00
Damyon Wiese
dd3b3a81d1
Merge branch 'MDL-39167' of git://github.com/timhunt/moodle
2013-04-19 13:13:28 +08:00
Sam Hemelryk
459699105c
Merge branch 'MDL-39206_master' of git://github.com/lazydaisy/moodle
2013-04-19 16:37:31 +12:00
Sam Hemelryk
2b2b967ecb
MDL-38646 mod_folder: improved upgrade of showexpanded
2013-04-19 16:28:29 +12:00
Sam Hemelryk
a03fdbb099
Merge branch 'MDL-38646' of git://github.com/rlorenzo/moodle
2013-04-19 16:23:21 +12: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
91d72d3105
Merge branch 'MDL-39164' of git://github.com/jmvedrine/moodle
2013-04-19 14:54:41 +12:00
Sam Hemelryk
52b4bd37e7
Merge branch 'MDL-38710-master' of git://github.com/damyon/moodle
2013-04-19 14:41:25 +12:00
Sam Hemelryk
5ab262321c
Merge branch 'MDL-39033-master' of git://github.com/sammarshallou/moodle
2013-04-19 14:02:35 +12:00
Sam Hemelryk
4d35c88e10
Merge branch 'MDL-39185_master' of https://github.com/markn86/moodle
2013-04-19 13:53:55 +12:00
Sam Hemelryk
ff76b6044b
Merge branch 'MDL-39135-master' of git://github.com/damyon/moodle
2013-04-19 13:48:32 +12:00
Rex Lorenzo
57e228045b
MDL-38646 folder: change column from show_expanded to showexpanded
2013-04-18 17:28:35 -07:00
Sam Hemelryk
5cba0c4ba3
MDL-38565 cache: tidy up pre-integration
2013-04-19 10:13:36 +12:00
Sam Hemelryk
4da28110c0
MDL-38565 cache: improve stats gathering
2013-04-19 10:12:59 +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
dbd2ea4e1f
MDL-38565 cache: session caches now function as expected
...
This change is a large change to the way sessions are handled
within MUC after it was discovered that session did not function
as expected when any store other than the default session store
was being used.
As part of this change the session loader has been largely
customised in order to consolidate session data for the loader.
The unit tests have also being greatly increased to provide
better coverage for sessions.
2013-04-19 10:11:48 +12:00
Jean-Michel Vedrine
cdcda6a0b4
MDL-39164 GIFT, Blackboard and Examview import of essay questions broken
2013-04-18 17:36:18 +02:00
Jean-Philippe Gaudreau
25e500f621
MDL-39084 grade: Capability checks are incoherent for the Course grade settings section
2013-04-18 09:05:01 -04:00
Dan Poltawski
3a8c4380c0
on demand release 2.5beta+
...
Special 'Spoons curry' UK Edition ;-)
2013-04-18 12:52:52 +01:00
Davo Smith
c4dccb99fb
MDL-39219 mod_scorm - replace JSON with Y.JSON for IE7 compatibility
2013-04-18 12:44:24 +01:00
Dan Poltawski
8a4f888220
Merge branch 'install_master' of git://git.moodle.cz/moodle-install
2013-04-18 12:41:24 +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
Mary Evans
10962df0e4
MDL-39206 theme_bootstrap: Added resized/opaque screenshot.jpg
2013-04-18 01:45:11 +01:00
Andrew Nicols
c0123ff2c3
MDL-38777 JavaScript: Remove YUI cache persistence
...
The cache does not need to be persistent within the same request and this
just holds memory open for no good reason.
2013-04-17 22:45:23 +01:00
Tim Hunt
d823a63db0
MDL-39167 quiz access rules: need to validate their settings.
...
We were missing the hook in the form validation method. We had them
everywhere else they were needed.
2013-04-17 14:24:38 +01:00
Dan Poltawski
500f9a4c9d
Merge branch 'wip-mdl-39110' of git://github.com/rajeshtaneja/moodle
2013-04-17 12:48:17 +01:00
Dan Poltawski
51850ccaf8
Merge branch 'MDL-38573-master-int' of git://github.com/FMCorz/moodle
2013-04-17 12:37:23 +01:00
Dan Poltawski
0107a90fe8
Merge branch 'MDL-39081' of git://github.com/rwijaya/moodle
2013-04-17 12:32:39 +01:00
Dan Poltawski
73f5a0d864
MDL-39021 pluginlib: theme_simple is a core plugin
...
Don't list as an add-on.
2013-04-17 12:27:24 +01:00
Dan Poltawski
c6101ef441
Merge branch 'MDL-39087-plugins-uninstall' of git://github.com/mudrd8mz/moodle
2013-04-17 12:09:20 +01:00
Eloy Lafuente (stronk7)
b279f33410
Merge branch 'MDL-38956_master' of git://github.com/dmonllao/moodle
2013-04-17 12:50:50 +02:00
Yuliya Bozhko
9b0f001445
MDL-39049 Badges: Fix error when awarding a badge from recipients page
2013-04-17 17:03:19 +08:00
Frederic Massart
ad4bbda9eb
MDL-38573 choice: Reformat settings form
2013-04-17 15:54:59 +08:00
Mark Nelson
4a8a72656d
MDL-39185 mod_forum: declare new object before creating member variables to prevent Strict Standards warning
2013-04-17 15:20:41 +08:00
Damyon Wiese
78d9d52a0a
MDL-38710 assign: Fix one typo and change one param to PARAM_BOOL
2013-04-17 13:50:33 +08:00
Dan Poltawski
9231cd8826
MDL-38710 assign: convert selectedusers to PARAM_SEQUENCE
...
This param type is more appropiate.
2013-04-17 13:50:23 +08:00
Dan Poltawski
68d646f3eb
MDL-38710 assign: fix missing setType calls
2013-04-17 13:50:23 +08:00