moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-11 03:46:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
73684 commits 37 branches 544 tags 1.3 GiB
Commit graph

20227 commits

Author SHA1 Message Date
Eric Merrill
9029ce75eb MDL-49693 atto: Clean textarea contents before inserting into editor 2015-03-27 12:27:00 -04:00
Eric Merrill
8e202bd80a MDL-49686 atto: Process style and class attributes in sub-functions 
To ensure we only clean style and classes, first we select the inside
of those attributes and "replace" them with handler functions. Those
functions scan the actual attribute values for class or styles that
we want to exclude.

The first level regex has 3 groups. group1 selects everything in the
tag leading up to the attribute values, group2 has the attributes,
group3 has the trailing quote mark. We work on group2 then return
the combination of group1, group2, and group3.
 2015-03-27 11:36:05 -04:00
Juan Leyva
449a6304d4 MDL-49502 forum: Add the new function to the mobile service 2015-03-27 11:33:34 +01:00
Eric Merrill
73e144334b MDL-49671 atto: Any pastes that don't have html should clean everything 
Browsers may not provide html content in the clipboard object event
though it will really be pasted as such. This includes Firefox on
Windows, Internet Explorer, and some niche cases in Safari.

Because of this, we need to scrub the entire editor anytime we can't
intercept a paste event.

In some magical day in the future when there is better cross browser
support, we can undo this.
 2015-03-26 23:31:05 -04:00
Eric Merrill
1b6ce030d3 MDL-49564 atto: Improve empty span removal 
Paste from MS word, followed by cleaning, may leave many many unused
spans. Try to remove them.
 2015-03-26 23:05:23 -04:00
Juan Leyva
c4f7bf29b2 MDL-49453 webservices: Added the new WS to the mobile service 2015-03-26 16:46:39 +01:00
Juan Leyva
e77a0f368f MDL-49203 webservices: Coding style fixes, ws added to the app service 2015-03-26 15:57:58 +01:00
Costantino Cito
be9854162f MDL-49203 webservices: New WS core_comment_get_comments 2015-03-26 15:57:21 +01:00
David Mudrák
a69ba70ddc MDL-49643 navigation: Fix API for extending navigation in local plugins 2015-03-26 12:17:15 +01:00
David Mudrák
4ad70aede0 MDL-49661 pluginfo: Do not consider missing version.php as correct 
All plugins are required to contain valid version.php since Moodle 2.5.
It's time to get rid of this TODO.
 2015-03-26 12:16:20 +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
Dave Cooper
b1c5888daf MDL-49520 libraries: Update password_compat library 2015-03-26 10:05:00 +08:00
Eric Merrill
665829ec2a MDL-47002 atto: Prevent removal of Rangy spans 2015-03-25 10:02:43 -04:00
Jordi Pujol Ahulló
d5f596589b MDL-49641 repository_dropbox: preventing poor performance. 
emptied sort default value at get_external_files to prevent poor performance.
 2015-03-25 08:00:27 +01: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
Dave Cooper
657b12788d MDL-49518 libraries: Update lessphp to 1.7.0.3 2015-03-24 11:01:13 +08: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
Adrian Greeve
ecca6b031a MDL-49522 lib: Upgrade TCPDF to 6.2.6 2015-03-23 09:21:24 +08: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
Andrew Nicols
5d70615157 MDL-49598 files: getimagesize -> getimagesizefromstring 2015-03-20 10:16:36 +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