wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
11455 commits 157 branches 562 tags 714 MiB
Commit graph

3744 commits

Author SHA1 Message Date
Georg Ehrke
a76360347c fix c&p fail 2013-05-29 13:13:47 +02:00
Georg Ehrke
1e252b6763 more style fixes 2013-05-29 13:11:43 +02:00
Georg Ehrke
6b90416891 add php preview backend 2013-05-29 13:09:38 +02:00
Georg Ehrke
7408ab660a respect coding style guidelines 2013-05-29 13:03:33 +02:00
Georg Ehrke
268246fac8 namespace fix 2013-05-29 12:48:21 +02:00
Georg Ehrke
fa6b96090a move to OC namespace 2013-05-29 12:46:54 +02:00
Georg Ehrke
eebc15dce0 connect preview lib to filesystem hooks 2013-05-29 12:01:43 +02:00
Georg Ehrke
a03787bc42 make preview cache work with encryption and improve error handling 2013-05-28 16:04:39 +02:00
Georg Ehrke
08a022aaa4 don't give ffmpeg wanted size, cause it doesn't care about aspect ratio 2013-05-28 12:09:46 +02:00
Georg Ehrke
55b00fe819 make pdf backend work with encryption 2013-05-28 11:59:20 +02:00
Georg Ehrke
738cc48a85 make mp3 backend work with encryption 2013-05-28 11:49:18 +02:00
Georg Ehrke
4d52dfb0a0 make movie backend work with encryption 2013-05-28 11:48:02 +02:00
Georg Ehrke
7555332d58 remove whitespace 2013-05-28 11:31:48 +02:00
Georg Ehrke
5ae1333c76 add preview backend for text based files 2013-05-28 11:29:01 +02:00
Georg Ehrke
707f52f1db check if the imagick extension is loaded 2013-05-28 10:23:40 +02:00
Georg Ehrke
005d8e9870 update images.php 2013-05-28 10:21:02 +02:00
Georg Ehrke
62411965f9 make svg preview backend work with encryption 2013-05-27 11:09:55 +02:00
Georg Ehrke
f78e002096 make image preview backend work with encryption 2013-05-27 10:45:21 +02:00
Georg Ehrke
af57996d1e Merge branch 'master' into oc_preview 2013-05-25 12:16:25 +02:00
Jenkins for ownCloud
6a6c18dfab [tx-robot] updated from transifex 2013-05-25 02:11:52 +02:00
Thomas Müller
4911305887 Merge pull request #3416 from owncloud/files_encryption 
New files encryption app
 2013-05-24 02:21:19 -07:00
Alessandro Cosentino
3fbfe3c06a small typo in the comments 2013-05-23 20:59:02 -04:00
Michael Gapczynski
a98d6c4be6 Merge pull request #3425 from owncloud/move-storages 
Support for moving/copying folders between storages
 2013-05-23 17:35:11 -07:00
Jenkins for ownCloud
b47729c5fc [tx-robot] updated from transifex 2013-05-24 02:02:43 +02:00
Michael Gapczynski
30330b4343 Merge branch 'master' into move-storages 
Conflicts:
	tests/lib/files/view.php
 2013-05-23 10:25:12 -04:00
Michael Gapczynski
3b6d850e59 Switch to calling deleteAll via storage to avoid emitting delete hook 2013-05-23 10:23:16 -04:00
Björn Schießle
ee53bd1aa3 Merge branch 'master' into files_encryption 
Conflicts:
	lib/files/cache/cache.php
 2013-05-22 15:29:22 +02:00
Georg Ehrke
00985068ca add previews for public files 2013-05-22 15:13:02 +02:00
Jörn Friedrich Dreyer
1f1abe595d cleanup codestyle 2013-05-22 13:59:08 +02:00
Jörn Friedrich Dreyer
cbd5eb9a1a use to_char only for oracle, whitespace 2013-05-22 13:59:07 +02:00
Jörn Friedrich Dreyer
eceb3c8ed5 add debug output 2013-05-22 13:59:07 +02:00
Jörn Friedrich Dreyer
1b68c0c0cd allow install when only oracle is available 2013-05-22 13:56:57 +02:00
Morris Jobke
9fd2be0757 Merge pull request #3406 from owncloud/oc_dialogs_oc_template 
Use js templates in OC.dialogs etc.
 2013-05-22 03:00:04 -07:00
Florin Peter
28d72b822d Merge branch 'master' into files_encryption 
Conflicts:
	lib/files/cache/cache.php
 2013-05-22 01:26:35 +02:00
Thomas Müller
e2444ec9c5 Merge pull request #3266 from owncloud/hooks 
New hook system
 2013-05-21 15:21:25 -07:00
Robin Appelman
81fd1badc3 merge master into filecache_mtime 2013-05-21 23:35:19 +02:00
Jörn Friedrich Dreyer
fb4d8ddf0a Merge pull request #3335 from owncloud/prevent-scan-loop 
Prevent backgroundScan() from looping
 2013-05-21 09:15:22 -07:00
Björn Schießle
5cd14425f9 Merge branch 'master' into files_encryption 
Conflicts:
	apps/files_trashbin/l10n/nn_NO.php
 2013-05-21 15:30:19 +02:00
Georg Ehrke
13c6ef1ba9 add svg backend 2013-05-21 12:23:31 +02:00
Michael Gapczynski
09ff46eda2 Remove user name addition to paths in deleteAll 2013-05-20 10:21:55 -04:00
Thomas Tanghus
c38dc36665 Remove debug output 2013-05-20 13:56:57 +02:00
Thomas Tanghus
b1bb899867 Add rename() method to OC_VCategories. 2013-05-20 10:16:07 +02:00
Florin Peter
31037241e1 Merge branch 'master' into files_encryption 2013-05-20 02:25:56 +02:00
Jenkins for ownCloud
6609de28d8 [tx-robot] updated from transifex 2013-05-20 02:10:11 +02:00
Florin Peter
58a8d67a9b fix for webdav because initMounts() is triggered twice so we lost the root path 2013-05-20 01:57:16 +02:00
Florin Peter
b3b6738d59 Revert "fix for webdav and wrong reference for findByStorageId" 
This reverts commit 079f918d5c.
 2013-05-20 01:47:35 +02:00
Florin Peter
079f918d5c fix for webdav and wrong reference for findByStorageId 2013-05-19 22:30:03 +02:00
Michael Gapczynski
fc5bce1f76 Fix undefined variable for copying empty folders 2013-05-19 15:04:41 -04:00
Michael Gapczynski
41e2d64c86 Add support for copying/moving folders between storages, move isIgnoredDir() to Filesystem 2013-05-19 14:15:49 -04:00
Michael Gapczynski
67729f5f9f Merge pull request #3421 from owncloud/pre_login_password 
Add password to pre_login
 2013-05-19 10:09:24 -07:00