f44e7d0a77
Merge branch 'MDL-36357' of git://github.com/danpoltawski/moodle
...
Conflicts:
user/view.php
2013-01-09 09:34:22 +13:00
3280819b20
Merge branch 'MDL-30899_master' of git://github.com/dmonllao/moodle
2012-12-18 09:10:42 +08:00
1a4596e434
MDL-29442 add missing utf-8 to entity html encoding and decoding
2012-12-09 18:21:38 +01:00
d9f95015f5
MDL-36777 usability: Theming fixes on backup steps
2012-11-30 16:53:39 +08:00
c384744304
MDL-36638 usability: Core changes for new quiz/question icons
2012-11-29 12:41:29 +08:00
4bcbdb3e88
MDL-30899 moodle-core-notification Adding close button title for accessibility
2012-11-27 14:41:42 +08:00
4c21b22043
MDL-36753 fix invalid sectionid in backup tests
2012-11-21 12:43:55 +01:00
0e35ba6ffc
MDL-36357 cleanup - remove double semicolons
2012-11-15 09:51:26 +08:00
3b92a11098
Merge branch 'MDL-36315' of git://github.com/stronk7/moodle
2012-11-01 10:02:47 +08:00
d4d7984308
MDL-36315 backup: reduce the DST tests failing-window
...
This reduces the period of time that some of the unit tests
for calculate_next_automated_backup() are failing right now
(from 1week to just some hours around the DST changes).
Note it's not the final solution because they will still fail
when New_York or Brussels DST changes are about to happen, but
to get this completely fixed we'll need to wait to switch from
current custom TZ/DST support to PHP built-in one.
2012-11-01 02:40:56 +01:00
890988221c
Merge branch 'MDL-35117-master' of git://github.com/FMCorz/moodle
2012-10-29 14:03:57 +08:00
3dce356ac4
Merge branch 'MDL-34837-master' of git://github.com/FMCorz/moodle
2012-10-29 13:55:06 +08:00
db6c8b82d2
MDL-35117 backup: Read information from backup XML file when removing excess backups
2012-10-18 15:13:50 +08:00
58e033193f
Merge branch 'MDL-32148-master' of git://github.com/StudiUM/moodle
2012-10-16 11:16:33 +08:00
ac1f907e77
MDL-34837 backup: Restore does not fail when some courses have the same name
2012-10-15 17:18:34 +08:00
384c3510a9
MDL-35339 Course functions unit tests
2012-10-15 14:08:14 +08:00
d3ea132783
MDL-32148 Backup: Improved check for last backup successful or not
2012-10-05 10:23:42 -04:00
1c1ae7a7a6
MDL-32148 Backup: Simplified and improved submitted patch
2012-10-05 10:10:36 -04:00
914442ae29
MDL-32148 Backup: Adding config settings for skipping courses in automated backups
2012-10-05 10:10:36 -04:00
7a7b8a1f19
MDL-35071 redesign enrol restore
...
Includes option to convert all enrolments to enrol_manual instances, support for mapping of custom fields and fixes for several other problems. This does not include support for custom enrol tables, it will be addressed in another issue.
2012-09-07 11:11:28 +02:00
edeb39d44a
Merge branch 'MDL-33812-master' of git://github.com/FMCorz/moodle
2012-09-04 00:19:53 +02:00
a173b52da0
MDL-28346 Backup: Backup does not fail when a file is missing
2012-09-03 14:13:11 +08:00
3b232aeffb
MDL-28346 Backup: Restore does not fail when a file is missing
2012-09-03 14:13:11 +08:00
05e521c9bc
MDL-28346 Backup: Added new status 'warning' for backup result
2012-09-03 14:13:11 +08:00
61d71da334
MDL-33812 Backup: Added some upgrade information about the changes
2012-09-03 14:12:28 +08:00
14ecc5a80c
MDL-33812 Backup: Revert MDL-33521
2012-09-03 14:12:28 +08:00
e2aebdc928
MDL-33812 Backup: Respect of backup_auto_keep
2012-09-03 14:12:28 +08:00
509b17c71d
Merge branch 'MDL-32705' of git://github.com/timhunt/moodle
2012-08-21 12:37:43 +08:00
34f5898f5e
Merge branch 'MDL-34118' of git://github.com/timhunt/moodle
2012-08-21 12:29:16 +08:00
040d4c63be
Merge branch 'MDL-34756-master' of git://github.com/FMCorz/moodle
2012-08-20 16:34:18 +02:00
53db05a507
Merge branch 'MDL-28531-master' of git://github.com/FMCorz/moodle
2012-08-20 16:28:09 +02:00
b3e10b89e9
MDL-34529: Fixed ordering of course sections when performing import/restore by adding the sort parameter.
2012-08-20 14:00:45 +02:00
4cb18cb080
MDL-34372: Fix query in backup_cron_helper so it works on Postgres 8.3
...
Amended by stronk7@moodle.org to use uppercase SQL keywords.
2012-08-20 13:27:32 +02:00
d5bdbbba26
MDL-34756 Unit Tests: Move backup helper tests
2012-08-20 10:24:37 +08:00
3e3ae0ee11
MDL-34118 question backup: a mod can use usages in different ways.
...
An activity module might want to use question_usages in different ways.
We should suppport this, because it lets people make interesting
activities.
At the moment, the backup and restore code does not support this,
because it uses fixed element names for the question_usage element and
its children. This fix changes things so that a prefix can be appended
to all the element names.
2012-08-17 11:13:10 +01:00
4d91f7354e
MDL-28531 Backup: Automated backups run when they are scheduled
2012-08-17 15:00:10 +08:00
f238bb73d1
MDL-32705 backup ui: add select all/none JavaScript on schema screens
2012-08-16 17:04:05 +01:00
c52c034064
Merge branch 'MDL-33531_master' of git://github.com/dmonllao/moodle
2012-08-15 11:24:45 +12:00
a8c7ff1aeb
MDL-34741 remove old unused restore JS code
2012-08-11 20:40:10 +02:00
f4162effeb
MDL-33531 backup Added format_string to course shortname
2012-08-10 08:45:26 +08:00
bde0eac589
MDL-33531 backup Avoiding possible Notice
2012-08-10 08:45:26 +08:00
ab519e888b
MDL-33531 Fixed the regexp to find old backup files, considering backup_shortname backup option
2012-08-10 08:45:26 +08:00
67ab929cbf
Revert "Merge branch 'MDL-28531-master' of git://github.com/FMCorz/moodle"
...
This reverts commit e5d9cc13ac20c3e25343
2012-08-07 14:27:01 +08:00
e5d9cc13ac
Merge branch 'MDL-28531-master' of git://github.com/FMCorz/moodle
2012-08-07 13:58:07 +08:00
3d515f4896
MDL-28531 Backup: Automated backups run when they are scheduled
2012-08-03 09:30:39 +08:00
9dfadf9e97
MDL-34707 backup UI: only include the JS once.
2012-08-02 18:40:49 +01:00
7d5f2ac2e6
Merge branch 'MDL-29007-master-3' of git://git.luns.net.uk/moodle
2012-07-31 12:05:38 +12:00
a689cd1def
MDL-34469 - lib - replacement of the deprecated get_context_instance and get_context_by_id functions (group 15)
2012-07-30 14:59:57 +08:00
d2a27ab01b
MDL-29007 Rename moodle-enrol-notification to moodle-core-notification
2012-07-25 16:22:18 +01:00
e1980f8bb9
Merge branch 'w28_MDL-8249_m24_roletranslations' of git://github.com/skodak/moodle
...
Conflicts:
lib/db/upgrade.php
version.php
2012-07-10 09:43:23 +08:00
Sam Hemelryk