100 Commits

Author SHA1 Message Date
John Okely
7eb50b3290 MDL-42834 admin: Remove wwwroot if used with moodle_url 2017-10-23 12:25:36 +08:00
John Okely
672f483670 MDL-42834 admin: Removal of httpswwwroot 2017-10-23 12:25:36 +08:00
Adrian Greeve
40a154551f MDL-48371 editors: Option for removing managefiles
We want to remove the managefiles button from the
editors in the wiki so that students don't delete
each others files.
2015-09-07 09:59:35 +01:00
Damyon Wiese
2112dd44e8 MDL-49578 TinyMCE: Update to 3.5.11 2015-03-31 19:38:53 +01:00
Damyon Wiese
6363588b72 MDL-43312 TinyMCE: Version bump to 3.5.10. Remove all the hacks.
I retested the old bugs that required custom hacks to tinymce and could not reproduce them,
so I have not reimplemented the hacks.
2014-05-07 12:54:43 +08:00
Sam Hemelryk
55fcb3504f Merge branch 'MDL-40770-master' of git://github.com/phalacee/moodle 2013-10-02 10:52:03 +13:00
Jason Fowler
efba9f9c0c MDL-40770 TinyMCE - Implement new icons 2013-09-17 09:30:25 +08: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
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
9ead041cdb Revert "MDL-40931 useragent: separated user agent functionality into a lib"
This reverts commit af62237d0e6e27df868d50848f7098f57c103f86.
This reverts commit 87a4194fdcd322d4aee5a6207b55a8da0864da94.
This reverts commit b2c66eb60c01805f26cc791966f05be52af7b406.

Conflicts:

	version.php
2013-08-22 13:31:25 +08:00
Damyon Wiese
89959d9ad1 Merge branch 'wip-MDL-40931-m26' of git://github.com/samhemelryk/moodle 2013-08-20 16:45:33 +08:00
Dan Poltawski
6f44a73369 Merge branch 'w33_MDL-39474_m26_debugdeveloper' of https://github.com/skodak/moodle
Conflicts:
	lib/upgrade.txt
2013-08-20 11:42:03 +08:00
Sam Hemelryk
af62237d0e 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-16 09:02:01 +12:00
Damyon Wiese
0c0dfa8fbd MDL-40668 tinymce: Remove collapsable editor options
We have an alternative (pdw toolbars)
Also, allow tinymce to be collapsed down to a single row.
2013-08-13 10:54:36 +08:00
Petr Škoda
96f81ea385 MDL-39474 introduce $CFG->debugdeveloper and cleanup $CFG init 2013-08-12 13:01:47 +02:00
Damyon Wiese
b9bca41b53 MDL-23646: Tinymce wrap plugin fixes.
Added info to upgrade.txt
Removed wrap plugins from the tinymce plugin list.
Fix trailing comma in wrap plugin javascript.
Removed non functioning "!" handling.
Fixed icons for wrap plugin.
2013-07-09 13:22:33 +08:00
Damyon Wiese
05e9c136e6 MDL-23646 tinymce: Add plugin to wrap toolbar on small screens 2013-07-09 13:22:33 +08:00
Petr Škoda
299e107e97 MDL-39854 use class loader in editor_tinymce 2013-06-18 09:10:17 +02:00
Petr Škoda
9a1c818d28 MDL-39141 fix customtoolbar notices during upgrade 2013-04-18 20:22:01 +02:00
Petr Škoda
d0bf51e2b3 MDL-38329 use proper plugin name for the webkit lists workaround
Credit goes to Mauno Korpelainen, thanks.
2013-03-17 20:59:11 +01:00
Sam Hemelryk
dff72cde30 Merge branch 'MDL-32750' of git://github.com/colchambers/moodle 2013-01-28 11:57:17 +13:00
Colin Chambers
2a22be64ee MDL-32750 Question: make the html editor tools collapsible 2013-01-25 11:17:41 +00:00
Petr Škoda
1764cd8e6f MDL-37593 use https for editor script if required 2013-01-21 09:40:15 +01:00
Eloy Lafuente (stronk7)
cf78070a63 Merge branch 'w51_MDL-37186_m25_tinymceconfig' of git://github.com/skodak/moodle 2013-01-08 10:34:04 +01:00
Petr Škoda
d10f3e9fef MDL-37282 import TinyMCE 3.5.8 2012-12-22 16:24:20 +01:00
Petr Škoda
23ac6ef6c5 MDL-37186 add the ultimate TinyMCE custom parameter setting 2012-12-20 22:24:15 +01:00
Petr Škoda
9e2d7f560d MDL-35771 patch tinymce to use lower zindexes
The reason is that YUI does not like that bing zIndexes when dragging panels. We should probably try to find the reason why YUI dragging fails and report it upstream.
2012-10-24 22:45:23 +08:00
Petr Škoda
83828a7725 MDL-35955 use built in spell checker if tinymce spelling plugin disabled 2012-10-13 09:49:58 +02:00
Petr Škoda
dbafb80490 MDL-35561 import latest TinyMCE 3.5.7
The previous version 3.5.6 was incorrectly stored as 3.6.0, sorry.
2012-09-21 11:34:33 +02:00
Petr Škoda
79df150a62 MDL-35318 use new lang revision to invalidate TinyMCE lang caches 2012-09-09 12:18:32 +02:00
Petr Škoda
29149f981c MDL-35289 use unmodified TinyMCE 2012-09-09 11:57:25 +02:00
Petr Škoda
717a993122 MDL-35172 fix handling of more than 10 tinymce toolbars 2012-09-05 08:23:36 +02:00
Petr Škoda
c64f13178a MDL-35172 rework editor toolbar setting 2012-08-31 22:52:45 +02:00
Petr Škoda
71c3b0479a MDL-34955 fix use of uninitialised disabledsubplugins setting
Thanks Eloy Lafuente for spotting it!
2012-08-28 18:57:19 +02:00
Petr Škoda
b3aefe3cc8 MDL-34990 improve custom toolbar setting parsing
It is probably better to parse the setting every time because somebody may put unsupported values directly into config.php, performance should not be an issue because we do not have editors on every page.
2012-08-24 16:11:00 +02:00
Petr Škoda
0b7858221c MDL-34955 add full TinyMCE subplugin management 2012-08-24 16:11:00 +02:00
Petr Škoda
caaccae5da MDL-34878 add custom TinyMCE toolbar setting 2012-08-24 16:10:59 +02:00
Petr Škoda
de6a651299 MDL-33041 cleanup the rest of tinymce plugin 2012-08-11 16:19:37 +02:00
Petr Škoda
e4907cab85 MDL-33041 add base TinyMCE and moodle plugin urls
We should never use ../../../.. to reference core TinyMCE or moodle TinyMCE plugins, this crate problems if we ever decide to create improved loaders.
2012-08-11 15:57:38 +02:00
Petr Škoda
a3f1cd0318 MDL-33041 import TinyMCE 3.6.0
This contains only string handling changes - finally!
2012-08-11 15:57:37 +02:00
Petr Škoda
fb7bcc1396 MDL-33041 fork advimage plugin
We need to minimise TinyMCE tweaks, the advimage hacking was too big to maintain it during upstream imports, sorry.
2012-08-11 15:56:58 +02:00
sam marshall
9b63a155fe MDL-33041 (5) TinyMCE: Move spellchecker plugin as well 2012-08-10 14:57:59 +02:00
sam marshall
204903363f MDL-33041 (4) Use new system for existing added TinyMCE plugins
AMOS BEGIN
  MOV [dragmath:dragmath_desc,editor_tinymce],[dragmath_desc,tinymce_dragmath]
  MOV [dragmath:dragmath_javaneeded,editor_tinymce],[dragmath_javaneeded,tinymce_dragmath]
  MOV [dragmath:dragmath_title,editor_tinymce],[dragmath_title,tinymce_dragmath]
  MOV [moodleemoticon:desc,editor_tinymce],[desc,tinymce_moodleemoticon]
  MOV [moodlenolink:desc,editor_tinymce],[desc,tinymce_moodlenolink]
  CPY [desc,tinymce_moodleemoticon],[pluginname,tinymce_moodleemoticon]
  CPY [desc,tinymce_moodlenolink],[pluginname,tinymce_moodlenolink]
AMOS END
2012-08-10 14:57:59 +02:00
sam marshall
fae911708e MDL-33041 (3) TinyMCE: Support custom plugins 2012-08-10 14:57:58 +02:00
sam marshall
1702fb6dda MDL-33041 (2) Tidy up tinymce lib.php before starting real changes 2012-08-10 14:57:58 +02:00
Dan Poltawski
87dd647f04 Merge branch 'wip-MDL-34465-master' of git://github.com/abgreeve/moodle 2012-07-30 15:23:27 +08:00
Petr Škoda
4b8d031a4e MDL-34616 fix editor resizing regression 2012-07-29 14:48:23 +02:00
Adrian Greeve
b0c6dc1cac MDL-34465 - lib - Replacing get_context_instance with context_XXXX::instance (group 8) 2012-07-27 10:10:46 +08:00
Dan Poltawski
b7db7803bc Merge branch 'w30_MDL-34299_m24_html5' of git://github.com/skodak/moodle
Conflicts:
	lib/db/upgrade.php
	version.php
2012-07-24 14:07:26 +08:00
Luke Tucker
8bc4a6528f MDL-34396 Ensure TinyMCE editor spell checking works on pages with $PAGE->https_required() 2012-07-21 20:29:20 +02:00