Dan Poltawski
d6aec96dd5
Merge branch 'MDL-27748' of git://github.com/timhunt/moodle
2013-05-20 15:46:49 +08:00
Dan Poltawski
7ae324cb35
Merge branch 'MDL-39728' of git://github.com/timhunt/moodle
2013-05-20 15:28:31 +08:00
Dan Poltawski
b04bfcfc54
Merge branch 'wip-MDL-36020-master' of git://github.com/troylee/moodle
2013-05-20 12:42:17 +08:00
Damyon Wiese
e872912d1c
Merge branch 'MDL-39363-master' of git://github.com/ankitagarwal/moodle
2013-05-20 12:12:23 +08:00
Marina Glancy
6dd92c0234
MDL-39177 Updating userid when file is overwritten
2013-05-20 14:09:11 +10:00
Damyon Wiese
e8dc568b12
Merge branch 'MDL-39528_master' of git://github.com/dmonllao/moodle
2013-05-20 12:03:36 +08:00
Dan Poltawski
2f75633c6f
Merge branch 'MDL-39630_master' of git://github.com/lazydaisy/moodle
2013-05-20 12:01:01 +08:00
Dan Poltawski
02f92b2d86
Merge branch 'MDL-39198_master' of git://github.com/kordan/moodle
2013-05-20 11:47:50 +08:00
Dan Poltawski
22c8aeb018
Merge branch 'MDL-38369-master' of git://github.com/FMCorz/moodle
2013-05-20 10:25:08 +08:00
Frederic Massart
4cc4ca963c
MDL-39719 course: Pointing to wrong category string in requests
2013-05-20 09:15:08 +08:00
Tim Hunt
0a5aa9c610
MDL-27748 question: grade options should be localised.
...
question_bank::fraction_options should use format_float to display
decimal pionts correctly.
2013-05-19 23:39:23 +01:00
AMOS bot
4152749677
Automatically generated installer lang files
2013-05-19 00:37:17 +00:00
Tim Hunt
d4a666029d
MDL-39728 List all the classes in question/type/questionbase.php
...
This should make it easier for people to understand the type hierarchy.
2013-05-18 09:16:05 +01:00
AMOS bot
24a856d08c
Automatically generated installer lang files
2013-05-18 00:41:31 +00:00
Marina Glancy
935429af8b
MDL-39177 More comments about confusing files.source field
2013-05-17 13:43:45 +10:00
Marina Glancy
da4b1ee480
MDL-39177 New function file_storage::get_unused_dirname()
2013-05-17 13:43:45 +10:00
Marina Glancy
77c21e6d0d
MDL-39177 Ensure files are overwritten correctly on unzip
2013-05-17 13:43:45 +10:00
Marina Glancy
32495c06b5
MDL-39177 Perform all checks on draftfile area before saving the files
2013-05-17 13:43:45 +10:00
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
f7c588d226
MDL-39177 Discard file origin when moving/renaming a file in filemanager
...
Created one function that handles file update to be used from both JS and nonJS filepicker
2013-05-17 13:43:45 +10:00
Marina Glancy
0ab3070c0c
MDL-39177 Original info is not preserved when overwriting a file in filemanager
...
original file location is used by filemanager to indicate that file is a source of reference and file the list of referencing files
2013-05-17 13:43:44 +10:00
Marina Glancy
e9e32b1d88
MDL-39177 File reference is not updated when overwriting the file
2013-05-17 13:43:44 +10:00
Marina Glancy
c9b4b8d83a
MDL-33719 When overwriting a file the filemanager is not refreshed
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
686279d047
MDL-39717 behat: Removing unstable steps and scenarios
2013-05-17 11:24:21 +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
Damyon Wiese
6fadab94f0
Merge branch 'w18_MDL-39678_m26_yui' of git://github.com/skodak/moodle
2013-05-16 15:53:48 +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
AMOS bot
9693f49387
Automatically generated installer lang files
2013-05-16 00:41:17 +00:00
Mary Evans
67202e2f27
MDL-39697 theme_bootstrapbase: Updated $THEME->layouts in config.php to match those in Base theme.
2013-05-16 01:06:26 +01:00
Petr Škoda
b046b96a88
MDL-39678 fix YUI 20130515 vulnerability
2013-05-15 21:57:23 +02:00
Petr Škoda
d6c60a7d16
MDL-39374 log only real folder edits
...
Credit goes to Florian Zillner, thanks.
2013-05-15 21:34:03 +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
AMOS bot
45b0d9e191
Automatically generated installer lang files
2013-05-15 00:39:20 +00:00
Eloy Lafuente (stronk7)
5e1bdaca7a
NOBUG: Adjust backup release for 2.6dev
2013-05-14 12:07:02 +02:00
Eloy Lafuente (stronk7)
e2637d1da3
weekly release 2.6dev
2013-05-14 11:32:14 +02:00
Eloy Lafuente (stronk7)
b222cfb79b
Moodle release 2.5
2013-05-14 11:27:22 +02:00
Eloy Lafuente (stronk7)
ff291e488d
Merge branch 'install_master' of git://git.moodle.cz/moodle-install
2013-05-14 11:18:14 +02:00
Jerome Mouneyrac
ca11d39029
MDL-31209 web service error message: Indication about the service not containg the web service function is confusing
2013-05-14 15:40:16 +08:00
Damyon Wiese
5a378479a0
Merge branch 'MDL-39664' of git://github.com/nebgor/moodle
2013-05-14 15:25:46 +08:00
Damyon Wiese
a9dcf2db60
Merge branch 'MDL-39641-master-int' of git://github.com/FMCorz/moodle
2013-05-14 15:08:25 +08:00
Aparup Banerjee
4cf0c17d18
MDL-39664 fixed up is_array test (reverting the whole line basically prior to MDL-39664 changes)
2013-05-14 15:02:24 +08:00
Damyon Wiese
d458718f59
Merge branch 'MDL-39191_master' of git://github.com/kordan/moodle
2013-05-14 14:16:05 +08:00
Damyon Wiese
c938b909ba
Merge branch 'MDL-39664' of git://github.com/nebgor/moodle
2013-05-14 13:33:25 +08:00
Aparup Banerjee
c713414319
MDL-39664 added http redirect limitation to 5. rephrased certificate use in message log.
2013-05-14 13:23:14 +08:00
Aparup Banerjee
6053036976
MDL-39664 mdeploy follows redirects now.
2013-05-14 13:14:28 +08:00
Aparup Banerjee
cb97a97794
MDL-39664 allowed mdeploy to follow redirection (http 302) and added some extra logging info
2013-05-14 11:56:05 +08:00