mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-03 15:32:43 +02:00
Code Issues Projects Releases Wiki Activity
55,223 Commits 36 Branches 528 Tags
Commit Graph

11342 Commits

Author SHA1 Message Date
Sam Hemelryk
61e93a4c08 Merge branch 'MDL-27083-master' of git://github.com/FMCorz/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2012-07-25 09:20:44 +12:00
Dan Poltawski
b7db7803bc Merge branch 'w30_MDL-34299_m24_html5' of git://github.com/skodak/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2012-07-24 14:07:26 +08:00
Aparup Banerjee
f36b0ba502 Merge branch 'wip-MDL-34285-m24' of git://github.com/samhemelryk/moodle 2012-07-23 17:22:14 +08:00
Dan Poltawski
7067a161a3 Merge branch 'wip-mdl-31023' of git://github.com/rajeshtaneja/moodle 2012-07-23 13:13:47 +08:00
Frederic Massart
67e3dd2c95 MDL-27083 Questions: Orphaned questions are adopted on upgrade 2012-07-23 11:37:09 +08:00
Sam Hemelryk
18989c7a24 Merge branch 'MDL-34205-master' of git://github.com/micaherne/moodle 2012-07-23 12:52:35 +12:00
Sam Hemelryk
87608b34f4 Merge branch 'MDL-33927_enforce_max_attachments' of git://github.com/davosmith/moodle 2012-07-23 12:00:30 +12:00
Petr Škoda
13725b3797 MDL-34299 remove xmlstrictheaders setting and switch to html5 doctype by default 
This fixes WCAG 2.0 compliance because we were already using HTML5 markup.

The strict XML headers setting never worked for production servers, developers
used browser validators for compliance testing. XHTML 5 option is relatively
similar to this obsolete option, but still it can not be used on production servers.

XHTML Strict 1.x was a standardised dead end, HTML5 is the new de-facto-standard
supported by all major browsers including latest versions of IE.

Please note nothing changes in our coding style because HTML5 is a superset of
several previous standards, it is recommended to use only features that are
already implemented in all our supported browsers.
 2012-07-21 19:23:44 +02:00
Rajesh Taneja
afb92f1b9e MDL-31023 libraries: removed deprecated function and classes from pagelib.php 2012-07-19 15:48:45 +08:00
David Monllao
6b4885319b MDL-29563 course Throwing an exception instead of a message 2012-07-19 15:33:30 +08:00
David Monllao
8a1a951f7c MDL-29563 course Hide duplication button in activities without backup2 support - Credit to Mark Nielsen 2012-07-19 15:33:30 +08:00
Sam Hemelryk
21a4e24cab MDL-34285 condition: Added is not empty option for user profile conditions and moved strings. 
As part of this change I added a new condition for user fields: is not equal.
I also copied the strings being used from the filters lang file to the condition
lang file and changed the uses in code.

AMOS BEGIN
  CPY [contains,filters],[contains,condition]
  CPY [doesnotcontain,filters],[doesnotcontain,condition]
  CPY [isequalto,filters],[isequalto,condition]
  CPY [startswith,filters],[startswith,condition]
  CPY [endswith,filters],[endswith,condition]
  CPY [isempty,filters],[isempty,condition]
AMOS END
 2012-07-19 19:27:00 +12:00
Sam Hemelryk
2fcd79c043 Merge branch 'MDL-21572-master' of git://github.com/FMCorz/moodle 2012-07-18 09:41:42 +12:00
Davo Smith
a32dabc260 MDL-33927 Filemanager - enforce the maxfiles limit on form submission 2012-07-17 10:18:52 +01:00
Dan Poltawski
0e7dd4f672 Merge branch 'MDL-23219' of git://github.com/timhunt/moodle 2012-07-16 14:32:48 +08:00
Dan Poltawski
bea8b7454e Merge branch 'MDL-22259b' of git://github.com/srynot4sale/moodle 2012-07-16 11:57:04 +08:00
Sam Hemelryk
775d977710 Merge branch 'MDL-33624' of git://github.com/danpoltawski/moodle 2012-07-16 13:51:07 +12:00
Tim Hunt
ab0c7007c5 MDL-23219 check permissions: show relevant role-assignments. 
Adding this list of role assignments should make it much easier for
admins to work out why, when the permissions shown in the check
permisisons page are now what they expect.

I thought about making the links go more directly to, for example, the
assign roles pages for each context, but because of things like
enrolments in courses that is hard. It is only two clicks to go to the
context, then click the right link in the settings block there.

I also re-orderd some of the code in check.php to try to get all the DB
code before all the output code.
 2012-07-13 15:16:57 +01:00
Charles Fulton
293f42b67a MDL-21572 grade: make user profile fields configurable 2012-07-13 09:00:12 +08:00
Dan Poltawski
19a8646822 MDL-33624 lang - remove incosistent use of placeholder 2012-07-12 13:10:52 +08:00
Aaron Barnes
eb8f89a976 MDL-22259 completion: Rename "Course Prerequisites" to "Completion Dependencies" 2012-07-12 15:55:34 +12:00
Dan Poltawski
ae5cf02259 Merge branch 'w28_MDL-8249_m24_roletranslations' of git://github.com/skodak/moodle 2012-07-11 16:34:15 +08:00
Petr Škoda
ef7090522d MDL-8249 improve custom role strings 
Credit goes to Michael de Raadt.
 2012-07-11 10:29:04 +02:00
Dan Poltawski
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
Dan Poltawski
4e85084148 Merge branch 'MDL-18301-master' of git://github.com/FMCorz/moodle 2012-07-09 14:27:10 +08:00
Dan Poltawski
13ce630719 Merge branch 'w28_MDL-34046_m24_stalefiles' of git://github.com/skodak/moodle 2012-07-09 13:50:09 +08:00
Sam Hemelryk
141d3c86d3 MDL-29538 condition: Tidied up user field condition code post merge 2012-07-09 11:45:44 +12:00
Sam Hemelryk
871c06e583 Merge branch 'MDL-29538_usercond' of git://github.com/markn86/moodle 2012-07-09 11:44:39 +12:00
Michael Aherne
945a81a943 MDL-34205 Activity chooser default setting 2012-07-06 15:29:08 +01:00
Petr Skoda
c52551dc3c MDL-8249 localise standard role names and descriptions if empty 2012-07-06 08:22:34 +02:00
Petr Škoda
774c42a8d3 MDL-34046 improve mixed files upgrade error 
Credit goes to Gordon Bateson.
 2012-07-06 08:00:53 +02:00
Frederic Massart
455dc0de61 MDL-18301 Gradebook: Added feature for components to control grade visibility 2012-07-06 09:52:46 +08:00
Sam Hemelryk
14cff7be4d Merge branch 'MDL-9214' of git://github.com/danpoltawski/moodle 2012-07-03 10:47:07 +12:00
Sam Hemelryk
c6c16fd9ea Merge branch 'MDL-32286' of git://github.com/danpoltawski/moodle 2012-07-03 10:41:17 +12:00
Sam Hemelryk
b5c4f3042b Merge branch 'MDL-34014' of git://github.com/danpoltawski/moodle 2012-07-03 10:32:37 +12:00
Sam Hemelryk
457fc727ac Merge branch 'MDL-34022' of git://github.com/danpoltawski/moodle 2012-07-03 10:30:30 +12:00
Sam Hemelryk
fc8931e457 Merge branch 'MDL-34033' of git://github.com/danpoltawski/moodle 2012-07-03 10:27:16 +12:00
Dan Poltawski
31886e4651 MDL-9214 - improve comment for custom login instructions 2012-06-27 13:10:24 +08:00
Dan Poltawski
3b0ba40ac5 MDL-34033 lang - ammend configenableajax 
Now better reflects its functionality.
 2012-06-27 11:00:09 +08:00
Mark Nelson
a6b538a862 MDL-29538 core_condition: validate whether a field has been declared before for that activity 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
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
Dan Poltawski
42e4100b62 MDL-34014 lang - fix CSS optimiser spelling errors 2012-06-26 11:17:36 +08:00
Dan Poltawski
b4284d4895 MDL-34022 lang - the html editor supports all browsers we support 
So remove misleading 'some browers only'
 2012-06-26 11:03:54 +08:00
Aaron Barnes
08f19f4848 MDL-32249 completion: Make grade criteria more consistent 
Also, round course grades and remove hardcoded string.

Note: This patch also removes the ability to update the course grade
from the completion interface
 2012-06-26 13:53:01 +12: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
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
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
Ankit Agarwal
dce49c1c38 MDL-32769 course: Moving the completion status to a new line 2012-06-21 16:16:48 +08:00