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
84,808 Commits 36 Branches 519 Tags
Commit Graph

2616 Commits

Author SHA1 Message Date
Mark Nielsen
362bc07063 MDL-48644 backup: Preserve log IP and time during restore 2014-12-18 11:30:28 -08:00
Dan Poltawski
d3a1c13ed8 Merge branch 'MDL-46651-master-restore-course-completion-duplicate-key' of https://github.com/Trii/moodle 2014-12-16 11:58:53 +00:00
Eloy Lafuente (stronk7)
9f6658e18c Merge branch 'MDL-48556-master' of git://github.com/ankitagarwal/moodle 2014-12-15 17:53:27 +01:00
Joshua Johnston
7a6ca49af5 MDL-46651 Backup: Handle duplicate course completions during restore 
Cron can cause duplicate completion records if triggered during a long
running restore process. If this is the case, replace the new record
with the record from the backup file
 2014-12-11 16:00:18 -05:00
Ankit Agarwal
bd58dfbfa1 MDL-48556 backup: Use correct conditions before checking dir permissions 2014-12-10 14:33:05 +05:30
Dan Poltawski
e600e6ae50 Merge branch 'MDL-47323-enrol-plugin-backup' of https://github.com/mpetrowi/moodle 2014-12-09 22:29:37 +00:00
Mark Nelson
a76eef5bc0 MDL-30937 core_backup: use default log level when none specified 2014-12-07 21:18:13 -08:00
Eloy Lafuente (stronk7)
38ea5e0a39 MDL-21724 course: change remaining tests to new "Save and display" 2014-12-04 12:14:31 +00:00
Sam Hemelryk
7594ed1e2a Merge branch 'MDL-40419-master-2nd' of git://github.com/FMCorz/moodle 2014-12-04 12:03:18 +00:00
Matt Petro
f61992951d MDL-47323 backup: added enrol plugin backup structure and annotation 2014-12-02 21:46:33 -05:00
Sam Hemelryk
eb8f9f9adb Merge branch 'MDL-42717-master' of git://github.com/ankitagarwal/moodle 2014-12-01 08:47:34 +13:00
Frederic Massart
dc8ee30eda MDL-40419 backup: Advanced comparison when restoring blocks in course 2014-11-27 15:28:51 +08:00
Eloy Lafuente (stronk7)
d2142e7b7c Merge branch '23538-29' of git://github.com/samhemelryk/moodle 
Conflicts:
	backup/util/ui/renderer.php
 2014-11-25 17:00:06 +01:00
David Monllao
99e434f2fa MDL-31500 backup: Warn users about front page backups 
They should know that they can only be restored on the front
page before selecting the destination course.
 2014-11-25 10:30:25 +08:00
David Monllao
d62c556110 MDL-31500 backup: Remove frontpage restore UI restrictions 2014-11-25 09:37:53 +08:00
Dan Poltawski
8030d84bbc Merge branch 'MDL-47601_master' of https://github.com/markn86/moodle 2014-11-24 17:02:09 +00:00
Dan Poltawski
bcc4dc3eab Merge branch 'MDL-31500_master' of git://github.com/dmonllao/moodle 
Conflicts:
	backup/util/ui/renderer.php
 2014-11-24 10:55:27 +00:00
Ankit Agarwal
80a1dfe561 MDL-42717 backups: set correct backup status and add logs 
Set a correct backup status of ERROR when we fail to copy a file to an external directory given the backup configs demand it.
Also a lot of logs are added around this area to let admins easily find the problem if backup fails because of directory permissions.
 2014-11-24 10:18:56 +05:30
Sam Hemelryk
74cb9073d0 Merge branch 'MDL-35494_master' of https://github.com/markn86/moodle 2014-11-24 10:06:00 +13:00
David Monllao
03c39daad8 MDL-31500 backup: Allow front page backup/restore 
Removes restore on front page restrictions and allows
front page modules duplication.
 2014-11-21 14:55:09 +08:00
David Monllao
818262afa5 MDL-31500 backup: New unit test for front page backup/restore 2014-11-21 12:37:27 +08:00
Sam Hemelryk
c866fe44de MDL-23538 backup: tidied up phpdocs + coding style 2014-11-19 10:04:10 +13:00
Dan Poltawski
604090397a Merge branch 'wip-MDL-36240-master' of git://github.com/abgreeve/moodle 2014-11-17 13:30:57 +00:00
Mark Nelson
425dc0ed96 MDL-47601 core_backup: ensure removal of automated backups 2014-11-16 23:56:59 -08:00
Mark Nelson
17fd194c7c MDL-35494 core_backup: fixed activity restoration issue 2014-11-16 22:50:10 -08:00
Adrian Greeve
d983ac6394 MDL-36240 backup: Activity calendar events backed up. 
Activity calendar events can now be backed up and restored
when no user data is selected.
 2014-11-17 09:18:00 +08:00
Sam Hemelryk
0d23255b89 Merge branch 'MDL-48179-master' of https://github.com/sammarshallou/moodle 2014-11-17 12:48:04 +13:00
Sam Hemelryk
76555946a9 Merge branch 'MDL-35638-master' of git://github.com/ankitagarwal/moodle 2014-11-17 10:34:10 +13:00
sam marshall
94b084fb02 MDL-48179 Backup progress: Can time out when compressing large backup 2014-11-14 18:29:30 +00:00
Tim Hunt
ba145a9e4e MDL-47590 question backup: include response file only with userdata 2014-11-14 16:21:18 +00:00
Ankit Agarwal
751c05c041 MDL-35638 backup: Do not print headers during redirects 2014-11-11 11:07:44 +05:30
Eloy Lafuente (stronk7)
00c78e2623 MDL-48143 backup: Bump release to 2.9 dev branch 2014-11-10 17:32:34 +01:00
Eloy Lafuente (stronk7)
de881693f7 MDL-48021 bump: Bump all versions to planned release 
This bumps all versions to planned 2.8 release
(2014111000) version and all the dependencies to
current 2.8rc1 (2014110400)
 2014-11-04 17:52:35 +01:00
Marina Glancy
89da9fa67b Merge branch 'MDL-47569_CC_Errors' of git://github.com/moodlerooms/moodle 2014-10-30 16:15:51 +08:00
Marina Glancy
c3b545a92a Merge branch 'wip-MDL-47675-master' of git://github.com/abgreeve/moodle 2014-10-24 11:48:09 +02:00
Adrian Greeve
c42d18183a MDL-47675 phpunit: Update unit tests to pass on MSSQL 
Unit tests were failing on MSSQL. gc_collect_cycles() was
removed from the phpunit utils.php file to save time in running
the tests, but MSSQL doesn't clean up open files as well as
other databases.

This patch includes the garbage collection for the unit tests
that require it.
 2014-10-20 14:26:11 +08:00
Damyon Wiese
47d6e6a7d3 MDL-47503 Grades: Completely remove aggregationsubcats 
This setting is not compatible with combinations of aggregation methods
and the ways in which it does and does not work are not documented. It
was voted to remove it completely by the gradebook workshop, so I have
completely removed it and added a warning for all affected courses + restored
backups.
 2014-10-20 12:03:18 +08:00
Frederic Massart
fef943738d MDL-46481 backup: Ensure one-click backup is not displayed on restore 2014-10-09 18:45:32 +08:00
Frederic Massart
70e7b634e4 MDL-46481 backup: Reposition one-click backup button 2014-10-08 13:45:24 +08:00
Mark Nielsen
292f663581 MDL-47569 backup: Do not close questions tag if never opened 
This can happen when restoring quizzes that
do not have any questions.
 2014-10-07 11:48:35 -07:00
Mark Nielsen
95dc1e42d5 MDL-47569 backup: Escape section summary for XML 
This was causing the parsing of the XML
to fail because things like & were not
escaped.
 2014-10-07 11:47:40 -07:00
Dan Poltawski
c31f7c58c1 Merge branch '46481-28' of git://github.com/samhemelryk/moodle 2014-10-07 14:25:06 +01:00
Sam Hemelryk
3973b67f61 MDL-46481 backup: removed collapsing and better lang string 
Thanks Rex for the peer-review!
 2014-10-05 16:21:38 +13:00
Frederic Massart
b4087c31bc MDL-47254 core_grades: Backup aggregationcoef2 and weightoverride 
Part of: MDL-46576
 2014-10-03 13:54:38 +08:00
Damyon Wiese
8836ef8aa2 MDL-46139 Grades: Add new grade_grades aggregation columns to backup/restore. 2014-10-03 13:48:55 +08:00
Sam Hemelryk
bae30ef320 MDL-46481 backup: behat tests for the quick backup button 2014-10-03 09:43:08 +13:00
Sam Hemelryk
f3973676e8 MDL-46481 backup: implemented quick backup process (one click) 2014-10-03 09:43:08 +13:00
sam marshall
5176504d3f MDL-46991 Availability: Conditional dates not updated on restore 2014-09-18 16:37:53 +01:00
Marina Glancy
de62e57a9b Merge branch 'master_MDL-47076' of git://github.com/totara/moodle 2014-09-09 17:12:28 +08:00
David Curry
927ea484ec MDL-47076 badges: Add checks to user fields during badges restoration 
Change-Id: Iff6402d1da835ed57dc17d079adf1bbd2e76dd6c
 2014-09-09 16:22:52 +12:00