61276 Commits

Author SHA1 Message Date
Sam Hemelryk
24dedb9680 MDL-39526 cache: purged when upgrade finished 2013-05-13 10:20:40 +12:00
Eloy Lafuente (stronk7)
2d5303cbe7 Moodle release 2.5rc1 v2.5.0-rc1 2013-05-10 17:29:20 +02:00
Eloy Lafuente (stronk7)
e477f1e45f fix permissions 2013-05-10 17:23:55 +02:00
Eloy Lafuente (stronk7)
3e81c83e68 Merge branch 'install_master' of git://git.moodle.cz/moodle-install 2013-05-10 17:17:43 +02:00
Eloy Lafuente (stronk7)
6382f49fb1 Merge branch 'MDL-39518-master' of git://github.com/damyon/moodle 2013-05-10 13:17:16 +02:00
Eloy Lafuente (stronk7)
9d5ec39453 Merge branch 'wip-MDL-39575-m25' of git://github.com/samhemelryk/moodle 2013-05-10 12:06:38 +02:00
Damyon Wiese
727b8d54e4 MDL-39518: Change hardcoded string MOOCH to Moodle.net 2013-05-10 14:38:46 +08:00
Sam Hemelryk
1168a5f2e3 MDL-39575 install: better handling of database creation error.
Implemented better handling of DML exceptions.
Added translation for cannotcreatedb exception.
2013-05-10 17:28:39 +12:00
Sam Hemelryk
8b5647b8d7 Merge branch 'MDL-39602-master' of git://github.com/damyon/moodle 2013-05-10 16:41:15 +12:00
Sam Hemelryk
635d8bc84b Merge branch 'MDL-39488' of git://github.com/rwijaya/moodle 2013-05-10 16:23:26 +12:00
Damyon Wiese
969eaa3eca MDL-39602 cache: Move the includes for default stores
Putting them inside the function get_default_stores ensures
that they will be included from anywhere that calls get_default_stores.
2013-05-10 11:53:45 +08:00
Rossiani Wijaya
89aa433fbd MDL-39488: Lesson Module: Fixed the potential variable overwritting for answers 2013-05-10 11:14:52 +08:00
Damyon Wiese
1248133f7c Merge branch 'MDL-39535_master' of https://github.com/markn86/moodle 2013-05-10 10:30:51 +08:00
Damyon Wiese
dec909fcdd Merge branch 'MDL-38757-master-int' of git://github.com/FMCorz/moodle 2013-05-10 09:35:44 +08:00
Eloy Lafuente (stronk7)
da2cff35c5 Merge branch 'MDL-38885-master-int' of git://github.com/FMCorz/moodle 2013-05-10 03:16:09 +02:00
Eloy Lafuente (stronk7)
05bf4b17e8 Merge branch 'MDL-29758' of git://github.com/jmvedrine/moodle 2013-05-10 02:53:49 +02:00
Eloy Lafuente (stronk7)
7942df199b Merge branch 'MDL-38559-completion-ui' of git://github.com/mudrd8mz/moodle 2013-05-10 02:37:54 +02:00
Eloy Lafuente (stronk7)
ab0cb7cde6 Merge branch 'MDL-39003-master' of git://github.com/damyon/moodle 2013-05-10 02:36:30 +02:00
Frederic Massart
d5909fd144 MDL-38885 form: Fix comments and stricter unit test 2013-05-10 08:34:59 +08:00
Eloy Lafuente (stronk7)
1065589db1 Merge branch 'MDL-39586_master' of git://github.com/dmonllao/moodle 2013-05-10 02:31:50 +02:00
Frederic Massart
a85f745d50 MDL-38885 form: Unit tests for data cleaning 2013-05-10 08:17:40 +08:00
Frederic Massart
9654f68ae9 MDL-38885 form: More unit testing for missing type detection 2013-05-10 08:17:40 +08:00
Frederic Massart
8a9c3f4951 MDL-38885 form: Advanced type checking on special elements 2013-05-10 08:17:40 +08:00
Frederic Massart
3c0ba94e87 MDL-38885 form: Recursively clean parameters based on right type 2013-05-10 08:17:40 +08:00
Eloy Lafuente (stronk7)
dd334c7a8b Merge branch 'MDL-39051_master' of git://github.com/dmonllao/moodle 2013-05-10 01:42:19 +02:00
David Mudrák
870a4f8119 MDL-38559 Fix the ability to disable the grade condition in the course completion settings form 2013-05-09 23:24:49 +02:00
David Mudrák
6e5a473c47 MDL-38559 Reorganise course completion settings form
This is a result of a pretty intensive effort to make the form less
sucky, given the completion strings mess around. It partially solves
MDL-39419 too as it clarifies the course completion link in the course
administration block.

I must admit and record here that I'm pretty desperate by the current
state of the core_completion and how strings from it are inconsistently
used at various places with different meanings. For example the 'Completion
tracking' may mean the mode of how activities are tracked within the
course as well as the overall feature of course and activities tracking.
While a same phrase can be used in English for both this meanings, not
all languages have such luck and translating it is a pain in the ass.

Finally, let me give the credit for wording and UI design suggestions to
Helen Foster and all others who helped with this. This has been one of
the most ugliest forms in Moodle and we believe we made it better
(although we know it's far from perfect).
2013-05-09 23:14:57 +02:00
Eloy Lafuente (stronk7)
b87572e860 Merge branch 'wip-MDL-39424-master' of git://github.com/ds125v/moodle 2013-05-09 22:18:58 +02:00
Eloy Lafuente (stronk7)
d560159df6 Merge branch 'MDL-39488' of git://github.com/rwijaya/moodle 2013-05-09 15:47:38 +02:00
Eloy Lafuente (stronk7)
6d0e18efe8 Merge branch 'MDL-39585-filters-upgrade' of git://github.com/mudrd8mz/moodle 2013-05-09 13:39:54 +02:00
David Monllao
5d7b6307b1 MDL-39586 behat: Closed list of stackeholders 2013-05-09 18:38:13 +08:00
David Mudrák
21df0539bc MDL-39585 Fix the upgrade step version number 2013-05-09 11:57:56 +02:00
David Monllao
1fb9715721 MDL-39051 behat: Fixing extra interactions
When the elements to interact with are not
available anymore.
2013-05-09 17:21:19 +08:00
David Monllao
217e8e59e5 MDL-39051 behat: Fix issue after closing popup windows
When a step closes a popup window the page DOM is not available
until we switch again to the main window; we should avoid exceptions
at framework level when hooking the after step process, this
includes the new exceptions catcher modification.
2013-05-09 17:21:06 +08:00
David Monllao
b576bdc75d MDL-39051 behat: New tests
To cover all course controls functionalities with
and without Javascript and with and without paged
course mode.
2013-05-09 17:20:58 +08:00
Frederic Massart
9fba869836 MDL-38757 scorm: Remove advanced settings (except for Appearance) 2013-05-09 17:20:11 +08:00
Frederic Massart
20b51a1134 MDL-38757 scorm: Reformat SCORM package module settings 2013-05-09 17:20:07 +08:00
David Monllao
0e575f010e MDL-39051 behat: New steps for activity related actions 2013-05-09 17:15:25 +08:00
David Mudrák
b3b13e9941 MDL-38559 Clean-up the course completion settings code
This patch does not alter the code, only some syntax fixes and
coding guidelines rules are applied. Strings are re-ordered
alphabetically with no change of their wording. PHP doc blocks
reconstructed using the Git log records.
2013-05-09 08:47:34 +02:00
David Monllao
563514b10c MDL-39051 behat: New general steps definitions
- To accept JS alerts
- To drag & drop elements
2013-05-09 14:27:41 +08:00
David Monllao
a07ad80ae6 MDL-39051 behat: Using new steps definitions 2013-05-09 14:27:41 +08:00
Damyon Wiese
b55248d5ad MDL-39462 course: Fix typo in $changesinccoursecat 2013-05-09 14:22:26 +08:00
Jean-Michel Vedrine
d56ab3b992 MDL-29758 make Cloze question feedback display more informative
as it was in Moodle 1.9
2013-05-09 07:55:43 +02:00
Damyon Wiese
1922147ebf MDL-39290 Version bump for CSS changes 2013-05-09 13:49:22 +08:00
Damyon Wiese
9446028890 Merge branch 'MDL-39290' of git://github.com/colchambers/moodle 2013-05-09 13:48:41 +08:00
Damyon Wiese
a5a6e93f01 MDL-39526 cache: add extra cache purge after upgrade_core
This prevents the upgraderunning lock from not being cleared when there are
no plugins to upgrade (reproducable bug with memcache as the application cache store)
2013-05-09 13:43:07 +08:00
Damyon Wiese
887e724796 Merge branch 'wip-MDL-39526-m25' of git://github.com/samhemelryk/moodle 2013-05-09 12:33:32 +08:00
Sam Hemelryk
3993a37c20 MDL-39526 cache: cleaned up disable_stores calls 2013-05-09 15:32:36 +12:00
Damyon Wiese
c8f7f2b5f3 Merge branch 'wip-MDL-39436-master' of git://github.com/marinaglancy/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-05-09 11:29:33 +08:00
Damyon Wiese
a04e97ef0c MDL-39412 Prevent developer warnings on upgrade from 24 to master 2013-05-09 11:26:25 +08:00