mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
61,488 Commits 36 Branches 519 Tags
Commit Graph

15918 Commits

Author SHA1 Message Date
Damyon Wiese
a02e36d682 Merge branch 'MDL-39209_master' of git://github.com/totara/openbadges 2013-05-13 14:59:37 +08:00
Damyon Wiese
2c59e0ffaa Merge branch 'MDL-39581_master' of https://github.com/markn86/moodle 2013-05-13 14:05:30 +08:00
Sam Hemelryk
24dedb9680 MDL-39526 cache: purged when upgrade finished 2013-05-13 10:20:40 +12: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
Frederic Massart
188c04b0a8 MDL-39579 form: Type can be set on repeated elements in a group 2013-05-10 12:05:43 +08:00
Mark Nelson
edc4670b4c MDL-39581 forms: prevent calendar popup from changing multiple date elements 2013-05-10 11:22:07 +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)
7942df199b Merge branch 'MDL-38559-completion-ui' of git://github.com/mudrd8mz/moodle 2013-05-10 02:37:54 +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
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
Yuliya Bozhko
85d7399e20 MDL-39209 badges: Fix course badges page access and navigation when course badges are disabled 2013-05-10 08:41:22 +12: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
563514b10c MDL-39051 behat: New general steps definitions 
- To accept JS alerts
- To drag & drop elements
 2013-05-09 14:27:41 +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
a04e97ef0c MDL-39412 Prevent developer warnings on upgrade from 24 to master 2013-05-09 11:26:25 +08:00
Tim Hunt
cbdb09a9ef MDL-39412 disabling manual graded behaviour refinements 
1. Change behaviour admin settings so you can only select enabled
behaviours.
2. During the upgrade, change admin settings that might be currently set
to manual graded, so that instead they are set to deferredfeedback (if
that is available. If not, we just take the first alphabetically.)
 2013-05-09 11:24:43 +08:00
Damyon Wiese
e9df9e8f7a MDL-38289: Custom profile fields - added unit test 
Added a unit test to cover the case when you are fetching a custom
profile field but you are not logged in.
 2013-05-09 10:29:51 +08:00
Damyon Wiese
8cfc9d75ed Merge branch 'MDL-38289-master-int' of git://github.com/FMCorz/moodle 2013-05-09 10:22:16 +08:00
Sam Hemelryk
fa167c4ac3 MDL-39526 cache: purge all stores after each plugin upgrade 2013-05-09 12:48:48 +12:00
Sam Hemelryk
b0dd08dd63 MDL-39430 cache: gets purged by force during upgrade and install 2013-05-09 10:42:21 +12:00
Eloy Lafuente (stronk7)
919a8db0a2 Merge branch 'MDL-39463_master' of https://github.com/markn86/moodle 2013-05-09 00:35:28 +02:00
Eloy Lafuente (stronk7)
474e0d3cd2 Merge branch 'MDL-39397_master' of git://github.com/totara/openbadges 2013-05-09 00:20:06 +02:00
Dan Poltawski
ae3507af09 Merge branch 'MDL-39552' of git://github.com/stronk7/moodle 2013-05-08 13:03:58 +01:00
Mark Nelson
e019dcccdf MDL-39463 forms: use the date selectors 'optional' parameter rather than creating additional logic 2013-05-08 16:36:54 +08:00
Damyon Wiese
35aba51758 Merge branch 'MDL-31193-master' of git://github.com/mouneyrac/moodle 2013-05-08 15:21:47 +08:00
Damyon Wiese
59add07d01 Merge branch 'MDL-29472_m' of git://github.com/andreabix/moodle 2013-05-08 12:51:00 +08:00
Damyon Wiese
8ed91fdabb Merge branch 'MDL-37552-master' of git://github.com/mouneyrac/moodle 2013-05-08 12:47:44 +08:00
Yuliya Bozhko
7deff81f80 MDL-39397 badges: Handle course badges when course is deleted 2013-05-08 16:12:44 +12:00
Eloy Lafuente (stronk7)
4ce97aed0d Merge branch 'wip-mdl-39332' of git://github.com/rajeshtaneja/moodle 2013-05-08 00:28:15 +02:00
Sam Hemelryk
b3a9bf23f5 Merge branch 'MDL-39481_master' of git://github.com/dmonllao/moodle 2013-05-08 09:54:13 +12:00
Eloy Lafuente (stronk7)
d40a24384e Merge branch 'MDL-39452-master' of git://github.com/sammarshallou/moodle 2013-05-07 22:06:04 +02:00
Eloy Lafuente (stronk7)
de10fcac5f MDL-39552 Make behat code re-entrant safe 
With yui combo in action, some times setup.php is
included more than once. So it's mandatory to
guarantee that code until ABORT_AFTER_CONFIG_CANCEL
can be executed safely multiple times in the same
request.

This change just prevents the behat section to be executed
more than once. All the values that are set within it
should be already defined for the re-entrant call.
 2013-05-07 19:00:41 +02:00
Eloy Lafuente (stronk7)
5b003e9cdd Merge branch 'MDL-39478_master' of git://github.com/dmonllao/moodle 2013-05-07 17:52:00 +02:00
Damyon Wiese
5946813506 Merge branch 'master_MDL-38102' of github.com:totara/moodle 2013-05-07 23:06:09 +08:00
Dan Poltawski
577f21ec24 Merge branch 'MDL-39496-m' of git://github.com/andrewnicols/moodle 2013-05-07 12:15:38 +01:00
Dan Poltawski
bdc8928339 Merge branch 'master_MDL-35852' of git://github.com/danmarsden/moodle 2013-05-07 11:41:30 +01:00
Damyon Wiese
670fd5aad4 Merge branch 'MDL-39187_master' of https://github.com/markn86/moodle 2013-05-07 16:09:10 +08:00