diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-22 01:29:55 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-22 01:29:55 -0400 |
| commit | 8e29669b81f8df724bb77e2e2b6eff330a17cbec (patch) | |
| tree | 4c1aa63a36eeaadab00c61eb05f3f9f5ae0da095 /library/tinymce/examples/lists | |
| parent | be50cc03b8b997a3b073c3627f371bd16b82eaa5 (diff) | |
| parent | d81256d7b051d9a76b087feeb64ac79fb4aeff4d (diff) | |
| download | volse-hubzilla-8e29669b81f8df724bb77e2e2b6eff330a17cbec.tar.gz volse-hubzilla-8e29669b81f8df724bb77e2e2b6eff330a17cbec.tar.bz2 volse-hubzilla-8e29669b81f8df724bb77e2e2b6eff330a17cbec.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
support lowercase :-p smilie
work around doubled linefeeds in tinymce3.5b2
add icons to aside diabook, fixes in css
revert permissions relaxation on community
add comix-plain
smooth the comix comment box
make autocomplete work with updated tinymce
ika to ica
private file in repository
facepark is unsupported ATM
remove stray template variable from old code
add comix theme
use password field for DB input
added Vijay's theme from facepark.in
added README to mcefixes to explain what is going on.
update tinymce to 3.5b2 to fix issues with FF 11 and pasting into code blocks
more friend suggestions
* master:
Diffstat (limited to 'library/tinymce/examples/lists')
| -rw-r--r--[-rwxr-xr-x] | library/tinymce/examples/lists/image_list.js | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | library/tinymce/examples/lists/link_list.js | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | library/tinymce/examples/lists/media_list.js | 6 | ||||
| -rw-r--r--[-rwxr-xr-x] | library/tinymce/examples/lists/template_list.js | 0 |
4 files changed, 5 insertions, 1 deletions
diff --git a/library/tinymce/examples/lists/image_list.js b/library/tinymce/examples/lists/image_list.js index 7ba049a24..7ba049a24 100755..100644 --- a/library/tinymce/examples/lists/image_list.js +++ b/library/tinymce/examples/lists/image_list.js diff --git a/library/tinymce/examples/lists/link_list.js b/library/tinymce/examples/lists/link_list.js index 0d464331f..0d464331f 100755..100644 --- a/library/tinymce/examples/lists/link_list.js +++ b/library/tinymce/examples/lists/link_list.js diff --git a/library/tinymce/examples/lists/media_list.js b/library/tinymce/examples/lists/media_list.js index 3a3836cc5..2e049587c 100755..100644 --- a/library/tinymce/examples/lists/media_list.js +++ b/library/tinymce/examples/lists/media_list.js @@ -6,5 +6,9 @@ var tinyMCEMediaList = [ // Name, URL
["Some Flash", "media/sample.swf"],
["Some Quicktime", "media/sample.mov"],
- ["Some AVI", "media/sample.avi"]
+ ["Some AVI", "media/sample.avi"],
+ ["Some RealMedia", "media/sample.rm"],
+ ["Some Shockwave", "media/sample.dcr"],
+ ["Some Video", "media/sample.mp4"],
+ ["Some FLV", "media/sample.flv"]
];
\ No newline at end of file diff --git a/library/tinymce/examples/lists/template_list.js b/library/tinymce/examples/lists/template_list.js index e06d35788..e06d35788 100755..100644 --- a/library/tinymce/examples/lists/template_list.js +++ b/library/tinymce/examples/lists/template_list.js |