Marina Glancy
489bd32b29
MDL-39177 Remove code duplication
2013-05-17 13:43:45 +10:00
Marina Glancy
0e7fd52e20
MDL-39177 Update file in filearea only if original is present
...
Now when file was deleted in filemanager and new file with the same file was uploaded the references will be converted to copies exactly like UI warns in filemanager.
Also do not delete original information from draftfiles.
2013-05-17 13:43:45 +10:00
Marina Glancy
e9e32b1d88
MDL-39177 File reference is not updated when overwriting the file
2013-05-17 13:43:44 +10:00
Damyon Wiese
2d1ad229da
Merge branch 'MDL-28250-25' of git://github.com/danpoltawski/moodle
...
Conflicts:
version.php
2013-05-17 11:36:09 +08:00
David Monllao
7daab4016d
MDL-39717 behat: Add info to experimental steps definitions
...
JS modal dialogs and drag & drop should be
considered experimental as the steps are not
working as expected in all OS/browser combinations.
2013-05-17 11:23:05 +08:00
Rajesh Taneja
6ab62db65c
MDL-35131 Caching: Purge all will clear course modinfo cache - Thanks to Thomas for patch
2013-05-17 10:17:45 +08:00
David Monllao
c4509f8084
MDL-39638 behat: New step to collapse nodes based on the expand nodes
...
Also updating steps with a collapse behaviour.
2013-05-16 12:43:54 +08:00
David Monllao
870349ee67
MDL-39528 behat: Avoid modal window suite failure
...
Catching JS alerts/confirms exceptions and
auto-accepting them before each test run to
avoid chained scenarios failures.
2013-05-16 10:11:40 +08:00
Petr Škoda
b046b96a88
MDL-39678 fix YUI 20130515 vulnerability
2013-05-15 21:57:23 +02:00
Dan Poltawski
82198dec8b
MDL-28250 license: upgrade old versions of cc-nc
...
The url was incorectly defined in previous versions
2013-05-15 11:22:13 +01:00
Wojciech Galiszek
8243f3ebb5
MDL-28250 license: Correct cc-nc url
2013-05-15 10:45:36 +01:00
Rajesh Taneja
75fd791d87
MDL-39639 Formslib: Hide calendar for datetime element on disable event
2013-05-14 11:59:05 +08:00
Dan Poltawski
3f461e9322
Merge branch 'MDL-39579-master-int' of git://github.com/FMCorz/moodle
2013-05-13 13:09:14 +01:00
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
Andrew Davis
b8b50d04fe
MDL-38019 added add_to_config_log() to lib/datalib.php
2013-05-13 08:57:41 +08:00
Dan Marsden
34a6bd45a4
MDL-38019 Log filter enable/disable
2013-05-13 08:57:41 +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
Frederic Massart
58f3865fce
MDL-39280 form: Multiple select support disabledIf with multiple values
2013-05-10 09:33:46 +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
