54614 Commits

Author SHA1 Message Date
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
e7b4bd3ef5 MDL-29538 core_condition: constants are no longer set using language strings 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
Eloy Lafuente (stronk7)
6be7840ce6 weekly release 2.4dev 2012-06-25 17:54:28 +02:00
Eloy Lafuente (stronk7)
a5f6ea2e88 Moodle release 2.3 v2.3.0 2012-06-25 17:51:17 +02:00
Eloy Lafuente (stronk7)
7dcdca9c85 Merge branch 'install_master' of git://github.com/amosbot/moodle 2012-06-25 17:44:13 +02:00
Martin Dougiamas
386a862f95 MDL-34004 - reinstate the custom HTML icon as separate from other markup icons, because it usually means a "page" to most people that displays in the browser. These icons are temporary (but workable) until Barbara can put in some nice ones that work as a set. The 16px one is from Moodle 2.2 and the others are copies of "unknown". 2012-06-25 23:05:44 +08:00
Dan Poltawski
a2be8d9dbe Merge branch 'MDL-33984' of git://github.com/stronk7/moodle 2012-06-25 21:56:54 +08:00
Eloy Lafuente (stronk7)
84874400c5 MDL-33984 mysql: take rid of old unicode & mysql 4.1 message on error. 2012-06-25 15:48:24 +02:00
Dan Poltawski
a9ca93db95 Merge branch 'MDL-33984' of git://github.com/stronk7/moodle 2012-06-25 18:46:59 +08:00
Eloy Lafuente (stronk7)
95bcc6e2d3 MDL-33984 mysql - raise min version to 5.1.33.
Because of http://bugs.mysql.com/bug.php?id=42758 and other benefits.
2012-06-25 12:32:25 +02:00
Aparup Banerjee
f5fee1e148 Merge branch 'MDL-33694' of git://github.com/danpoltawski/moodle 2012-06-25 16:45:23 +08:00
Dan Poltawski
3ab04302dd Merge branch 'MDL-33999' of git://github.com/nebgor/moodle 2012-06-25 16:35:09 +08:00
Dan Poltawski
6100b006f1 Merge branch 'wip-MDL-33777-master' of git://github.com/marinaglancy/moodle 2012-06-25 16:18:27 +08:00
Aparup Banerjee
13429b9596 MDL-33999 filemanager : fixed up incorrect string used in dialog button during folder renaming 2012-06-25 16:18:21 +08:00
Dan Poltawski
b0d3162930 Merge branch 'wip-MDL-33997-master' of git://github.com/marinaglancy/moodle 2012-06-25 16:08:33 +08:00
Marina Glancy
c8161eec94 MDL-33997 Repository should not support references by default 2012-06-25 16:03:25 +08:00
Dan Poltawski
72b33964f6 MDL-33694 repository: docs about 2.3 changes 2012-06-25 16:01:54 +08:00
Andrew Robert Nicols
26992cf171 MDL-33926 Add window scrolling when drag/dropping 2012-06-25 15:27:46 +08:00
Dan Poltawski
4c8926c7c3 Merge branch 'wip-MDL-33987-m23' of git://github.com/samhemelryk/moodle 2012-06-25 15:08:12 +08:00
Aparup Banerjee
224d186ebb Merge branch 'wip-MDL-33419-master' of https://github.com/barbararamiro/moodle 2012-06-25 14:30:18 +08:00
Sam Hemelryk
511a58d945 MDL-33987 theme_anomaly: Fixed up a couple of issues with the dock
* Active title displayed incorrectly because they had a limited width which I removed
* Docked block content was indented because block titles are now floated in anomaly.
  To fix this I gave it a bottom border, forcing it clear.
2012-06-25 17:17:37 +12:00
Dan Poltawski
d71f207da0 Merge branch 'wip-MDL-33985-m23' of git://github.com/samhemelryk/moodle 2012-06-25 13:00:33 +08:00
Sam Hemelryk
125231acf9 MDL-33985 theme_base: Fixed bad conflict resolution of course CSS rtl fixes 2012-06-25 16:53:39 +12:00
Dan Poltawski
f935363572 Merge branch 'MDL-33980' of github.com:equella/moodle 2012-06-25 11:20:40 +08:00
Marina Glancy
c01f7628f7 MDL-33777 Equella repository properly set the source and display file origin 2012-06-25 10:57:02 +08:00
nread
75d1891548 MDL-33980 equella: course ID number should be being passed through, not the course database ID 2012-06-25 12:33:49 +10:00
AMOS bot
6c213ef776 Automatically generated installer lang files 2012-06-25 00:31:38 +00:00
Petr Skoda
aefe9734fa MDL-33733 fix broken zip_packer->extract_to_storage() when extracting from stored_file 2012-06-25 01:32:50 +02:00
Eloy Lafuente (stronk7)
ba3e7df265 Moodle release 2.3rc1 v2.3.0-rc1 2012-06-24 18:37:12 +02:00
Eloy Lafuente (stronk7)
4f1d79538e Fix permissions. 2012-06-24 18:31:09 +02:00
Eloy Lafuente (stronk7)
bec3cd5b18 Merge branch 'install_master' of git://github.com/amosbot/moodle 2012-06-24 18:27:53 +02:00
Dan Poltawski
5b7621f78d Merge branch 'MDL-33717_admin_message2' of git://github.com/andyjdavis/moodle 2012-06-22 15:09:46 +08:00
Damyon Wiese
99467a9f7f MDL-33853: Prevent locking an assignment submission from putting a grade of 0 in the gradebook 2012-06-22 11:12:06 +08:00
Sam Hemelryk
31ea84a503 Merge branch 'MDL-32769-master' of git://github.com/ankitagarwal/moodle 2012-06-22 14:40:09 +12:00
Sam Hemelryk
cc0823118d Merge branch 'wip-MDL-33931-master' of git://github.com/abgreeve/moodle 2012-06-22 14:25:54 +12:00
Damyon Wiese
dd9247adfe MDL-33954: Assignment "submissionreceipthtml" Language change
Add the missing word: "see"
2012-06-22 09:03:18 +08:00
AMOS bot
0773a5161a Automatically generated installer lang files 2012-06-22 00:31:21 +00:00
Sam Hemelryk
088c374a6d Merge branch 'MDL-33430-reference-restore' of git://github.com/mudrd8mz/moodle
Conflicts:
	lib/db/install.xml
	lib/db/upgrade.php
	version.php
2012-06-22 11:56:49 +12:00
Sam Hemelryk
0e5533b607 MDL-32769 completion: Fixed up display of completion information 2012-06-22 10:42:56 +12:00
Sam Hemelryk
a273391e4a Merge branch 'MDL-33936-master-1' of git://git.luns.net.uk/moodle 2012-06-22 09:47:13 +12:00
Sam Hemelryk
c691963939 Merge branch 'wip-MDL-33928-master' of git://github.com/phalacee/moodle 2012-06-22 09:33:25 +12:00
Sam Hemelryk
c5541daf00 Merge branch 'MDL-33915' of git://github.com/danpoltawski/moodle 2012-06-22 09:02:50 +12: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
ff8734f21d MDL-33430 Give tasks an access to their current plan's results
This in turn provides access to the plan's results for both structure and
execution steps so they can register something useful there.
2012-06-21 12:28:09 +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
Barbara Ramiro
5a322c8cfc MDL-33381 Icon label removed for all file types to make it generic 2012-06-21 18:19:33 +08: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