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/media | |
| 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/media')
| -rw-r--r--[-rwxr-xr-x] | library/tinymce/examples/media/logo.jpg | bin | 2729 -> 2729 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | library/tinymce/examples/media/logo_over.jpg | bin | 6473 -> 6473 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | library/tinymce/examples/media/sample.avi | bin | 82944 -> 82944 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | library/tinymce/examples/media/sample.dcr | bin | 6774 -> 6774 bytes | |||
| -rw-r--r-- | library/tinymce/examples/media/sample.flv | bin | 0 -> 88722 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | library/tinymce/examples/media/sample.mov | bin | 55622 -> 55622 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | library/tinymce/examples/media/sample.ram | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | library/tinymce/examples/media/sample.rm | bin | 17846 -> 17846 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | library/tinymce/examples/media/sample.swf | bin | 6118 -> 6118 bytes |
9 files changed, 0 insertions, 0 deletions
diff --git a/library/tinymce/examples/media/logo.jpg b/library/tinymce/examples/media/logo.jpg Binary files differindex ad535d671..ad535d671 100755..100644 --- a/library/tinymce/examples/media/logo.jpg +++ b/library/tinymce/examples/media/logo.jpg diff --git a/library/tinymce/examples/media/logo_over.jpg b/library/tinymce/examples/media/logo_over.jpg Binary files differindex 79fcd884a..79fcd884a 100755..100644 --- a/library/tinymce/examples/media/logo_over.jpg +++ b/library/tinymce/examples/media/logo_over.jpg diff --git a/library/tinymce/examples/media/sample.avi b/library/tinymce/examples/media/sample.avi Binary files differindex 238bb688a..238bb688a 100755..100644 --- a/library/tinymce/examples/media/sample.avi +++ b/library/tinymce/examples/media/sample.avi diff --git a/library/tinymce/examples/media/sample.dcr b/library/tinymce/examples/media/sample.dcr Binary files differindex 353b3ce67..353b3ce67 100755..100644 --- a/library/tinymce/examples/media/sample.dcr +++ b/library/tinymce/examples/media/sample.dcr diff --git a/library/tinymce/examples/media/sample.flv b/library/tinymce/examples/media/sample.flv Binary files differnew file mode 100644 index 000000000..799d137e6 --- /dev/null +++ b/library/tinymce/examples/media/sample.flv diff --git a/library/tinymce/examples/media/sample.mov b/library/tinymce/examples/media/sample.mov Binary files differindex 9c0a0932c..9c0a0932c 100755..100644 --- a/library/tinymce/examples/media/sample.mov +++ b/library/tinymce/examples/media/sample.mov diff --git a/library/tinymce/examples/media/sample.ram b/library/tinymce/examples/media/sample.ram index e2ce04cf7..e2ce04cf7 100755..100644 --- a/library/tinymce/examples/media/sample.ram +++ b/library/tinymce/examples/media/sample.ram diff --git a/library/tinymce/examples/media/sample.rm b/library/tinymce/examples/media/sample.rm Binary files differindex 8947706e0..8947706e0 100755..100644 --- a/library/tinymce/examples/media/sample.rm +++ b/library/tinymce/examples/media/sample.rm diff --git a/library/tinymce/examples/media/sample.swf b/library/tinymce/examples/media/sample.swf Binary files differindex 9f5fc4ac5..9f5fc4ac5 100755..100644 --- a/library/tinymce/examples/media/sample.swf +++ b/library/tinymce/examples/media/sample.swf |
