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

1197 commits

Author SHA1 Message Date
Sam Hemelryk
55fcb3504f Merge branch 'MDL-40770-master' of git://github.com/phalacee/moodle 2013-10-02 10:52:03 +13:00
Marina Glancy
3a3e3fa3b5 Merge branch 'MDL-41989-master' of git://github.com/phalacee/moodle 2013-10-01 14:45:14 +10:00
Marina Glancy
5c06e84ab2 Merge branch 'MDL-41912-master' of git://github.com/FMCorz/moodle 2013-10-01 14:21:50 +10:00
Damyon Wiese
900f571c3a MDL-41241 Atto: Fix merge conflict (add extra param to add_toolbar_button) 2013-10-01 11:58:15 +08:00
Sam Hemelryk
5101954f03 Merge branch 'MDL-41241-master' of git://github.com/damyon/moodle 
Conflicts:
	lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-debug.js
	lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-min.js
	lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button.js
	lib/editor/atto/plugins/link/yui/src/button/js/button.js
 2013-10-01 13:58:17 +13:00
Damyon Wiese
bb76233dd2 MDL-42026 Atto: Remove the styles from the headings menu + focus when opened 2013-09-27 15:55:46 +08:00
Jason Fowler
0c9070c0a3 MDL-41989 Atto - Improving usability for non-touch devices 2013-09-26 15:31:04 +08:00
Frederic Massart
a72a759303 MDL-41912 editor_atto: Padding for editable area 2013-09-26 12:10:29 +08:00
Marina Glancy
65a4f26d8a Revert "Merge branch 'MDL-41912-master' of git://github.com/damyon/moodle" 
This reverts commit 093a6fe77f, reversing
changes made to 88a4cb4734.
 2013-09-26 12:29:03 +10:00
Marina Glancy
093a6fe77f Merge branch 'MDL-41912-master' of git://github.com/damyon/moodle 
Conflicts:
	lib/editor/atto/styles.css
 2013-09-25 12:53:09 +10:00
Marina Glancy
d0b63cbde5 Merge branch 'MDL-41870-master' of git://github.com/damyon/moodle 2013-09-25 12:21:46 +10:00
Marina Glancy
e26e4b8a7b Merge branch 'MDL-41713-master' of git://github.com/phalacee/moodle 
Conflicts:
	lib/editor/atto/styles.css
 2013-09-25 12:21:37 +10:00
Eloy Lafuente (stronk7)
161f995849 Merge branch 'w39_MDL-41437_m26_mia' of https://github.com/skodak/moodle 
Conflicts:
	admin/auth.php
	lib/db/upgrade.php
	version.php
 2013-09-24 20:18:03 +02:00
Sam Hemelryk
96218d0edb Merge branch 'MDL-41716-master' of git://github.com/phalacee/moodle 2013-09-24 09:37:10 +12:00
Petr Škoda
bde002b81a MDL-41437 rework plugin_manager caching and version info in blocks and modules 
This patch includes:

* version column removed from modules table, now using standard config, this allows decimal version for modules
* version column removed from block table, now using standard config, this allows decimal version for blocks
* module version.php can safely use $plugins instead of module
* new plugin_manager bulk caching, this should help with MUC performance when logged in as admin
* all missing plugins are now in plugin overview (previously only blocks and modules)
* simplified code and improved coding style
* reworked plugin_manager unit tests - now using real plugins instead of mocks
* unit tests now fail if any plugin does not contain proper version.php file
* allow uninstall of deleted filters
 2013-09-22 21:25:26 +02:00
Damyon Wiese
2bc4212209 MDL-41912 atto: Add a little padding to the editor content area 2013-09-20 15:47:01 +08:00
Damyon Wiese
5d2d0e12d5 MDL-41241 atto: Add a checkbox for open in new window to links 2013-09-20 15:23:02 +08:00
Damyon Wiese
db1f37a411 MDL-41241 atto: YUIDoc cleanup for link plugin. 2013-09-20 15:22:50 +08:00
Damyon Wiese
6f9cf841c9 MDL-41870 atto: keyboard navigation for toolbar (arrows) 2013-09-20 14:59:20 +08:00
Jason Fowler
36973d707e MDL-41713 atto - implement new icons with matching UI 2013-09-20 14:20:05 +08:00
Jason Fowler
ae5af113d0 MDL-40770 TinyMCE - Final Icon implementation 2013-09-17 15:06:32 +08:00
Barbara Ramiro
845ae64913 MDL-41385 usability: new non-default icons for TinyMCE in svg and png formats 
Conflicts:

	lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/delete.png
	lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/delete.svg
	lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/spellcheck.png
	lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/table.png
	lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/table.svg
 2013-09-17 09:36:06 +08:00
Jason Fowler
d76a36dd05 MDL-40770 TinyMCE - Implementing new icons 2013-09-17 09:31:14 +08:00
Barbara Ramiro
bb18d12d38 MDL-40769 usability: last bit of icons for TinyMCE in svg and png formats 2013-09-17 09:30:26 +08:00
Jason Fowler
d461eb2296 MDL-40770 TinyMCE - Further changes to implement new icons 2013-09-17 09:30:26 +08:00
Barbara Ramiro
9d6c1849c6 MDL-40769 usability: additional icons for TinyMCE in svg and png formats 2013-09-17 09:30:25 +08:00
Jason Fowler
efba9f9c0c MDL-40770 TinyMCE - Implement new icons 2013-09-17 09:30:25 +08:00
Barbara Ramiro
f0b7b95522 MDL-40769 usability: new icons for TinyMCE in svg and png formats 2013-09-17 09:30:25 +08:00
Jason Fowler
9cc23e2692 MDL-41716 atto - Fix resizing inconsistencies between editor modes 2013-09-16 12:52:04 +08:00
Sam Hemelryk
cf13da65e1 Merge branch 'MDL-36316-master' of git://github.com/danpoltawski/moodle 2013-09-16 13:13:41 +12:00
Dan Poltawski
378b3eac83 MDL-36316 useragent: Reduce user agent sniffing 
* core_useragent: Introduce is_vendor methods to improve readability
  when we are just detecting if a browser is from a vendor, rather than
  the exact version

* Remove uncessary browser version checks when we are just detecting
  vendors - this makes the intention of our sniffing clearer.

* Remove sniffing for browsers which we do not support, grades/ajax/tinymce
  all support modern browsers so there is no need to sniff for them.
 2013-09-13 14:25:37 +08:00
Jason Fowler
c1f10ffb24 MDL-41238 atto - fixing autoclose of style menu for firefox 2013-09-12 13:28:18 +08:00
Sam Hemelryk
087bc6ba67 Merge branch 'MDL-41238-master' of git://github.com/phalacee/moodle 2013-09-11 09:28:42 +12:00
Sam Hemelryk
e0a8b60f5d Merge branch 'MDL-41236-master' of git://github.com/phalacee/moodle 2013-09-11 08:36:54 +12:00
Damyon Wiese
a01914128d MDL-41237 Atto: Add missing js method docs. 2013-09-10 14:30:02 +08:00
Jason Fowler
2b6361305d MDL-41237 Atto - Adjusting the text styles for the editor 2013-09-10 14:30:02 +08:00
Dan Poltawski
3b46f8dfe1 MDL-41235 fix whitespace 2013-09-10 14:26:53 +08:00
Jason Fowler
37b16441b8 MDL-41235 atto - Matching the width of the html view to the wysiwyg view 2013-09-10 14:13:14 +08:00
Jason Fowler
21f6c5292b MDL-41238 atto - close menu style when clicking anywhere outside it 2013-09-06 14:46:45 +08:00
Jason Fowler
f477b698ab MDL-41236 atto - Improving visibility of disabled buttons and making atto match the file manager 2013-09-04 07:52:55 +08:00
Andrew Nicols
ff73a6d1fb MDL-41328 Editor: Work around another iOS issue with TinyMCE 
We apply this only on touchend and not touchstart or touchmove. The
location is not guaranteed until the end of the gesture, and there's no
need to keep applying focus on every move.
 2013-09-02 09:41:27 +08:00
Damyon Wiese
4a5a5f6902 ie9 svg compatibility fixes 2013-08-30 09:29:10 +08:00
Damyon Wiese
c492d41f3b MDL-41098 atto: Enable atto text editor on upgrade 
TinyMCE is still the default.
 2013-08-27 21:36:21 +08:00
Damyon Wiese
ceaef9a9cc MDL-41098 atto: Fix min-height on firefox. 2013-08-27 21:09:32 +08:00
Damyon Wiese
cbd91e23e9 Merge branch 'wip-MDL-40931-m26' of git://github.com/samhemelryk/moodle 
Conflicts:
	version.php
 2013-08-27 15:29:49 +08:00
Damyon Wiese
4fd8adab75 MDL-41098 atto: Fix for dialogue ignoring centered option. 2013-08-27 10:40:31 +08:00
Damyon Wiese
08a95d50bb MDL-41098 atto: Force some styles on the editor 
Bootstrap is overriding random styles on the contenteditable div like:
line-height, font-size and color. Silly - force them to be the same as the
textarea we are derived from.
 2013-08-27 10:40:24 +08:00
Damyon Wiese
c90641facb MDL-41098 Atto Text editor: Add new text editor to core 
This is an alternative to the TinyMCE text editor that is based on HTML5
content editable regions.

It has been designed to "gel" with Moodle and uses YUI for javascript,
Moodle standard dialogs and standard moodle buttons. It has also been designed
to work well on mobile devices and can collapse down to a narrow column if required.

Imported from the plugins database here:
https://moodle.org/plugins/view.php?plugin=editor_contenteditable

Original git repository here:
https://github.com/damyon/contenteditable
 2013-08-26 22:16:43 +08:00
Sam Hemelryk
c3d2fbf9cd MDL-40931 useragent: separated user agent functionality into a lib 
This commit moves user agent related functionality out of several
core libraries and combines it into a more manageable class.
All core uses are converted and functions deprecated in favor
of the new class.
 2013-08-26 13:59:19 +12:00
Damyon Wiese
3cb75dd1fb MDL-36803 tinymce: Version bump for js changes 2013-08-26 09:29:06 +08:00