mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-09 02:12:22 +02:00
Code Issues Projects Releases Wiki Activity
72,763 Commits 36 Branches 530 Tags
Commit Graph

19911 Commits

Author SHA1 Message Date
Juan Leyva
c4f7bf29b2 MDL-49453 webservices: Added the new WS to the mobile service 2015-03-26 16:46:39 +01:00
David Monllao
cfb32192d6 MDL-47002 editor_atto: Remove all after html when pasting 2015-03-26 16:15:29 +08:00
David Monllao
d784f5edc3 MDL-47002 editor_atto: Clean the comments separately 2015-03-26 14:37:55 +08:00
Eric Merrill
665829ec2a MDL-47002 atto: Prevent removal of Rangy spans 2015-03-25 10:02:43 -04:00
David Monllao
67b853ff6b MDL-45619 repository: Don't allow repository_recent to be uninstalled 
We have tests that depends on it and it
is a simple repo that can just be disabled.
 2015-03-25 09:39:12 +08:00
David Monllao
1c78065ad6 Merge branch 'MDL_45619_m29v5' of git://github.com/sbourget/moodle 2015-03-25 09:38:24 +08:00
Eloy Lafuente (stronk7)
89267d6a51 Merge branch 'MDL-49543' of https://github.com/totara/openbadges 2015-03-25 01:32:34 +01:00
Dan Poltawski
91062d4ceb Merge branch 'MDL-49070_scheduled' of https://github.com/andyjdavis/moodle 2015-03-24 13:33:38 +00:00
Dan Poltawski
9569976f86 Merge branch 'MDL-48969_m29v9' of https://github.com/sbourget/moodle 2015-03-24 11:48:44 +00:00
Dan Poltawski
bd65120bff Merge branch 'wip_MDL-49631_29_utfregex' of https://github.com/skodak/moodle 2015-03-24 11:10:19 +00:00
Dan Poltawski
db8a3b2eb9 Merge branch 'MDL-46746-master' of git://github.com/merrill-oakland/moodle 
Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
 2015-03-24 11:04:04 +00:00
Dan Poltawski
44a7e27b7b Merge branch 'MDL-49565-master' of git://github.com/merrill-oakland/moodle 2015-03-24 09:57:12 +00:00
David Monllao
6f27fbb435 Merge branch 'MDL-49337-master' of git://github.com/jleyva/moodle 
Conflicts:
	lib/db/services.php
 2015-03-24 17:55:42 +08:00
Juan Leyva
a090259eaa MDL-49337 webservices: Include the new WS in the mobile app service 2015-03-24 10:46:36 +01:00
David Monllao
636c609b24 Merge branch 'MDL-49444-master' of git://github.com/jleyva/moodle 2015-03-24 17:43:29 +08:00
Juan Leyva
25c49a85ff MDL-49444 webservices: Added new function to the mobile service 2015-03-24 09:50:03 +01:00
David Monllao
b6f7863e77 Merge branch 'MDL-47003-master' of git://github.com/merrill-oakland/moodle 2015-03-24 10:17:28 +08:00
Eloy Lafuente (stronk7)
20e955a18e Merge branch 'MDL-43770-master' of https://github.com/lucisgit/moodle 2015-03-24 01:38:15 +01:00
Yuliya Bozhko
fffeb03fe7 MDL-49543 badges: Add decription format and backup/restore 
Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
 2015-03-24 09:22:47 +13:00
Dan Poltawski
68d52a732f Merge branch 'master_MDL-48419' of https://github.com/danmarsden/moodle 2015-03-23 11:15:55 +00:00
David Monllao
f1d498a62a MDL-48456 course: Using default max int value 2015-03-23 15:16:18 +08:00
David Monllao
ae9ed08f53 Merge branch 'MDL-48456-master' of git://github.com/dkns/moodle 2015-03-23 15:14:58 +08:00
David Monllao
2572356895 Merge branch 'MDL-47002-master' of git://github.com/merrill-oakland/moodle 2015-03-23 14:59:05 +08:00
Petr Skoda
e737c2ff89 MDL-49631 fix incorrect whitespace remplacements 2015-03-23 17:40:15 +13:00
Yuliya
0b6ba27a04 MDL-49543 badges: Fix format_text and description layout 
Signed-off-by: Yuliya <yuliya.bozhko@gmail.com>
 2015-03-23 09:43:12 +13:00
Yuliya Bozhko
3784d3be98 MDL-49543 badges: Add description to the badge criteria 
Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
 2015-03-23 08:47:49 +13:00
Daniel Kosinski
551e64ccb9 MDL-48456 course: Increase timeout when deleting all courses in category 2015-03-22 16:21:51 +01:00
Andrew Davis
24aac597c5 MDL-49070 core_registration: removed now unused config setting 2015-03-20 20:50:48 +08:00
Tony Butler
2f29dd628f MDL-43770 core_behat: Pass additional params to enrol_user generator 
Include timestart, timeend and status.
 2015-03-20 09:55:16 +00:00
Andrew Davis
f47e4eb4a0 MDL-49070 core_registration: improved site registration scheduled task 2015-03-20 14:22:39 +08:00
Stephen Bourget
d6383f6afe MDL-48969 Block: Implement a high scores block 
AMOS BEGIN
CPY [bestgrade,block_quiz_results],[bestgrade,block_activity_results]
CPY [bestgrades,block_quiz_results],[bestgrades,block_activity_results]
CPY
[bestgroupgrade,block_quiz_results],[bestgroupgrade,block_activity_resul
ts]
CPY
[bestgroupgrades,block_quiz_results],[bestgroupgrades,block_activity_res
ults]
CPY
[config_format_absolute,block_quiz_results],[config_format_absolute,bloc
k_activity_results]
CPY
[config_format_fraction,block_quiz_results],[config_format_fraction,bloc
k_activity_results]
CPY
[config_format_percentage,block_quiz_results],[config_format_percentage,
block_activity_results]
CPY
[config_grade_format,block_quiz_results],[config_grade_format,block_acti
vity_results]
CPY
[config_name_format,block_quiz_results],[config_name_format,block_activi
ty_results]
CPY
[config_names_anon,block_quiz_results],[config_names_anon,block_activity
_results]
CPY
[config_names_full,block_quiz_results],[config_names_full,block_activity
_results]
CPY
[config_names_id,block_quiz_results],[config_names_id,block_activity_res
ults]
CPY
[config_show_best,block_quiz_results],[config_show_best,block_activity_r
esults]
CPY
[config_show_worst,block_quiz_results],[config_show_worst,block_activity
_results]
CPY
[configuredtoshownothing,block_quiz_results],[configuredtoshownothing,bl
ock_activity_results]
CPY
[config_use_groups,block_quiz_results],[config_use_groups,block_activity
_results]
CPY
[error_nogroupsexist,block_quiz_results],[error_nogroupsexist,block_acti
vity_results]
CPY [worstgrade,block_quiz_results],[worstgrade,block_activity_results]
CPY
[worstgrades,block_quiz_results],[worstgrades,block_activity_results]
CPY
[worstgroupgrade,block_quiz_results],[worstgroupgrade,block_activity_res
ults]
CPY
[worstgroupgrades,block_quiz_results],[worstgroupgrades,block_activity_r
esults]
AMOS END
 2015-03-19 19:46:02 -04:00
Eric Merrill
6ea68e233a MDL-49565 atto: Allow html comments in editor code 2015-03-18 12:28:02 -04:00
Eric Merrill
df7a9fd4ba MDL-46746 atto: Remove unnecessary filtering of unicode characters 2015-03-18 12:04:31 -04:00
Eric Merrill
3ef9636190 MDL-47003 atto: Make code cleanup more targeted 
Apply different, stricter, code cleanup when we receive HTML (WYSIWYG)
paste events, but be more lax the rest of the time.

Also, update the regexes to be more targeted for specific code patterns
pasted from office packages.
 2015-03-18 11:44:11 -04:00
Eric Merrill
a7fdadc94c MDL-47002 atto: Improve paste behaviour to ensure propper cleanup 
Old code failed to clean the editor div which resulted in
undesirable code being being left in the div for editing. To properly
handel incoming code, we should try to intercept and clean before the
paste, or clean the entire editable div.
 2015-03-18 09:27:44 -04:00
Dan Marsden
552281e461 MDL-48419 mod_scorm: Check net script too agressive 
in some cases high latency and network issues result in longer
than 2 sec responses from a server, increase this to avoid
excessive warnings.
 2015-03-18 20:06:39 +13:00
Eloy Lafuente (stronk7)
536cf8c298 Merge branch 'MDL-49361-master-stringman' of git://github.com/mudrd8mz/moodle 2015-03-17 12:00:29 +01:00
Dan Poltawski
1fbc0e5f43 Merge branch 'MDL-49371_master' of git://github.com/dmonllao/moodle 2015-03-17 09:06:59 +00:00
Eloy Lafuente (stronk7)
e201bf16a0 Merge branch 'MDL-49389' of git://github.com/timhunt/moodle 2015-03-17 00:28:31 +01:00
Andrew Nicols
1f50bbf184 MDL-49381 message: Remove old useridfrom indexes 2015-03-17 00:26:20 +01:00
Mike Grant
d0c2bc6466 MDL-49276 config-dist: Removed legacy config options 
Both $CFG->logsql and $CFG->dblogerror had no use in moodle core
since ages ago (just the former had one use for nothing). Good time
to get rid of both as they are 100% misleading.
 2015-03-16 23:39:41 +01:00
Dan Poltawski
f4e1913530 Merge branch 'MDL-49152-master' of git://github.com/damyon/moodle 2015-03-16 14:26:15 +00:00
Dan Poltawski
3bec364f35 Merge branch 'MDL-49442-master' of git://github.com/jethac/moodle 2015-03-16 13:31:07 +00:00
Dan Poltawski
e4d0db1769 Merge branch 'MDL-49163-master' of git://github.com/damyon/moodle 2015-03-16 11:01:18 +00:00
Dan Poltawski
6a24f0a796 Merge branch 'MDL-45725-master' of https://github.com/lucisgit/moodle 2015-03-16 10:52:02 +00:00
Tony Butler
60ec267b0b MDL-45725 core_lib: Add unit test for persistent flexible tables 2015-03-16 10:41:11 +00:00
Tony Butler
f5ba1b93a2 MDL-45725 core_lib: Save user preferences for flexible tables 2015-03-16 10:41:11 +00:00
David Monllao
7035377b58 Merge branch 'MDL-49445' of git://github.com/timhunt/moodle 2015-03-16 15:38:02 +08:00
Damyon Wiese
9bdcf57951 MDL-49152 output: Templates for renderers (JS and PHP) 
Mustache support for rendering templates from either php or js.
 2015-03-14 22:48:40 +08:00
Tim Hunt
ca0ceacd27 MDL-49446 behat: should_not_be_visible steps were not working 
I fixed all similar problems in this class, even ones where it did
actually work becuase the two exceptions were of different types.
This pattern seems to have been copied and pasted a lot in this class,
and I am sure that will happen again, so I did not want to leave any
dangerous potential examples around.
 2015-03-13 14:28:47 +00:00