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
b6a2a85bb8
Merge pull request #9953 from owncloud/fix_text_preview_for_systems_without_ttf
...
implement a txt preview fallback for the case that ttf is not support
2014-08-07 22:55:06 +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
8cd6f9a113
Merge pull request #10172 from owncloud/fix-8802
...
Use relative, human readable dates in OC.filePickers - Fixes #8802
2014-08-07 16:14:30 +02:00
520f6422ac
Merge pull request #10079 from owncloud/Improve_scanner_message
...
Improved scanner error message
2014-08-07 16:09:52 +02:00
0b3ddbed68
add logout hook to remove keys from session
2014-08-07 15:29:35 +02:00
e33fc2807c
Merge pull request #10142 from owncloud/fix-#9283-gzip_support
...
Removed broken tar cutter, added tar and fixed extension switch.
2014-08-07 14:53:31 +02:00
93ba64a69f
Use human readable relative date for oc-dialog-filepickers
2014-08-07 13:40:52 +01: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
c07a0b7ad8
Merge pull request #10224 from owncloud/typo-fix
...
typo fix from transifex suggestion
2014-08-07 01:40:56 +02:00
173538befb
typo fix from transifex suggestion
2014-08-06 20:48:26 +02: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
1deb6aadd3
return null instead of throwing an exception
2014-08-06 12:06:41 +02:00
a72dae6842
Merge pull request #10144 from owncloud/issue/9972
...
Issue/9972 Fix issues with group and username `0`
2014-08-06 09:53:13 +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
e902e3f659
[tx-robot] updated from transifex
2014-08-06 01:54:43 -04:00
9fb79c86f0
Merge pull request #10191 from owncloud/sharing_rm_trailing_slash
...
[sharing] remove trailing slash
2014-08-05 23:13:35 +02:00
48c57b80e3
remove trailing slash from path
2014-08-05 20:34:32 +02:00
f451173817
remove unused variable
2014-08-05 20:34:18 +02:00
9925db335c
execute unit test for files external in separate build config
2014-08-05 18:35:53 +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
d35bfc9a4c
Merge pull request #9520 from owncloud/theme_urls
...
Add ability to theme iOS and Android client URLs just like desktop URLs.
2014-08-05 17:53:18 +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
bf8f910a32
Fix Folder::getById
2014-08-05 16:58:10 +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
244d4e1399
Make View->shouldEmitHooks more robust
2014-08-05 16:53:28 +02:00
8d0e162daf
Don't rely on the sorting the database gives us for tests
2014-08-05 16:53:28 +02:00
472d896ce9
Travis support
...
* use PHPUnit 4.x
* force php memory limit on travis to 1024MB
* create script for travis
* whitelist branches master, stable5 and stable6 on travis (and PRs)
* sqlplus64
* conditional JS tests and ocular temporal removal
* enable scrutinizer code coverage
* move oracle to top to decrease overall test duration
2014-08-05 16:53:27 +02:00
54030f4eef
Merge pull request #10176 from owncloud/fix-install-icon-size
...
use correct app-icon class for new apps as well, fix icon size
2014-08-05 16:04:30 +02:00
61c6864ca1
Merge pull request #10166 from owncloud/sharing_dont_display_share_permission
...
[sharing] respect "sharing allowed" setting in the share dialog
2014-08-05 14:45:09 +01:00
892d824804
Merge pull request #10154 from owncloud/uninstall-undefined-appitem
...
Fix undefined variable when uninstalling an app
2014-08-05 15:13:15 +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
fa9659ae69
use correct app-icon class for new apps as well, fix icon size
2014-08-05 14:23:25 +02:00
8561d0dfca
remove escaping because it's unneeded
2014-08-05 13:18:38 +02:00
7b222c4ab5
fix uppercase issue
2014-08-05 13:16:51 +02:00
8c43584450
Added to personal settings page.
2014-08-05 13:16:51 +02:00
2e127d2c5e
Add ability to theme iOS and Android client URLs just like desktop URLs.
2014-08-05 13:16:51 +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
Morris Jobke
Thomas Müller
Arthur Schiwon
Bjoern Schiessle
Tom Needham
Robin Appelman
Jan-Christoph Borchardt
pzy
Jenkins for ownCloud
Volkan Gezer
Dan Jones
Morris Jobke
Tom Needham
scolebrook