Damyon Wiese
63e604f8b1
Merge branch 'w08_MDL-42889_m27_vir' of https://github.com/skodak/moodle
2014-02-25 10:32:44 +08:00
Damyon Wiese
dea614e493
Merge branch 'MDL-44108_master' of git://github.com/dmonllao/moodle
2014-02-24 15:42:32 +08:00
Damyon Wiese
ccc2966709
Merge branch 'wip-MDL-44139-master' of git://github.com/ds125v/moodle
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2014-02-24 15:28:51 +08:00
Damyon Wiese
164ad1a30a
Merge branch 'MDL-18633' of https://github.com/danielneis/moodle
2014-02-24 13:16:41 +08:00
David Monllao
702851c071
MDL-44108 behat: Adding a roles data generator
2014-02-21 13:25:44 +08:00
Damyon Wiese
6071a209fe
Merge branch 'MDL-44118_2' of git://github.com/timhunt/moodle
...
Conflicts:
version.php
2014-02-19 09:08:42 +08:00
Daniel Neis Araujo
9d9361e82d
MDL-18633 User profile: add last ip field to user view
2014-02-18 09:42:28 -03:00
Tim Hunt
4e8a07d28b
MDL-44118 remove the qeupgradehelper tool
...
and associated code that was only used by it.
2014-02-18 11:55:21 +00:00
Tim Hunt
e4c20157c0
MDL-44118 new environment check are all quiz attempts upgraded.
...
In Moodle 2.1, there was a major DB upgrade relating to questions, and
it was possible to delay some of that upgrade. Now, those DB tables are
changing again, and the time has come to insist that all the updata has
been upgraded (or deleted).
2014-02-18 11:55:17 +00:00
Petr Škoda
114e3209b1
MDL-42889 cleanup obsolete clam relatd code
...
Since 2.0 all uploaded files need to go through the file picker which does the scanning,
the idea is that it is more important to warn users that their computer is crawling
with viruses. All teachers are supposed to have local up-to-date antivirus software!
Since 2.0 we are not scanning existing files on server, in future we might use the
status flag in files table to indicate the file is problematic, but still we should
never detele anthing from the filedir...
2014-02-18 09:22:30 +08:00
Eloy Lafuente (stronk7)
a6d5288e41
Merge branch '44104-27' of git://github.com/samhemelryk/moodle
2014-02-18 01:46:47 +01:00
Dan Poltawski
a24ef7d7cd
Merge branch 'MDL-33099-master' of git://github.com/andrewnicols/moodle
2014-02-17 14:40:36 +08:00
Damyon Wiese
8053854592
Merge branch 'MDL-23514-master' of https://github.com/danielneis/moodle
...
Conflicts:
lang/en/admin.php
2014-02-17 14:12:16 +08:00
Andrew Nicols
af64bc6179
MDL-33099 Javascript: Deprecate the ajaxenabled function
2014-02-17 14:11:21 +08:00
Sam Hemelryk
1f6ba1809d
MDL-44104 admin, grade: fixed use of @params
2014-02-16 12:14:30 +13:00
David Scotson
7f52dbd8d5
MDL-44139 admin: standardise warning renderer use
...
Take three handcoded warnings and convert them to calling
the 'warning' renderer like rest of the file.
Then remove redundant CSS and/or move specific CSS to generic
places so it's shared.
2014-02-14 11:39:04 +00:00
Sam Hemelryk
3f5827459e
MDL-39617 backup: language improvements to cli/backup.php
2014-02-04 09:04:01 +13:00
Sam Hemelryk
6bdf77c191
Merge branch 'MDL-39617-master' of https://github.com/lucisgit/moodle
2014-02-04 08:41:37 +13:00
apsdehal
23f9ff903f
MDL-41647 WebServices: Changed notification CSS class
2014-02-02 15:20:21 +05:30
David Monllao
7e3f5e79d0
MDL-43450 behat: Checking the ->behat_* vars contents before showing the steps list
2014-01-29 14:28:37 +08:00
Ruslan Kabalin
d00951b585
MDL-39617 Add cli backup script for a single course backing up.
...
Useful for backing up a single course. Accepts parameters:
--courseid=INTEGER Course ID for backup
--courseshortname=STRING Course shortname for backup.
--destination=STRING Path where to store backup file. If not set, the backup
will stored within the same course backup area.
2014-01-28 13:40:03 +00:00
David Monllao
b8c4d91ca0
MDL-43450 behat: Improving error messages
2014-01-24 16:45:27 +08:00
Dan Poltawski
1f931e2928
Merge branch 'MDL-43670' of git://github.com/timhunt/moodle
2014-01-21 11:25:38 +08:00
Tim Hunt
dc4a3ea1ee
MDL-43670 quiz_question_instances to match coding guidelines.
...
Some columns needed to be renamed:
* quiz -> quizid
* question -> questionid
* grade -> maxmark
Then all the places that refer to those needed to be fixed.
2014-01-17 10:56:07 +00:00
David Monllao
561e9bb92e
MDL-43480 behat: Switching @_only_local and @_alerts to @_file_upload and @_alert
2014-01-17 10:41:37 +08:00
David Monllao
81ad5438c7
MDL-43480 behat: Removing @_only_local tags from steps where it is not necessary
2014-01-17 10:41:37 +08:00
Damyon Wiese
7508094a87
Merge branch 'MDL-43461_master' of git://github.com/dmonllao/moodle
2014-01-15 09:39:03 +08:00
Eloy Lafuente (stronk7)
7d4c752e31
Merge branch 'w02_MDL-43524_m27_textcaching' of https://github.com/skodak/moodle
2014-01-14 22:08:46 +01:00
Eloy Lafuente (stronk7)
da47e297da
Merge branch '35597-27' of git://github.com/samhemelryk/moodle
2014-01-14 16:39:00 +01:00
Damyon Wiese
718f42ae68
Merge branch 'MDL-43584_master' of git://github.com/dmonllao/moodle
2014-01-14 16:21:21 +08:00
Dan Poltawski
2c9c8c7f46
Merge branch 'MDL-43642_master' of git://github.com/dmonllao/moodle
2014-01-14 15:48:49 +08:00
David Monllao
19a40b1468
MDL-43461 behat: Using linux-style directory separators when using cygwin
2014-01-14 13:10:40 +08:00
Petr Škoda
62c8032509
MDL-34347 remove all problematic global text caching
...
Instead we will create new MUC caches inside each filter plugin.
Please note that all cache filters should work with local caches
without the need of strict cache invalidation.
2014-01-14 10:49:23 +08:00
Sam Hemelryk
e5e0d397f4
MDL-35597 admin-plugins: are now sorted alphabetically
2014-01-13 08:12:42 +13:00
David Monllao
50edfdca03
MDL-43584 behat: Updating features to use the new expected arguments
2014-01-10 18:25:44 +08:00
David Monllao
abe572e3f2
MDL-43642 behat: Setting the correct files @package
2014-01-10 17:50:50 +08:00
Eloy Lafuente (stronk7)
577432283c
Merge branch 'MDL-43590-en_fix' of git://github.com/mudrd8mz/moodle
2014-01-10 10:08:34 +01:00
Helen Foster
480fca77b3
MDL-43590 Merge English strings from the en_fix language pack
2014-01-09 01:06:01 +01:00
Eloy Lafuente (stronk7)
e6a6eb7838
Merge branch 'w01_MDL-42797_m27_admin' of https://github.com/skodak/moodle
2014-01-08 02:09:55 +01:00
Eloy Lafuente (stronk7)
45f6a8340b
Merge branch 'm27_MDL-43508_Invalid_String_Identifier' of https://github.com/scara/moodle
2014-01-08 00:45:51 +01:00
Damyon Wiese
e011f229a8
Merge branch 'w01_MDL-43402_m27_zlib' of https://github.com/skodak/moodle
2014-01-07 12:29:45 +08:00
Sam Hemelryk
39bd07f732
MDL-43526 course: links to restore from management and admin structure.
2014-01-07 12:08:34 +08:00
Petr Škoda
3e5226ab6e
MDL-43528 remove all traces of magic quotes hacking from moodle core
2014-01-02 10:15:06 +08:00
Petr Škoda
61d598f057
MDL-42797 require real user login on upgrade settings page
2014-01-02 09:17:16 +08:00
Petr Škoda
fc1d0e822d
MDL-42797 require real user login on admin page
2014-01-01 15:19:02 +08:00
Matteo Scaramuccia
7a66ddb63b
MDL-43508 Quiz Invalid get_string() identifier.
2013-12-28 11:12:29 +01:00
Petr Škoda
2803f3c1b5
MDL-43402 remove all zlib detection code
...
Zlib extension is now required.
2013-12-27 11:06:18 +08:00
Petr Skoda
9bb80d2005
MDL-43213 fix init regression and remove $checkphp parameter
2013-12-19 13:11:25 +08:00
Sam Hemelryk
adfcdcb027
Merge branch 'w51_MDL-43213_m27_simplebehat' of https://github.com/skodak/moodle
2013-12-18 10:30:30 +13:00
Petr Škoda
dbe0203ba8
MDL-42931 fix hardcoded PHP version tests for 2.7
2013-12-13 14:04:24 +08:00