diff --git a/COPYING-README b/COPYING-README index b0caca2ad2..49e035186e 100644 --- a/COPYING-README +++ b/COPYING-README @@ -2,13 +2,14 @@ Files in ownCloud are licensed under the Affero General Public License version 3 the text of which can be found in COPYING-AGPL, or any later version of the AGPL, unless otherwise noted. -Components of ownCloud: -* jQuery is dual licensed under MIT and GPL -* HTTP is three clause BSD license -* MDB2 uses a custom license in the BSD style -* User is AGPL -* XML/RPC is both MIT and PHP license +Licensing of components: +* jQuery: MIT / GPL +* HTTP: 3 clause BSD +* MDB2: BSD style custom +* User: AGPL +* XML/RPC: MIT / PHP +* Silk icons: Creative Commons Attribution All unmodified files from these and other sources retain their original copyright and license notices: see the relevant individual files. -Attribution information for ownCloud is contained in the AUTHORS file. +Attribution information for ownCloud is contained in the AUTHORS file. \ No newline at end of file diff --git a/core/img/filetypes/addressbook.png b/core/img/filetypes/addressbook.png new file mode 100644 index 0000000000..b73419ba82 Binary files /dev/null and b/core/img/filetypes/addressbook.png differ diff --git a/core/img/filetypes/c.png b/core/img/filetypes/c.png new file mode 100644 index 0000000000..34a05cccf0 Binary files /dev/null and b/core/img/filetypes/c.png differ diff --git a/core/img/filetypes/calendar.png b/core/img/filetypes/calendar.png new file mode 100644 index 0000000000..658913852d Binary files /dev/null and b/core/img/filetypes/calendar.png differ diff --git a/core/img/filetypes/code.png b/core/img/filetypes/code.png new file mode 100644 index 0000000000..0c76bd1297 Binary files /dev/null and b/core/img/filetypes/code.png differ diff --git a/core/img/filetypes/cplusplus.png b/core/img/filetypes/cplusplus.png new file mode 100644 index 0000000000..a87cf847cb Binary files /dev/null and b/core/img/filetypes/cplusplus.png differ diff --git a/core/img/filetypes/csharp.png b/core/img/filetypes/csharp.png new file mode 100644 index 0000000000..ffb8fc932f Binary files /dev/null and b/core/img/filetypes/csharp.png differ diff --git a/core/img/filetypes/css.png b/core/img/filetypes/css.png new file mode 100644 index 0000000000..23f3101811 Binary files /dev/null and b/core/img/filetypes/css.png differ diff --git a/core/img/filetypes/database.png b/core/img/filetypes/database.png new file mode 100644 index 0000000000..3d09261a26 Binary files /dev/null and b/core/img/filetypes/database.png differ diff --git a/core/img/filetypes/document.png b/core/img/filetypes/document.png new file mode 100644 index 0000000000..813f712f72 Binary files /dev/null and b/core/img/filetypes/document.png differ diff --git a/core/img/filetypes/feed.png b/core/img/filetypes/feed.png new file mode 100644 index 0000000000..315c4f4fa6 Binary files /dev/null and b/core/img/filetypes/feed.png differ diff --git a/core/img/filetypes/flash.png b/core/img/filetypes/flash.png new file mode 100644 index 0000000000..5769120b1b Binary files /dev/null and b/core/img/filetypes/flash.png differ diff --git a/core/img/filetypes/folder.png b/core/img/filetypes/folder.png new file mode 100644 index 0000000000..784e8fa482 Binary files /dev/null and b/core/img/filetypes/folder.png differ diff --git a/core/img/filetypes/h.png b/core/img/filetypes/h.png new file mode 100644 index 0000000000..e902abb076 Binary files /dev/null and b/core/img/filetypes/h.png differ diff --git a/core/img/filetypes/html.png b/core/img/filetypes/html.png new file mode 100644 index 0000000000..55d1072eaf Binary files /dev/null and b/core/img/filetypes/html.png differ diff --git a/core/img/filetypes/image.png b/core/img/filetypes/image.png index 980a7c6981..23a37b891c 100644 Binary files a/core/img/filetypes/image.png and b/core/img/filetypes/image.png differ diff --git a/core/img/filetypes/javascript.png b/core/img/filetypes/javascript.png new file mode 100644 index 0000000000..63fe6ceff5 Binary files /dev/null and b/core/img/filetypes/javascript.png differ diff --git a/core/img/filetypes/link.png b/core/img/filetypes/link.png new file mode 100644 index 0000000000..68f21d3011 Binary files /dev/null and b/core/img/filetypes/link.png differ diff --git a/core/img/filetypes/music.png b/core/img/filetypes/music.png new file mode 100644 index 0000000000..a8b3ede3df Binary files /dev/null and b/core/img/filetypes/music.png differ diff --git a/core/img/filetypes/other.png b/core/img/filetypes/other.png new file mode 100644 index 0000000000..8443c23eb9 Binary files /dev/null and b/core/img/filetypes/other.png differ diff --git a/core/img/filetypes/pdf.png b/core/img/filetypes/pdf.png new file mode 100644 index 0000000000..8f8095e46f Binary files /dev/null and b/core/img/filetypes/pdf.png differ diff --git a/core/img/filetypes/photo.png b/core/img/filetypes/photo.png new file mode 100644 index 0000000000..4a158fef7e Binary files /dev/null and b/core/img/filetypes/photo.png differ diff --git a/core/img/filetypes/php.png b/core/img/filetypes/php.png new file mode 100644 index 0000000000..7868a25945 Binary files /dev/null and b/core/img/filetypes/php.png differ diff --git a/core/img/filetypes/presentation.png b/core/img/filetypes/presentation.png new file mode 100644 index 0000000000..c4eff0387d Binary files /dev/null and b/core/img/filetypes/presentation.png differ diff --git a/core/img/filetypes/readme.txt b/core/img/filetypes/readme.txt new file mode 100644 index 0000000000..400a64d785 --- /dev/null +++ b/core/img/filetypes/readme.txt @@ -0,0 +1,22 @@ +Silk icon set 1.3 + +_________________________________________ +Mark James +http://www.famfamfam.com/lab/icons/silk/ +_________________________________________ + +This work is licensed under a +Creative Commons Attribution 2.5 License. +[ http://creativecommons.org/licenses/by/2.5/ ] + +This means you may use it for any purpose, +and make any changes you like. +All I ask is that you include a link back +to this page in your credits. + +Are you using this icon set? Send me an email +(including a link or picture if available) to +mjames@gmail.com + +Any other questions about this icon set please +contact mjames@gmail.com \ No newline at end of file diff --git a/core/img/filetypes/ruby.png b/core/img/filetypes/ruby.png new file mode 100644 index 0000000000..f59b7c4365 Binary files /dev/null and b/core/img/filetypes/ruby.png differ diff --git a/core/img/filetypes/spreadsheet.png b/core/img/filetypes/spreadsheet.png new file mode 100644 index 0000000000..abcd93689a Binary files /dev/null and b/core/img/filetypes/spreadsheet.png differ diff --git a/core/img/filetypes/typeface.png b/core/img/filetypes/typeface.png new file mode 100644 index 0000000000..81e41de7d3 Binary files /dev/null and b/core/img/filetypes/typeface.png differ diff --git a/core/img/filetypes/vcard.png b/core/img/filetypes/vcard.png new file mode 100644 index 0000000000..c02f315d20 Binary files /dev/null and b/core/img/filetypes/vcard.png differ diff --git a/core/img/filetypes/vector.png b/core/img/filetypes/vector.png new file mode 100644 index 0000000000..a1291c2dfa Binary files /dev/null and b/core/img/filetypes/vector.png differ diff --git a/core/img/filetypes/video.png b/core/img/filetypes/video.png new file mode 100644 index 0000000000..b0ce7bb198 Binary files /dev/null and b/core/img/filetypes/video.png differ diff --git a/core/img/filetypes/file.png b/core/img/places/file.png similarity index 100% rename from core/img/filetypes/file.png rename to core/img/places/file.png diff --git a/core/img/filetypes/file.svg b/core/img/places/file.svg similarity index 100% rename from core/img/filetypes/file.svg rename to core/img/places/file.svg diff --git a/core/img/places/image.png b/core/img/places/image.png new file mode 100644 index 0000000000..980a7c6981 Binary files /dev/null and b/core/img/places/image.png differ diff --git a/core/img/filetypes/image.svg b/core/img/places/image.svg similarity index 100% rename from core/img/filetypes/image.svg rename to core/img/places/image.svg diff --git a/core/img/filetypes/audio.png b/core/img/places/music.png similarity index 100% rename from core/img/filetypes/audio.png rename to core/img/places/music.png diff --git a/core/img/filetypes/audio.svg b/core/img/places/music.svg similarity index 100% rename from core/img/filetypes/audio.svg rename to core/img/places/music.svg