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 |
|
Georg Ehrke
|
1bed3253ab
|
add sample config for previews
|
2013-05-25 11:05:37 +02:00 |
|
Jenkins for ownCloud
|
6a6c18dfab
|
[tx-robot] updated from transifex
|
2013-05-25 02:11:52 +02:00 |
|
Florin Peter
|
fba7200b05
|
improved trashbin test again
|
2013-05-24 23:12:16 +02:00 |
|
Florin Peter
|
b32823a96e
|
improved trashbin test
|
2013-05-24 23:12:07 +02:00 |
|
Thomas Mueller
|
1f9ac7850d
|
meanwhile phpunit is seq faulting with mysql as well
|
2013-05-24 21:50:34 +02:00 |
|
Thomas Müller
|
ae9adcaf8c
|
Merge pull request #3482 from owncloud/fix_helper
use the recoveryPassword var instead of accessing the POST array
|
2013-05-24 10:20:00 -07:00 |
|
Björn Schießle
|
f56802a437
|
no use the recoveryPassword var instead of accessing the POST array
|
2013-05-24 18:37:58 +02:00 |
|
Thomas Müller
|
39603b193b
|
Merge pull request #3479 from owncloud/testing-oracle-on-master
adding Oracle support to autotest.sh
|
2013-05-24 07:32:54 -07:00 |
|
Thomas Mueller
|
a753d14de9
|
adding Oracle support to autotest.sh
|
2013-05-24 15:19:13 +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 |
|
Florin Peter
|
6c8de5ae6d
|
fixes after review from @DeepDiver1975
|
2013-05-23 23:56:31 +02:00 |
|
Florin Peter
|
adc930d9f9
|
added l10n support in apps/files_encryption/ajax/adminrecovery.php
|
2013-05-23 22:09:28 +02:00 |
|
Björn Schießle
|
7b07168c46
|
code clean up; nicer solution to solve the public link share problem if a user is logged in
|
2013-05-23 21:18:31 +02:00 |
|
Björn Schießle
|
a9ebf2aabe
|
fix public link share if a user is logged in
|
2013-05-23 20:30:07 +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
|
cb79169cf5
|
Merge branch 'master' into files_encryption
|
2013-05-23 11:11:57 +02:00 |
|
Jenkins for ownCloud
|
698862519d
|
[tx-robot] updated from transifex
|
2013-05-23 02:00:27 +02:00 |
|
Michael Gapczynski
|
1cfc9d269e
|
Merge pull request #3457 from owncloud/fix-share-links
Fix public links
|
2013-05-22 15:20:15 -07:00 |
|
Florin Peter
|
46c784ccdf
|
added trash bin tests
|
2013-05-22 23:51:35 +02:00 |
|
Florin Peter
|
842d0608f1
|
added static function registerHooks() for better unit tests handling
|
2013-05-22 23:50:45 +02:00 |
|
Michael Gapczynski
|
9b622bdeed
|
RUNTIME_NOSETUPFS no longer exists, using tearDownFS() in public links instead
|
2013-05-22 15:02:11 -04:00 |
|
Björn Schießle
|
b2aa97f166
|
revert changes to .gitmodules, they were applied by accident
|
2013-05-22 18:30:29 +02:00 |
|
Björn Schießle
|
1bd42762ae
|
revert submodule changes
|
2013-05-22 18:28:44 +02:00 |
|
Björn Schießle
|
80dea1a8c5
|
settings clean-up; There is no blacklist in the new encryption app
|
2013-05-22 18:05:12 +02:00 |
|
Björn Schießle
|
15a3ae6db1
|
improved error messages
|
2013-05-22 18:01:18 +02: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 |
|
Thomas Müller
|
26732ecaa6
|
Merge pull request #3337 from owncloud/oracle_fixes
Oracle fixes
|
2013-05-22 05:20:04 -07: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 |
|