mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-06 08:49:53 +01:00
Code Issues Projects Releases Wiki Activity
64,123 Commits 36 Branches 523 Tags
Commit Graph

203 Commits

Author SHA1 Message Date
Sam Hemelryk
a2a2e7fb4a Merge branch 'MDL-32119' of git://github.com/srynot4sale/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2012-07-09 16:02:49 +12:00
Sam Hemelryk
141d3c86d3 MDL-29538 condition: Tidied up user field condition code post merge 2012-07-09 11:45:44 +12:00
Mark Nelson
e01fbcf765 MDL-29538 core_condition: Integrated with the latest code, can now place user field conditions on sections as well 2012-06-26 15:18:53 +08:00
Sam Hemelryk
33e657c7e7 MDL-29538 core_condition: Pre-integration merge cleanup 
* Fixed up database installation and upgrade code
* Reverted some whitespace optimisations to minimise conflicts
* Optimised commits made by Mark to reduce complexity and add tracker issue numbers
 2012-06-26 15:18:53 +08:00
Mark Nelson
5fa220fbf3 MDL-29538 core_condition: backup and restore now works with the new DB structure and removed unneeded restore process 2012-06-26 15:18:52 +08:00
Mark Nelson
cb4492c200 MDL-29538 core_condition: changed the logic in the code so that it works with the new database structure as well as tidying up parts of the code 2012-06-26 15:18:52 +08:00
Mark Nelson
92fb7dd3a5 MDL-29538 core_condition: made changes to the DB structure - nb. had to rename the table due to length limit 2012-06-26 15:18:51 +08:00
Mark Nelson
76af15bb4c MDL-29538 core_condition: initial commit to add support for making things conditional on user profile fields 2012-06-26 15:18:51 +08:00
David Mudrák
7b5f67f77f MDL-33430 Notify user about file aliases failures at the final stage of the restore 2012-06-21 15:22:38 +02:00
David Mudrák
fb3a57e2d4 MDL-33430 Fix strict standards warning 
Only variables should be passed by reference.
 2012-06-21 12:28:09 +02:00
David Mudrák
d129c3608f MDL-33430 Add caching into choose_repository() method 
Simply do not repeat expensive search once the restore process decides how
to deal with the given repositoryid or repositorytype.
 2012-06-21 12:17:54 +02:00
David Mudrák
2c1426743a MDL-33430 Add process_file_aliases_queue restore step to the final task 
This execution step tries to actually restore all aliases that were
stashed in the file aliases queue.
 2012-06-21 02:31:26 +02:00
David Mudrák
4b6b087faf MDL-33430 Do not restore aliases yet, stash them for later processing 2012-06-21 02:29:34 +02:00
Tim Hunt
ff5d6f8872 MDL-33682 backup: cope with sections called '0' 
It was not previously possible to have a section called 0 because of
bugs in the standard course formats, but we hit this with the OU course
format. You got an exception because backup settings tested to see if
their lable was empty, which means a section name of '0' was fatal.
Should work now.
 2012-06-12 17:46:47 +01:00
Eloy Lafuente (stronk7)
3ea1330949 MDL-33455 restore: process grade_grades only if user matches. 
Note this has been applied both to individual activities grade_grades
and to general ones.
 2012-06-11 11:30:20 +08:00
Eloy Lafuente (stronk7)
78117cb1a4 MDL-33465 fix incorrect merge conflict resolution 2012-06-08 10:55:39 +02:00
Aparup Banerjee
ac16f14512 Merge branch 'MDL-33465-master' of git://github.com/ankitagarwal/moodle 
Conflicts:
	backup/moodle2/restore_stepslib.php
 2012-06-07 14:04:08 +08:00
Aparup Banerjee
2330cf7af1 Merge branch 'wip-mdl-33455' of git://github.com/rajeshtaneja/moodle 2012-06-05 15:15:26 +08:00
Dan Poltawski
66726f61d0 Merge branch 'MDL-33502' of git://github.com/stronk7/moodle 2012-06-05 13:10:28 +08:00
Rajesh Taneja
a1a2cc5994 MDL-33455 gradebook: Grade will not be inserted for unknown user 2012-06-05 09:46:40 +08:00
Ankit Agarwal
336d8c49f4 MDL-33465 course: 'Course view section' logs should use sectionid instead of section number to generate action urls' 2012-06-05 09:33:45 +08:00
Eloy Lafuente (stronk7)
c76bd30885 Merge branch 'MDL-33133-master' of git://github.com/sammarshallou/moodle 2012-06-05 00:38:04 +02:00
Eloy Lafuente (stronk7)
f4624b6b0b MDL-33502 restore: there are no files with itemid based on section numbers. 2012-06-04 02:15:57 +02:00
Aaron Barnes
46eca1f77e MDL-32119 course completion: Removed unused database structure 2012-05-29 14:17:22 +12:00
Sam Hemelryk
c31081d0a4 Merge branch 'MDL-32766' of git://github.com/rwijaya/moodle 
Conflicts:
	version.php
 2012-05-28 11:19:06 +12:00
Rossiani Wijaya
15a848ba90 MDL-32766 course log: specify log for viewing course section 2012-05-22 13:50:40 +08:00
sam marshall
52e9dfc58f MDL-33133 Conditional section: restore to existing course fix 2012-05-21 13:59:00 +01:00
Dongsheng Cai
6723372514 MDL-28666 Extends repository to support references 
1. Allow repository to create references to external contents
2. Extends files API to handle file references
3. Generic file caching
4. Backup/restore file references
5. Download external contents if repository uninstalled
6. Allow filepicker to display iframe
7. PHPUnit test suits
 2012-05-21 11:57:51 +08:00
Eloy Lafuente (stronk7)
128af10645 MDL-32005 Avoid some notices restoring old backup files without idnumber 2012-05-18 13:36:03 +02:00
Eloy Lafuente (stronk7)
71cbb2516b MDL-24419 (6): Backup and restore fixes and improvements 
- annotate used grouping
- reorganize restore methods
- roll availability dates
- observe $CFG->enableavailability
- observe $CFG->enablegroupmembersonly
- TODO: 2 TODOs
 2012-05-17 03:58:51 +02:00
Eloy Lafuente (stronk7)
dd420abadf Merge branch 'MDL-24419-master' of git://github.com/sammarshallou/moodle 
Conflicts:
	lib/db/upgrade.php
	lib/phpunit/lib.php
	version.php

Fixed:
    lib/db/upgrade.php - duplicate course->sectioncache add code
    lib/db/install.xml - cleanup needed because xmldb editor was not used
    lib/phpunit/classes/util.php - cleanup $GROUPLIB_CACHE on test reset
 2012-05-16 23:53:47 +02:00
Andrew Robert Nicols
74b714df7e MDL-32005 Add idnumber field to groups and groupings 2012-05-15 09:38:51 +01:00
sam marshall
ce4dfd2703 MDL-24419 (4): Add conditional availability support to sections; section cache 
Credit: original version done by Kirill Astashov of NetSpot (netspot.com.au),
finished and tweaked by sam.

This change adds conditional availability support for sections analagous to
that already available for activities. (Backend, UI, backup/restore.)

In order that this feature does not reduce performance, section cacheing has
also been added using a new course 'sectioncache' field analagous to modinfo.

The new feature integrates with activity availability so that activities
inside sections which are not available are automatically not available
themselves (meaning it works to restrict access).
 2012-05-14 11:19:25 +01:00
Eloy Lafuente (stronk7)
6565d55a34 MDL-22895 backup: minor fixes 2012-04-11 01:47:53 +02:00
Ankit Agarwal
8331a159c5 MDL-22895 backup: Adding the feature to support backing up and restoring calendar events 2012-04-02 13:58:33 +08:00
Petr Skoda
748e96512b MDL-32095 fix backup API to be E_STRICT compatible 2012-03-26 16:04:16 +02:00
Sam Hemelryk
8149d6240a MDL-19125 lib: Fixed up inline comments during integration 2012-03-19 10:08:47 +13:00
Tim Hunt
9665ecd275 MDL-19125 module restrictions: use a capability 
1. This used to use a complex legacy system which was buggy.

2. It now relies on a new mod/...:addinstance capability for each module.

3. All the legacy code has been stripped out.

4. Old restriction data is upgraded by creating the necessary permission
overrides. Similarly, when old backups are restored, the old settings
are converted to be overrides.

5. The required addinstance capabilities will be added as a separate
commit.

6. There is a developer debug warning about modules that are missing the
addinstance capability, unless they are MOD_ARCHETYPE_SYSTEM mods.
 2012-03-15 17:11:27 +00:00
Eloy Lafuente (stronk7)
ac6dc09c26 MDL-29248 backup: take rid of the setting and code handling the 'private' user filearea 2012-03-01 13:09:47 +01:00
David Mudrak
f9dab4bed2 MDL-30982 Restore moodle2 files - phpDocs categorization 2012-02-27 11:59:43 +01:00
Eloy Lafuente (stronk7)
ee1dc83574 MDL-31532 restore: avoid null course->hiddensections problems. Credit goes to Petri Asikainen. Thanks! 2012-02-20 01:34:25 +01:00
Tim Hunt
a60835c721 MDL-31314 gradebook restore: fix category.depth on restore. 
Without this, restoring backups made with the OU's custom 'restore from
1.9' feature, and possibly other people's custom converstion code, does
not work properly.

Also, fix poor recordset code.
 2012-01-30 12:31:43 +00:00
Eloy Lafuente (stronk7)
4d856332e4 MDL-28180 backup - on restore always prevent completion_aggr_methd dupes 
This covers the last case where dupes could be happening in the
completion_aggr_methd table: Restoring one complete course into
an existing one, adding information. Now we always check if the
aggr_method exists before inserting it.
 2011-12-12 00:31:44 +01:00
Eloy Lafuente (stronk7)
5b14551371 MDL-30466 Backup: delete empty method 2011-11-29 19:47:25 +01:00
Rajesh Taneja
3c33d77817 MDL-30466 Backup: Fixed duplicate completion record check error 2011-11-28 14:12:41 +08:00
Eloy Lafuente (stronk7)
0620787a17 Merge branch 'w47_MDL-27233_m22_restoreenrol' of git://github.com/skodak/moodle 2011-11-24 23:44:24 +01:00
Petr Skoda
73d000f389 MDL-27233 allow adding of default role to restorers 2011-11-23 18:38:27 +01:00
David Mudrak
086ed2a6c0 MDL-30390 Advanced grading - fixed the database table field name in the restore 
This is a regression of the recent fields renaming.
 2011-11-22 15:50:17 +01:00
Eloy Lafuente (stronk7)
f218cdab34 Merge branch 'MDL-29591-master-2' of git://git.luns.net.uk/moodle 2011-11-18 17:28:53 +01:00
Andrew Robert Nicols
7d7d82de03 MDL-29591 Check for permission before overwriting course idnumber when restoring 2011-11-18 14:54:00 +00:00