Eloy Lafuente (stronk7)
fb1788c598
Merge branch 'MDL-40424-master' of git://github.com/FMCorz/moodle
...
Conflicts:
admin/oacleanup.php
2013-07-17 01:21:51 +02:00
Petr Škoda
b0d1d941c9
MDL-40220 use new core_component::get_component_directory()
2013-07-16 22:42:37 +02:00
Petr Škoda
bd3b3bba9f
MDL-40220 use new core_component::get_plugin_list()
2013-07-16 22:36:11 +02:00
Petr Škoda
46f6f7f224
MDL-40220 use new core_component::get_plugin_types()
2013-07-16 22:31:48 +02:00
Eloy Lafuente (stronk7)
e780e5cb8f
Merge branch 'MDL-40112_master' of https://github.com/totara/openbadges
...
Conflicts:
lib/db/upgrade.php
version.php
2013-07-16 01:29:01 +02:00
Damyon Wiese
d7bf5fd1f7
Merge branch 'MDL-40440-m' of git://github.com/andrewnicols/moodle
2013-07-15 14:42:10 +08:00
Frederic Massart
2e4c0c9181
MDL-40424 libraries: Deprecate context_instance_preload_sql()
2013-07-12 17:41:49 +08:00
Ankit Agarwal
db314f34fb
MDL-40425 libraries: Remove context_instance_preload() from core
2013-07-09 15:55:51 +08:00
Dan Poltawski
bb0458aa7c
Merge branch 'MDL-40403-master' of git://github.com/FMCorz/moodle
2013-07-09 13:38:10 +08:00
Frederic Massart
8e8891b76b
MDL-40403 libraries: Deprecate get_parent_contexts()
2013-07-09 13:34:44 +08:00
Adrian Greeve
a327f25ef1
MDL-31776 - lib: Alternate name fields
...
Add support for additional name fields and flexible formating of
user names.
2013-07-09 11:45:50 +08:00
Yuliya Bozhko
e50220f840
MDL-40112 badges: Drop unused image field from badge table
2013-07-05 09:18:59 +12:00
Damyon Wiese
74ed095606
MDL-39558 badges: Prevent backup of badges without user information
2013-07-03 10:52:50 +08:00
Yuliya Bozhko
bd0d2bdcc9
MDL-39558 badges: Add backup/restore of manually awarded badges
2013-07-03 09:36:45 +08:00
Yuliya Bozhko
2832093f53
MDL-39558 badges: Add backup/restore to course badges
2013-07-03 09:35:06 +08:00
Andrew Nicols
100360f96c
MDL-40440 Backup: Skip files that already exist
2013-07-02 11:13:03 +01:00
Sam Hemelryk
11fb83fee8
Merge branch 'MDL-40109_master-fix' of git://github.com/dmonllao/moodle
2013-06-19 14:06:41 +12:00
David Monllao
2532b034f4
MDL-40109 behat: Fixing backup feature
2013-06-19 08:53:08 +08:00
Eloy Lafuente (stronk7)
d745d2d45e
MDL-40103 Now xmldb code matches original templates 100%
...
There were still some differences between the php code
used in the issue and the php code generated by the
xmldb editor for the template tables. This commit put
both 100% in sync.
2013-06-18 15:22:51 +02:00
Dan Poltawski
6ef007def6
Merge branch 'MDL-37761-m' of git://github.com/andrewnicols/moodle
2013-06-18 16:47:18 +08:00
Andrew Nicols
aa15e2a8b0
MDL-37761 Backup: Add phpdoc for MODE constants
2013-06-18 07:52:04 +01:00
Andrew Nicols
b1850c12c1
MDL-37761 Backup: Do not include files in backups when importing courses/activities
...
When we import courses or duplicate activities, the deduplicating nature of
the file_storage system means that we don't actually have to include the
real files in the backup - just their metadata from the file table.
The restoration process needs to know not to expect files from the backup
phase so a flag is set in moodle_backup metadata.
2013-06-18 07:52:04 +01:00
Andrew Nicols
f1454424b5
MDL-40165 Backup: Split out test classes into multiple files
2013-06-18 06:25:13 +01:00
Marina Glancy
5883de26ae
Merge branch 'MDL-40165-m' of git://github.com/andrewnicols/moodle
2013-06-18 12:59:04 +10:00
Sam Hemelryk
36096f0fe9
Merge branch 'MDL-39634_master' of git://github.com/dmonllao/moodle
2013-06-18 14:51:06 +12:00
Eloy Lafuente (stronk7)
edd3fd91d7
MDL-40103 doc create_temptable_from_real_table() deletion.
2013-06-18 01:35:11 +02:00
Eloy Lafuente (stronk7)
27c07947c4
MDL-40103 Fix wrong call, causing restore to fail.
2013-06-18 01:30:14 +02:00
Russell Smith
62d6f183c4
MDL-40103 Backup: Move install.xml templates to inline XML
2013-06-15 15:07:03 +10:00
David Monllao
051e9663f0
MDL-39634 behat: Removing unused arguments
...
Also adding deprecated methods.
2013-06-14 16:14:04 +08:00
Andrew Nicols
fd66d1de70
MDL-40165 Backup: Split out test classes into multiple files
2013-06-13 08:55:54 +01:00
Dan Poltawski
664a1e2793
Merge branch 'w24_MDL-28394_m26_enrolrestore' of git://github.com/skodak/moodle
2013-06-10 12:16:37 +08:00
Sam Hemelryk
fb8010732e
Merge branch 'MDL-36090_log2' of git://github.com/andyjdavis/moodle
2013-06-10 12:31:03 +12:00
Petr Škoda
4b75f49a63
MDL-28394 fix enrolment method restore logic
...
This patch fixes:
* missing enrolment methods after 1.9 backup restore - defaults are added
* enrolment methods are restored only when users option is enabled
* manual enrolment override option is disabled if users not available
2013-06-07 10:02:59 +02:00
Eloy Lafuente (stronk7)
b21a6e26fa
Merge branch 'wip-MDL-38773-master' of git://github.com/marinaglancy/moodle
2013-06-05 19:31:53 +02:00
Marina Glancy
cdb6045d54
MDL-38773 Purge coursecat cache on course restore
2013-06-05 12:02:33 +10:00
Andrew Davis
afd2efc0e8
MDL-36090 core_grade: added logging of overriding of student grades
2013-06-05 08:51:53 +08:00
David Monllao
69a397cd2c
MDL-39795 behat: Adapting features to consider spaces
2013-05-27 14:24:20 +08:00
Eloy Lafuente (stronk7)
5e1bdaca7a
NOBUG: Adjust backup release for 2.6dev
2013-05-14 12:07:02 +02:00
David Monllao
5d7b6307b1
MDL-39586 behat: Closed list of stackeholders
2013-05-09 18:38:13 +08:00
Eloy Lafuente (stronk7)
3705a6dcbe
Merge branch 'MDL-34275-master' of git://github.com/danpoltawski/moodle
2013-05-07 19:15:21 +02:00
Rex Lorenzo
b4d33e02c0
MDL-34275 - Use default copyright license when restoring files
2013-05-07 09:09:38 +01:00
Maria Torres
f2dc4d24f9
MDL-39169: Now the question's tags are added in backup/restore options
2013-05-06 15:41:56 +01:00
David Monllao
00ea74cb54
MDL-39348 behat: Chaining strings instead of splitting strings in lines
2013-05-03 10:16:44 +08:00
David Monllao
4d40089d88
MDL-39348 behat: Changing to correct activity names
2013-05-03 10:16:44 +08:00
Eloy Lafuente (stronk7)
cedb0aab5a
MDL-39434 Bump all versions near 2.5 release
2013-05-01 18:03:29 +02:00
Dan Poltawski
142fa8c75d
Merge branch 'MDL-39438_master' of git://github.com/dmonllao/moodle
2013-05-01 08:32:30 +01:00
David Monllao
5bc7cd922b
MDL-39438 behat: Updating tests
...
According to MDL-38415 changes.
2013-05-01 13:39:06 +08:00
David Monllao
550d842e3c
MDL-39232 behat Normalize feature tags according to component names
2013-04-30 11:54:47 +08:00
Jerome Mouneyrac
3fb83b41a5
MDL-38888 Publish forms display setType warning
2013-04-26 16:45:00 +08:00
Dan Poltawski
a7eac88f94
Merge branch 'MDL-39000-master' of git://github.com/sammarshallou/moodle
2013-04-15 08:29:56 +01:00