gekmihesg
578a57f0fb
Load authentication backends before tryBasicAuth
2014-08-10 13:29:32 +02:00
Jenkins for ownCloud
c920ca32e8
[tx-robot] updated from transifex
2014-08-10 01:55:15 -04:00
Lukas Reschke
6fae8ae8a7
Merge pull request #10302 from owncloud/remove-logon-rejected
...
remove confusing 'automatic logon rejected' message, fix #8591
2014-08-09 19:01:38 +02:00
Jan-Christoph Borchardt
6f9963b2d9
Merge pull request #10293 from owncloud/fix-headers-being-sent
...
using flush() here is pointless as we render the layout into a memory bu...
2014-08-09 18:32:44 +02:00
Jenkins for ownCloud
f12f835485
[tx-robot] updated from transifex
2014-08-09 01:55:08 -04:00
Jan-Christoph Borchardt
c0fa29523c
remove confusing 'automatic logon rejected' message, fix #8591
2014-08-09 01:35:02 +02:00
Thomas Müller
7b6b99f55a
Merge pull request #10290 from owncloud/check_quota_on_new_via_web
...
check quota when trying to download a file via new -> web
2014-08-08 17:32:50 +02:00
Thomas Müller
cbe3595f64
using flush() here is pointless as we render the layout into a memory buffer and actually transmit the data later
2014-08-08 15:44:11 +02:00
Jörn Friedrich Dreyer
c24957565c
check quota when trying to download a file via new -> web
2014-08-08 14:35:33 +02:00
Björn Schießle
6dd7d9e0af
Merge pull request #10288 from owncloud/sharing_dont_show_share_dialog
...
don't show share dialog and navigation entry if sharing was disabled for the user
2014-08-08 14:01:55 +02:00
Bjoern Schiessle
6dda30b5a2
remove share permissions if user is excluded from sharing
2014-08-08 12:16:54 +02:00
Bjoern Schiessle
008498dcad
only show "share with others" and "share by link" navigation bar entries if user is allowed to share files
2014-08-08 12:12:24 +02:00
Morris Jobke
fa260b1649
Merge pull request #10280 from owncloud/lazyloading-earlier
...
trigger lazy loading earlier, fix #9823
2014-08-08 10:02:43 +02:00
Jenkins for ownCloud
d63b9e68c4
[tx-robot] updated from transifex
2014-08-08 01:55:11 -04:00
Jan-Christoph Borchardt
5ee0a57598
trigger lazy loading earlier, fix #9823
2014-08-08 00:27:31 +02:00
Morris Jobke
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
Morris Jobke
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
Thomas Müller
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
Arthur Schiwon
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
Morris Jobke
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
Thomas Müller
520f6422ac
Merge pull request #10079 from owncloud/Improve_scanner_message
...
Improved scanner error message
2014-08-07 16:09:52 +02:00
Bjoern Schiessle
0b3ddbed68
add logout hook to remove keys from session
2014-08-07 15:29:35 +02:00
Thomas Müller
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
Tom Needham
93ba64a69f
Use human readable relative date for oc-dialog-filepickers
2014-08-07 13:40:52 +01:00
Thomas Müller
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
Robin Appelman
f1091280de
Merge pull request #10184 from owncloud/getbyid-node
...
Fix Folder::getById
2014-08-07 13:40:17 +02:00
Jan-Christoph Borchardt
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
Thomas Müller
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
Thomas Müller
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
Thomas Müller
2fb8fcf6cb
we can only close the session if encryption is not used
2014-08-07 11:07:11 +02:00
pzy
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
Jenkins for ownCloud
2821f7241b
[tx-robot] updated from transifex
2014-08-07 01:55:10 -04:00
Morris Jobke
c07a0b7ad8
Merge pull request #10224 from owncloud/typo-fix
...
typo fix from transifex suggestion
2014-08-07 01:40:56 +02:00
Volkan Gezer
173538befb
typo fix from transifex suggestion
2014-08-06 20:48:26 +02:00
Dan Jones
4bbea118c2
fix tiny thumbnails in public preview/share mode
2014-08-06 19:32:21 +01:00
Robin Appelman
eb8683e6ee
trim leading slash
2014-08-06 14:57:54 +02:00
Robin Appelman
12207ec0c7
Fix SharedCache::getPathById
2014-08-06 13:38:14 +02:00
Robin Appelman
1deb6aadd3
return null instead of throwing an exception
2014-08-06 12:06:41 +02:00
Thomas Müller
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
Thomas Müller
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
Jenkins for ownCloud
e902e3f659
[tx-robot] updated from transifex
2014-08-06 01:54:43 -04:00
Morris Jobke
9fb79c86f0
Merge pull request #10191 from owncloud/sharing_rm_trailing_slash
...
[sharing] remove trailing slash
2014-08-05 23:13:35 +02:00
Bjoern Schiessle
48c57b80e3
remove trailing slash from path
2014-08-05 20:34:32 +02:00
Bjoern Schiessle
f451173817
remove unused variable
2014-08-05 20:34:18 +02:00
Thomas Müller
9925db335c
execute unit test for files external in separate build config
2014-08-05 18:35:53 +02:00
Morris Jobke
e15b4d08a6
Disable encryption migration tests
2014-08-05 18:35:53 +02:00
Morris Jobke
e717833b07
mark tests as skipped - TODO travis
...
* swift causes some timeouts and test failures
2014-08-05 18:35:47 +02:00
Björn Schießle
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
Bjoern Schiessle
785ae5dc9a
add unit test to make sure getVersions returns the correct result
2014-08-05 17:26:23 +02:00
Bjoern Schiessle
b7ada5da57
make sure that the versions array contains the correct path
2014-08-05 17:25:55 +02:00