5e7b164560
Merge pull request #10248 from owncloud/enc_remove_keys_from_session
...
add logout hook to remove keys from session
2014-08-07 23:01:11 +02:00
461fdd854f
Merge pull request #10261 from owncloud/fix-9829
...
ldap_ prefix will be added in invokeLDAPMethod(), having it would lead t...
2014-08-07 21:38:12 +02:00
2676e681e9
ldap_ prefix will be added in invokeLDAPMethod(), having it would lead to a unexisting function, fixes #9829
2014-08-07 17:15:36 +02:00
0b3ddbed68
add logout hook to remove keys from session
2014-08-07 15:29:35 +02:00
6da9c09467
Merge pull request #10238 from owncloud/fix-public-download-with-encryption-master
...
we can only close the session if encryption is not used
2014-08-07 14:29:54 +02:00
f1091280de
Merge pull request #10184 from owncloud/getbyid-node
...
Fix Folder::getById
2014-08-07 13:40:17 +02:00
9e6b65fabe
Merge pull request #10223 from dannosaur/patch-1
...
fix tiny thumbnails in public preview/share mode
2014-08-07 12:36:57 +02:00
8b2fe69bb2
Merge pull request #10218 from owncloud/pzy-master
...
Adding link tag to enable facebook timeline previews
2014-08-07 12:14:30 +02:00
d2365afad6
Merge pull request #8915 from owncloud/MorrisJobke-travis
...
Travis support for PRs and master, stable5 and stable6
2014-08-07 11:33:13 +02:00
2fb8fcf6cb
we can only close the session if encryption is not used
2014-08-07 11:07:11 +02:00
dc15633111
Update public.php
...
added tag to make facebook load a preview picture
Update public.php
add check ifMimeSupported and put the thumbsize in a variable
generate preview for all supported mimes
2014-08-07 10:44:07 +02:00
2821f7241b
[tx-robot] updated from transifex
2014-08-07 01:55:10 -04:00
4bbea118c2
fix tiny thumbnails in public preview/share mode
2014-08-06 19:32:21 +01:00
eb8683e6ee
trim leading slash
2014-08-06 14:57:54 +02:00
12207ec0c7
Fix SharedCache::getPathById
2014-08-06 13:38:14 +02:00
6599dc1b5c
Merge pull request #10186 from owncloud/versioning_fix_path
...
[versioning] make sure that getVersions() return the correct path
2014-08-06 09:30:28 +02:00
9fb79c86f0
Merge pull request #10191 from owncloud/sharing_rm_trailing_slash
...
[sharing] remove trailing slash
2014-08-05 23:13:35 +02:00
f451173817
remove unused variable
2014-08-05 20:34:18 +02:00
e15b4d08a6
Disable encryption migration tests
2014-08-05 18:35:53 +02:00
e717833b07
mark tests as skipped - TODO travis
...
* swift causes some timeouts and test failures
2014-08-05 18:35:47 +02:00
785ae5dc9a
add unit test to make sure getVersions returns the correct result
2014-08-05 17:26:23 +02:00
b7ada5da57
make sure that the versions array contains the correct path
2014-08-05 17:25:55 +02:00
676fa459d7
Minor fixes
...
* instanceof \OC\Files\View
* fix misplaced paranthesis
* remove misplaced character in comment
2014-08-05 16:53:28 +02:00
c83c90342e
Merge pull request #10168 from owncloud/parallel-download-on-public-shared-folder-master
...
close session right before the download starts - this enables parallel d...
2014-08-05 14:54:44 +02:00
7fd7706542
Hack to avoid Agent DN + Password being overwritten by some ugly browsers with stored site credentials
...
Conflicts:
apps/user_ldap/css/settings.css
2014-08-05 12:14:29 +02:00
b68275baba
close session right before the download starts - this enables parallel downloads
2014-08-05 11:21:42 +02:00
5ecbc27753
[tx-robot] updated from transifex
2014-08-05 02:05:17 -04:00
5a2952e2eb
[tx-robot] updated from transifex
2014-08-04 01:54:39 -04:00
d1aaa7a12e
[tx-robot] updated from transifex
2014-08-02 01:54:33 -04:00
4886c8582d
Merge pull request #9529 from helmutschneider/fix-8326
...
Fixes #8326 : deletion of directories on S3
2014-08-01 14:04:21 +02:00
6cbfe8fd98
Merge pull request #10067 from owncloud/fix-#9119
...
Quick fix for #9119 . Increase preview to keep empty message more centered
2014-08-01 09:25:15 +02:00
86cdfa3db3
[tx-robot] updated from transifex
2014-08-01 01:54:28 -04:00
dc6180427c
Merge pull request #10048 from owncloud/fix_search_in_shared_files
...
traverse folders in php to search in shared files
2014-07-31 18:27:47 +02:00
1af436cb59
add test for search() in shared cache
2014-07-31 15:07:49 +02:00
a7b4cd77b1
traverse folders in php to search in shared files
2014-07-31 12:05:29 +02:00
4eb2b4e1b0
Merge pull request #10051 from owncloud/preview-empty-text
...
Use svg mimeicons for empty text files
2014-07-31 11:38:29 +02:00
c1562057e8
[tx-robot] updated from transifex
2014-07-31 01:55:01 -04:00
a1b5bc8684
Quick fix for #9119 . Increase preview to keep empty message more centered and push footer down.
2014-07-30 22:41:17 +02:00
8389ff5875
Merge pull request #10054 from owncloud/dont_preload_videos
...
don't preload videos on public sharing, fixes #10042
2014-07-30 21:10:57 +02:00
62b37fbb99
Merge pull request #10024 from owncloud/preview-restrict-height
...
Also keep maxY into account when scaling a preview while preserving aspect ratio
2014-07-30 17:22:20 +02:00
3d0bcb7c46
don't preload videos on public sharing, fixes #10042
2014-07-30 17:06:41 +02:00
4a9b0d5465
Use svg mimeicons for empty text files
2014-07-30 16:31:37 +02:00
1a797f90bb
add unit test for rename and copy operation
2014-07-30 15:14:01 +02:00
dba2574c52
make sure that we always find all versions
2014-07-30 15:14:01 +02:00
c738f71657
make the versions and encryption app aware of the copy operation
2014-07-30 15:14:01 +02:00
c066320208
Also keep maxY into account when scaling a preview while preserving aspect ratio
2014-07-30 13:52:40 +02:00
2946a63f6b
Merge pull request #9721 from owncloud/enc_define_type_in_pre_hook
...
[encryption] define type in pre hook
2014-07-29 16:29:28 +02:00
f7d60f1190
Merge pull request #9951 from owncloud/enc_inproved_error_messages
...
show a warning in the personal settings and admin settins if the encyption keys are not initialized
2014-07-29 16:27:24 +02:00
03f7c5c561
Merge pull request #9983 from owncloud/sharing_add_unshare_to_overview
...
update attributes for share-with-user view
2014-07-29 14:00:57 +02:00
29a3f1e2af
[tx-robot] updated from transifex
2014-07-29 09:16:02 +02:00
Morris Jobke
Thomas Müller
Arthur Schiwon
Bjoern Schiessle
Robin Appelman
Jan-Christoph Borchardt
pzy
Jenkins for ownCloud
Dan Jones
Jörn Friedrich Dreyer
Remco Brenninkmeijer
Georg Ehrke