Commit graph

11334 commits

Author SHA1 Message Date
Marina Glancy
e53394ba0b MDL-34290 repository API: add timeout to get_file and throw exception
- get_file should have a request timeout and throw an exception with the details (i.e. timeout reached) if download can
not be completed
- corrected phpdocs
2012-08-29 13:12:02 +08:00
Eloy Lafuente (stronk7)
0c6800e771 Merge branch 'MDL-31957-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE 2012-08-21 01:23:05 +02:00
Eloy Lafuente (stronk7)
3dd2dce1cb Merge branch 'w34_MDL-34959_m23_gmapsv3' of git://github.com/skodak/moodle into MOODLE_23_STABLE 2012-08-20 20:30:27 +02:00
Eloy Lafuente (stronk7)
1c5f24e089 Merge branch 'w34_MDL-34868_m23_gmapsv2' of git://github.com/skodak/moodle into MOODLE_23_STABLE 2012-08-20 20:18:03 +02:00
Michael de Raadt
b8cc020064 MDL-34779 settings: Updating lang string corrposnding to the fullnamedisplay setting 2012-08-20 15:44:42 +08:00
Petr Škoda
7e84ef4fea MDL-34959 add Google Maps API V3 support 2012-08-19 19:53:06 +02:00
Petr Škoda
778947cd65 MDL-34868 update deprecated Google maps API V2 key info 2012-08-19 18:21:37 +02:00
sam marshall
40f6697f2e MDL-31957 Course reset: Does not erase activity completion data 2012-08-17 10:39:38 +01:00
Eloy Lafuente (stronk7)
7abe8c31a6 Merge branch 'MDL-34704_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE 2012-08-08 01:53:22 +02:00
Aparup Banerjee
b21388d6db Merge branch 'MDL-34560_accessibility_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE 2012-08-07 14:45:46 +08:00
Dan Poltawski
ea22072a62 MDL-34575 lang/notes: reorder string to be alphabetical 2012-08-06 12:09:07 +08:00
Rossiani Wijaya
142b18a835 MDL-34560 accessibility compliance for message: Add label for input text and select tag 2012-08-04 17:03:39 +08:00
Tim Hunt
e071bc1aa4 MDL-34704 couse, accesslib: improve $CFG->courselistshortnames
1. get_context_name should respect the $CFG->courselistshortnames
setting.

2. When $CFG->courselistshortnames is on, what to display should use a
language string, rather than string concatenation. This makes it
possible for people to configure the display. For example, they might
want 'My first course [M101]' instead of 'M101 My first course'.
2012-08-03 14:43:30 +01:00
Rossiani Wijaya
1445fd1337 MDL-34575 accessibility compliance for notes: Add form input text and select tag 2012-08-03 13:36:27 +08:00
Sam Hemelryk
90105eb95a Merge branch 'MDL-34534-MOODLE_23_STABLE' of https://github.com/micaherne/moodle into MOODLE_23_STABLE 2012-08-01 13:21:03 +12:00
Aparup Banerjee
971937e7d0 MDL-34650 added MDLs to todo comment and deprecation comment.
(also triggering an amos script here for the other MDL-34650 commit)

AMOS BEGIN
  CPY [minute,form],[minute,core]
  CPY [month,form],[month,core]
  CPY [options,editor],[options,core]
  CPY [selectacourse,backup],[selectacourse,core]
AMOS END
2012-07-31 15:40:07 +08:00
Aparup Banerjee
4a5780ffde Merge branch 'MDL-34650_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE 2012-07-31 13:20:24 +08:00
Rossiani Wijaya
2a336b5ef1 MDL-34650 - accessibility compliance: Add <label> for form input text and select tag 2012-07-31 12:09:18 +08:00
Sam Hemelryk
eec3d1869d Merge branch 'MDL-28568_noncontact_warning_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE 2012-07-31 12:00:42 +12:00
Michael Aherne
a11b507f50 MDL-34534 Backport activity chooser default setting to 2.3 stable 2012-07-25 12:15:21 +01:00
Sam Hemelryk
ea268875fb Merge branch 'MDL-27083-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE 2012-07-25 09:18:19 +12:00
Frederic Massart
82a0137aa5 MDL-27083 Questions: Orphaned questions are adopted on upgrade
Conflicts:

	version.php
2012-07-23 11:58:56 +08:00
Davo Smith
548f536a00 MDL-33927 Filemanager - enforce the maxfiles limit on form submission 2012-07-23 12:01:24 +12:00
Andrew Davis
36e22a820c MDL-28568 message: added a warning message when the user is about to message someone who cant reply 2012-07-19 17:07:00 +08:00
David Monllao
e2bf940699 MDL-29563 course Hide duplication button in activities without backup2 support - Credit to Mark Nielsen 2012-07-19 15:35:20 +08:00
Dan Poltawski
4923e18d75 Merge branch 'MDL-23219_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE 2012-07-16 14:32:54 +08:00
Sam Hemelryk
5320640ccd Merge branch 'MDL-33624-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE 2012-07-16 13:50:56 +12:00
Dan Poltawski
28fc596d03 MDL-33624 lang - remove incosistent use of placeholder 2012-07-16 09:45:11 +08:00
Tim Hunt
7bef3664b8 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:21:17 +01:00
Dan Poltawski
0dd189d59d Merge branch 'MDL-18301-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE 2012-07-09 14:27:15 +08:00
Petr Škoda
fe6d428185 MDL-34046 improve mixed files upgrade error
Credit goes to Gordon Bateson.
2012-07-06 08:01:02 +02:00
Frederic Massart
2dd2bd7ead MDL-18301 Gradebook: Added feature for components to control grade visibility 2012-07-06 09:53:54 +08:00
Dan Poltawski
3d43075cfd MDL-9214 - improve comment for custom login instructions 2012-07-03 10:47:21 +12:00
Dan Poltawski
5df543a60e MDL-32286 - fix ambigious english string 2012-07-03 10:42:57 +12:00
Dan Poltawski
9ea8065f1c MDL-34014 lang - fix CSS optimiser spelling errors 2012-07-03 10:32:45 +12:00
Dan Poltawski
eadad29dc9 MDL-34022 lang - the html editor supports all browsers we support
So remove misleading 'some browers only'
2012-07-03 10:30:38 +12:00
Dan Poltawski
e068b3dbe3 MDL-34033 lang - ammend configenableajax
Now better reflects its functionality.
2012-07-03 10:27:57 +12:00
Aaron Barnes
9b57d5bc38 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 14:12:53 +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
Ankit Agarwal
7c05cd0e1f MDL-32769 course: Adding completion summary to course sections 2012-06-20 09:38:35 +08:00
Sam Hemelryk
a9efc8ddb8 Merge branch 'MDL-32908' of git://github.com/danpoltawski/moodle 2012-06-20 10:31:52 +12:00
Dan Poltawski
a80b5a0cf0 MDL-32908 - drop $USER->ajax
Its not been respected for some time and is just confusing
2012-06-19 15:07:18 +08:00
Dan Poltawski
6855fec7fd Merge branch 'MDL-33136_dndfilemanager_replace_file' of git://github.com/davosmith/moodle 2012-06-18 17:36:03 +08:00
Davo Smith
d0b2d44528 MDL-33136 Dndupload filemanager - user asked to rename/overwrite file when droping file with existing name 2012-06-18 08:55:41 +01:00
Aparup Banerjee
8db5df0c56 Merge branch 'MDL-33442-master-integration' of git://github.com/FMCorz/moodle 2012-06-14 21:29:45 +08:00
Frederic Massart
76055f5de4 MDL-33442 Course: actions bring you back where you came from 2012-06-14 17:07:57 +08:00