mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-07 01:10:02 +01:00
Code Issues Projects Releases Wiki Activity
54,960 Commits 36 Branches 523 Tags
Commit Graph

11320 Commits

Author SHA1 Message Date
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
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
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
Dan Poltawski
c851b734a8 MDL-32286 - fix ambigious english string 2012-06-16 23:23:16 +08: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
Dan Poltawski
4585e6ac98 Merge branch 'wip-MDL-33550-master' of git://github.com/marinaglancy/moodle 2012-06-14 16:23:08 +08:00
Andrew Davis
8ac95c279c MDL-27156 repository: Added a new capability so that select users can bypass file size restrictions 2012-06-14 09:19:25 +07:00
Marina Glancy
0b2bfbd1c6 MDL-33550 Correctly process situation when file reference source is missing 
- do not die with fatal error if source file in moodle internal repository is missing;
- moved code duplication for moodle repositories into class repository (functions send_file, get_reference_details, get_file_by_reference, get_file_reference);
- update file status after repository::sync_external_file so we know that it is missing (or not missing anymore). Do not run this function more than once for file within one request;
- display readable name for Private Files and Server files with the new format;
- display broken icon in filemanager if we know that source is missing, display information (for admin) where it was located before: see repository::get_reference_details() and extending classes;
- removed unnecessary queries in stored_file::sync_external_file();
- syncronize files before displaying it's size in mod_resource, do not query  directly
 2012-06-13 12:11:06 +08:00
Dan Poltawski
8e9e62fd8e Merge branch 'MDL-29103' of git://github.com/mouneyrac/moodle 2012-06-05 12:42:30 +08:00
Helen Foster
3c97ce2461 MDL-31803 lang - make the mooch registration message more descriptive 2012-06-05 09:09:52 +08:00
Dan Poltawski
b3245b758c Merge branch 'MD-31803' of git://github.com/mouneyrac/moodle 
Conflicts:
	admin/index.php
	admin/renderer.php
	version.php
 2012-06-04 19:25:58 +08:00
Eloy Lafuente (stronk7)
a301675101 Merge branch 'w23_MDL-33007_m23_buggyiconv' of git://github.com/skodak/moodle 2012-06-04 11:33:47 +02:00
Dan Poltawski
1cf840074b Merge branch 'wip-MDL-33218-master' of git://github.com/barbararamiro/moodle 2012-06-04 17:13:35 +08:00
Petr Skoda
0aff15c2c9 MDL-33007 add workaround for broken iconv //IGNORE 
This patch adds mbstring utf-8 cleanup fallback and admin warning if no utf-8 cleanup possible in user submitted data.
 2012-06-01 12:23:09 +02:00
Koen Roggemans
61935d8ed0 MDL-29103 web service strings improvement 2012-06-01 11:36:37 +08:00
Aparup Banerjee
1adb060a87 Merge branch 'MDL-32329-all-plugins-ok' of git://github.com/mudrd8mz/moodle 2012-05-30 16:48:23 +08:00
David Mudrak
39f15cc712 MDL-32329 check for plugin dependencies during the pre-install checking 
This follows the same path as we have in CLI installers. Plugin
dependencies are checked right after the environment checks and the
install can't continue unless all dependencies are fixed.
 2012-05-30 10:35:28 +02:00
David Mudrak
f1753a5b10 MDL-32329 CLI install and upgrade scripts display plugins with unsatisfied dependencies 2012-05-30 10:35:28 +02:00
Aparup Banerjee
e4b5455738 Merge branch 'MDL-33184-master' of https://github.com/FMCorz/moodle 2012-05-30 15:18:59 +08:00