Morris Jobke
bacd5de453
Merge pull request #16811 from espenfjo/master
...
Fix regression in preview height calculation
2015-06-09 09:31:30 +02:00
Jenkins for ownCloud
75bd040f1c
[tx-robot] updated from transifex
2015-06-09 01:55:06 -04:00
Bjoern Schiessle
d743d6d356
add hint to exception
2015-06-08 21:16:23 +02:00
Espen Fjellvær Olsen
308b97db4c
Fix regression in preview height calculation
...
Fix regressions introduced in a672e9d
regarding the image height calculation
2015-06-08 20:57:19 +02:00
Jenkins for ownCloud
2fb1b0864a
[tx-robot] updated from transifex
2015-06-08 01:55:01 -04:00
Jenkins for ownCloud
3542148761
[tx-robot] updated from transifex
2015-06-07 01:55:03 -04:00
Jenkins for ownCloud
16708ae187
[tx-robot] updated from transifex
2015-06-06 01:55:26 -04:00
Morris Jobke
62ae39208a
Add owner to the storage stats to enable better notifications
...
* getstoragestats.php returns now the owner and it's display name
* show proper storage stats notifications for shared folders
2015-06-05 18:21:41 +02:00
Thomas Müller
9899e10a04
Merge pull request #16753 from owncloud/issue-16752-check-for-existing-user-in-expire-tasks
...
Check whether the user exists before trying to set up his file system
2015-06-05 16:22:03 +02:00
Joas Schilling
bd0b9a0fe0
Add unit tests for non existing users
2015-06-05 13:23:50 +02:00
Thomas Müller
ccbb1cce3c
Merge pull request #16718 from owncloud/files-catchajaxexceptions
...
Catch exceptions in files ajax calls
2015-06-05 12:01:01 +02:00
Joas Schilling
4e24486a89
Check whether the user exists before trying to set up his file system
2015-06-05 11:31:49 +02:00
Morris Jobke
c747a58978
Merge pull request #16748 from owncloud/fix-ldap-port-detection-regression
...
port detection needs to take care of now thrown exceptions when LDAP …
2015-06-05 11:10:37 +02:00
Jenkins for ownCloud
e544d5b2c6
[tx-robot] updated from transifex
2015-06-05 01:55:04 -04:00
Arthur Schiwon
6f69fab384
port detection needs to take care of now thrown exceptions when LDAP server is not available
2015-06-04 16:28:48 +02:00
Jenkins for ownCloud
66a24ff479
[tx-robot] updated from transifex
2015-06-04 01:56:24 -04:00
Morris Jobke
a90a84b0a7
Merge pull request #16691 from owncloud/trash-deleteasrecipientkeepversions
...
Keep versions when deleting as recipient
2015-06-03 16:03:31 +02:00
Vincent Petry
263bb46ff8
Catch exceptions in files ajax calls
2015-06-03 14:31:58 +02:00
Joas Schilling
d3e3a84cae
Move the helpful method to the TestCase class
2015-06-03 12:33:29 +02:00
Jenkins for ownCloud
410a836702
[tx-robot] updated from transifex
2015-06-03 01:55:29 -04:00
Vincent Petry
61356b5560
Keep versions when deleting as recipient
...
The original owner could not be resolved because the original file was
already deleted, so no versions were retained.
This fix passes the owner and path to retainVersions() since it was
already resolved before the file deletion. This reactivates the versions
logic and creates a copy of the versions in each trashbin.
2015-06-02 17:13:00 +02:00
Lukas Reschke
1cccb227c3
Merge pull request #16686 from owncloud/show_cloud_id
...
show federated cloud id in the personal settings
2015-06-02 17:05:33 +02:00
Morris Jobke
70f0cf67a5
L10n for federated cloud ID and rtrim '/' on ID
2015-06-02 15:16:21 +02:00
Bjoern Schiessle
6e5ed81064
show federated cloud id in the personal settings
2015-06-02 14:09:53 +02:00
Morris Jobke
cf2c599218
Merge pull request #16200 from owncloud/kill-globalfilecache
...
Drop file caching
2015-06-02 09:11:33 +02:00
Jenkins for ownCloud
baca5c60c0
[tx-robot] updated from transifex
2015-06-02 01:56:23 -04:00
Lukas Reschke
418f4e1a90
Bump Dropbox library to newest upstream version
2015-06-01 17:03:46 +02:00
Robin Appelman
661c9e2444
add changeLock to the storage api
2015-06-01 13:24:02 +02:00
Robin Appelman
536e187e51
add locking to the storage api
2015-06-01 13:22:56 +02:00
Vincent Petry
5a38964218
Merge pull request #16629 from owncloud/files-renametoreservedname
...
Check target name on rename with web UI
2015-06-01 11:07:08 +02:00
Lukas Reschke
88ee082115
Merge pull request #16638 from owncloud/fix-handlebars-l10n-method-calls
...
Fix files_external l10n
2015-06-01 09:11:21 +02:00
Jenkins for ownCloud
b1ac538679
[tx-robot] updated from transifex
2015-06-01 01:54:54 -04:00
Jenkins for ownCloud
8d23b34402
[tx-robot] updated from transifex
2015-05-31 01:54:44 -04:00
Morris Jobke
80d4309669
Fix files_external l10n
...
* current l10n..pl script can't extract JS functions that are within a handlebars
template - therefore they are duplicated until the script is fixed
2015-05-30 14:00:52 +02:00
Jenkins for ownCloud
a3bc112412
[tx-robot] updated from transifex
2015-05-30 01:55:46 -04:00
Vincent Petry
13617c8bf1
Check target name on rename with web UI
...
When renaming over the web UI, check early that the target name is
valid.
This prevents nonsensical error messages when renaming to a name with a
trailing backslash.
2015-05-29 19:30:09 +02:00
Björn Schießle
01a241f711
Merge pull request #16622 from owncloud/versions-cancelexpireforunexistingfiles
...
Abort expiration when file is gone
2015-05-29 15:19:04 +02:00
Vincent Petry
9a6d253af3
Abort expiration when file is gone
...
Sometimes a background job for versions expiration was scheduled for a
file that has been moved or deleted since.
This prevents showing useless warnings in the log and simply bail out.
2015-05-29 13:15:12 +02:00
Thomas Müller
c700f42b68
Merge pull request #16517 from owncloud/remove-logo-wide
...
replace logo-wide on share page as well with better icon + text
2015-05-29 12:15:02 +02:00
Martin
f084eb07f2
Missing translation in ldap part.wizard-server.php
2015-05-29 10:50:02 +02:00
Jenkins for ownCloud
fff0fb66d6
[tx-robot] updated from transifex
2015-05-29 01:56:13 -04:00
Thomas Müller
b95ebb76e5
Merge pull request #16607 from owncloud/ie9-textpreviewfallback
...
Fallback to picture preview for IE <= 9
2015-05-28 20:45:14 +02:00
Thomas Müller
863139c1e2
Merge pull request #16585 from mmattel/Missing_translation_in_External_storage_back_end
...
Make string 'SFTP with secret key login' translateable
2015-05-28 20:42:08 +02:00
Vincent Petry
29c68a4e61
Return 404 in shareinfo.php when outgoing s2s disabled
2015-05-28 17:59:43 +02:00
Vincent Petry
2daef7c7dc
Fallback to picture preview for IE <= 9
...
IE 9 and below do not provide window.btoa and there is currently no way
to generate base64 strings without introducting further dependencies.
So for now the solution is to fall back to the ugly picture mode for
text files whenever IE <= 9 is used.
2015-05-28 15:36:28 +02:00
Björn Schießle
e1483f65c3
Merge pull request #16591 from owncloud/enc_improved_error_message
...
improved error message for various states
2015-05-28 10:55:53 +02:00
Jenkins for ownCloud
1726d84e73
[tx-robot] updated from transifex
2015-05-28 01:55:22 -04:00
Bjoern Schiessle
68db3059ee
detect migration status
2015-05-27 21:00:02 +02:00
Bjoern Schiessle
5549641f1f
improve error messages displayed to the user
2015-05-27 21:00:02 +02:00
Martin
cdbf472c4d
Make string 'SFTP with secret key login' translatable
2015-05-27 15:38:05 +02:00