mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-13 04:01:40 +01:00
Code Issues Projects Releases Wiki Activity
59,474 Commits 36 Branches 523 Tags
Commit Graph

11586 Commits

Author SHA1 Message Date
Dan Poltawski
82420bbb91 Merge branch 'w02_MDL-37184_m25_editenrol' of git://github.com/skodak/moodle 2013-01-16 10:19:57 +08:00
Eloy Lafuente (stronk7)
91d5e08aa3 Merge branch 'MDL-35775-master' of git://github.com/micaherne/moodle 2013-01-16 01:28:53 +01:00
Eloy Lafuente (stronk7)
a91350609e Merge branch 'wip-MDL-34344-m25' of git://github.com/samhemelryk/moodle 
Conflicts:
	lib/db/caches.php
 2013-01-16 01:08:26 +01:00
Eloy Lafuente (stronk7)
563bcc2322 Merge branch 'MDL-31726' of git://github.com/colchambers/moodle 2013-01-15 21:44:38 +01:00
Dan Poltawski
2773aa41de Merge branch 'MDL-30070-master' of git://github.com/FMCorz/moodle 2013-01-15 16:04:57 +08:00
Frederic Massart
d6731600c8 MDL-30070 message: Web Services for contact list 2013-01-15 16:04:00 +08:00
Dan Poltawski
d7738ce27c Merge branch 'MDL-36529' of git://github.com/colchambers/moodle 2013-01-15 14:55:18 +08:00
Dan Poltawski
864ff70c74 Merge branch 'MDL-36534' of git://github.com/timhunt/moodle 2013-01-15 14:44:28 +08:00
Dan Poltawski
27885779bc Merge branch 'MDL-36991-master' of git://github.com/sammarshallou/moodle 2013-01-15 13:06:10 +08:00
Dan Poltawski
01dcd9d770 Merge branch 'MDL-35793' of git://github.com/timhunt/moodle 2013-01-15 12:56:51 +08:00
Dan Poltawski
97f236e747 Merge branch 'MDL-32341-master' of git://github.com/ankitagarwal/moodle 2013-01-15 12:38:22 +08:00
Eloy Lafuente (stronk7)
fe25b31d44 Merge branch 'MDL-37456' of git://github.com/danpoltawski/moodle 2013-01-14 23:32:39 +01:00
Tim Hunt
5574862063 MDL-36534 question editing: clean up lang strings. 
There were a number of lang strings in suboptimal places.
This commit fixes that, and also removed some unused strings.

AMOS BEGIN
 MOV [addmorechoiceblanks,qtype_multichoice],[addmorechoiceblanks,question]
 MOV [youmustenteramultiplierhere,qtype_calculated],[youmustenteramultiplierhere,qtype_numerical]
AMOS END
 2013-01-14 14:52:49 +00:00
Dan Poltawski
ddaf0983b2 Merge branch 'wip-MDL-36297-m25' of git://github.com/samhemelryk/moodle 2013-01-14 15:05:15 +08:00
Ankit Agarwal
af5d990b59 MDL-32341 calendar: calendar custom date range export 
Adding support to export calendar events for a custom date range based on admin settings
 2013-01-14 10:15:09 +08:00
Petr Škoda
0aaea0d241 MDL-37184 refactor enrolment editing code to be shared by plugins 
AMOS BEGIN
 MOV [editenrolment,enrol_self],[editenrolment,core_enrol]
AMOS END
 2013-01-12 15:47:04 +01:00
Colin Chambers
5d5895f21a MDL-36529 Quiz: Shorten 'Settings for multiple tries' 2013-01-10 16:03:25 +00:00
Colin Chambers
086cced749 MDL-31726 Pre-fill question type combined feedback 2013-01-10 15:57:36 +00:00
Dan Poltawski
2008facf40 MDL-37456 - lang: remove unused zip strings 2013-01-10 15:55:54 +08:00
Rajesh Taneja
9309a8fe9a MDL-35873 Blocks: Made alt-text on block control icons more descriptive 2013-01-10 14:20:12 +08:00
Dan Poltawski
319d937602 Revert "Merge branch 'wip-MDL-31750-master' of git://github.com/abgreeve/moodle" 
This reverts commit 8361f557a117211a21e657b8ad6b8bec402fbf69,
2b9e957a274c037b222b8159dbc03b49d61b2e47 and
fae51910bf8d7e859f9dae807b9ca54089c5109e
 2013-01-10 11:17:33 +08:00
Eloy Lafuente (stronk7)
8361f557a1 Merge branch 'wip-MDL-31750-master' of git://github.com/abgreeve/moodle 
Conflicts:
	course/tests/courselib_test.php
 2013-01-09 01:31:50 +01:00
Eloy Lafuente (stronk7)
c68f339e5e Merge branch 'wip-MDL-37203-m25' of git://github.com/samhemelryk/moodle 2013-01-08 23:25:34 +01:00
Sam Hemelryk
3913743aa3 Merge branch 'MDL-35443-wip' of git://github.com/mouneyrac/moodle 2013-01-09 10:20:46 +13:00
Sam Hemelryk
21117c9d17 Merge branch 'wip-MDL-35891-master' of git://github.com/phalacee/moodle 2013-01-09 09:41:00 +13:00
Dan Poltawski
cfb209a538 Merge branch 'MDL-31641_drag_drop_help' of git://github.com/davosmith/moodle 2013-01-08 10:54:01 +08:00
Dan Poltawski
00079538b9 Merge branch 'MDL-36456-master' of git://github.com/FMCorz/moodle 2013-01-08 10:30:50 +08:00
Sam Hemelryk
be5a3168df MDL-21342 auth: tidy up pre-integration 2013-01-08 13:41:22 +13:00
Sam Hemelryk
70601b9433 Merge branch 'w51_MDL-21342_m25_lockout' of git://github.com/skodak/moodle 2013-01-08 10:56:39 +13:00
Eloy Lafuente (stronk7)
3cb7609bd6 Merge branch 'MDL-35792' of git://github.com/timhunt/moodle 2013-01-07 22:35:06 +01:00
Sam Hemelryk
007bfe8b4d MDL-25290 conversion: Converted config to use MUC 2013-01-07 19:22:40 +13:00
Petr Škoda
c4844bf45c MDL-21342 deprecate unused login functions 2013-01-04 15:17:14 +01:00
Petr Škoda
b28247fe90 MDL-21342 add user login lockout 2013-01-04 15:12:31 +01:00
Jason Fowler
864b7c0130 MDL-35056 - Backup - Removing Dependencies Unmet string from lang files 2013-01-03 10:55:13 +13:00
Sam Hemelryk
e85c56ccb8 MDL-36297 caching: added for HTML purified text 2013-01-03 10:55:00 +13:00
Ankit Agarwal
7bf99ee558 MDL-27884 Implement proper username validation during csv import 2013-01-02 14:09:13 +08:00
Tim Hunt
4125ded139 MDL-35793 question preview: config for the display options. 
The settings control the display options used when a user
first previews a question in the question bank. Once a
user has previewed some questions, these are stored as user
preferences.

It may not seem worth making this configurable, but acutally
it is important when training new users to get them started
off using the right opitions.
 2012-12-22 17:38:37 +00:00
Thanh Le
599cc731e3 MDL-35792 question preview: way to update options without restarting. 
It is useful, and possible, to update the display options without
restarting the question. You now only have to restart if you are
changing the maximum mark or the behaviour.
 2012-12-22 17:38:30 +00:00
Jason Fowler
d01176bfc9 MDL-35833 - Blocks - Adding alt and title attributes to the docked-block panel close button 2012-12-20 10:42:20 +08:00
Davo Smith
a8b418e82c MDL-31641 filemanager - display help message when drag and drop upload is not supported 2012-12-18 20:22:20 +00:00
Frederic Massart
1fefd1ff8d MDL-36456 repository: S3 handles errors in a nicer way 2012-12-14 17:55:56 +08:00
Sam Hemelryk
16ae43f243 Merge branch 'MDL-29805-master' of git://github.com/mouneyrac/moodle 2012-12-12 09:45:29 +13:00
Danny Wahl
9a8caba238 MDL-36991: Conditional activity restrictions should be displayed as list 2012-12-10 11:36:17 +00:00
Sam Hemelryk
fa9b53cdf8 Merge branch 'message_nav' of git://github.com/andyjdavis/moodle 2012-12-10 11:00:17 +13:00
Jerome Mouneyrac
e9e567f33c MDL-29805 add REQUIRE_CORRECT_ACCESS define + return error code when AJAX_SCRIPT fails 2012-12-04 11:47:19 +08:00
Jason Fowler
5bc4936954 MDL-35816 - File picker - Adding ALT attributes to the icons of the file picker 2012-12-03 14:00:05 +08:00
David Mudrák
30e2682756 MDL-36903 Pre-check the ZIP download before executing the mdeploy.php utility 
This patch makes Moodle call HTTP HEAD method via cURL to see if the ZIP
is expected to be downloadable by mdeploy.php. This is mainly intended
for SSL certificates check.
 2012-11-30 16:09:58 +01:00
David Mudrák
4785c45dd8 MDL-36903 Verify the SSL certificate of available updates provider 
From now on, Moodle verifies the available updates provider server. To
make it work, either there must be a valid CA certificate available in
the operating system, or the administrator has to upload the valid CA
certificate to moodledata/moodleorgca.crt (PEM format) file manually.
 2012-11-30 16:09:58 +01:00
Dan Poltawski
bd80fcc357 Merge branch 'wip-MDL-36859-m24' of git://github.com/samhemelryk/moodle 2012-11-28 09:56:59 +08:00
Sam Hemelryk
fd6ab92b1d Merge branch 'MDL-35997-wip1' of git://github.com/mouneyrac/moodle 
Conflicts:
	version.php
 2012-11-28 10:57:09 +13:00