Vincent Petry
5edf294ce5
Add CAS methods to Null memcache
...
This prevents breaking ownCloud completely when memcache is not enabled
and the locking code is triggered
2015-06-01 13:22:56 +02:00
Robin Appelman
d519aba878
fix test
2015-06-01 13:22:56 +02:00
Robin Appelman
a1a25a9b5b
fix unlocking when moving mount points
2015-06-01 13:22:56 +02:00
Robin Appelman
7e418c7d69
high level locking wip
2015-06-01 13:22:56 +02:00
Robin Appelman
e64360e72d
always use arraycache for unit tests
2015-06-01 13:22:56 +02:00
Robin Appelman
bf7002bc65
add locking to the view apo
2015-06-01 13:22:56 +02:00
Robin Appelman
536e187e51
add locking to the storage api
2015-06-01 13:22:56 +02:00
Robin Appelman
cdf7f91259
expose locking provider in the server container
2015-06-01 13:22:55 +02:00
Thomas Müller
2c86cc821c
Merge pull request #16628 from owncloud/webdav-validatepath
...
Validate target file name for some webdav ops
2015-06-01 13:20:19 +02:00
Thomas Müller
b522baaaa6
Merge pull request #16650 from owncloud/fix-sqlite-only-setup
...
[setup] Disable buttons only in the case they are present
2015-06-01 12:11:49 +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
Morris Jobke
b521109881
[setup] Disable buttons only in the case they are present
...
* fixes #16648
2015-06-01 11:01:42 +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
Lukas Reschke
56eef17fca
Merge pull request #16637 from owncloud/fix-l10n-apps-management
...
Fix L10n in apps management
2015-06-01 09:10:16 +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
Morris Jobke
197378d1fd
Fix L10n in apps management
...
* fixes #16632
2015-05-30 13:39:12 +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
Lukas Reschke
4ddc2444bd
Add information how to report security bugs
2015-05-29 19:28:45 +02:00
Vincent Petry
06f8c80af6
Validate target file name for some webdav ops
2015-05-29 19:14:38 +02:00
Olivier Paroz
f05ac47eb6
Escape single quotes
2015-05-29 18:34:38 +02:00
Olivier Paroz
6aeaa6954b
Fix for parenthesis
2015-05-29 17:49:26 +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
Olivier Paroz
4e364311f1
Get a 96x96 preview for file conflict resolution
2015-05-29 13:49:51 +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
Morris Jobke
1152f8b444
Merge pull request #16615 from owncloud/syntaxfix
...
fix formatting error
2015-05-29 12:01:37 +02:00
Morris Jobke
b21cc746c6
Merge pull request #16619 from mmattel/missing_translations_in_ldap
...
Missing translation in ldap part.wizard-server.php
2015-05-29 11:48:44 +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
Jan-Christoph Borchardt
9194603c31
change tests back to check for logo-wide, make them pass again
2015-05-28 23:39:55 +02:00
Carla Schroder
155150cad3
fix formatting error
2015-05-28 11:55:19 -07:00
Thomas Müller
67cef93fdd
Merge pull request #16578 from owncloud/fix_16556
...
show txt preview when file contains text
2015-05-28 20:48:16 +02: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
Morris Jobke
7f83829db3
Merge pull request #16592 from owncloud/fix-16574
...
Add type hint for OC_Channel
2015-05-28 20:36:44 +02:00
Morris Jobke
7b50eb05f3
Merge pull request #16380 from rullzer/fix_16281
...
Properly format recipients
2015-05-28 20:34:04 +02:00
Vincent Petry
cca7d8d561
Merge pull request #16610 from owncloud/s2s-shareinforeturn404whendisabled
...
Return 404 in shareinfo.php when outgoing s2s disabled
2015-05-28 20:03:18 +02:00
Morris Jobke
54613de31d
Merge pull request #16613 from owncloud/quota-onlyforfiles
...
Only use quota stream wrapper on "files"
2015-05-28 19:44:14 +02:00
Vincent Petry
e114d00242
Only use quota stream wrapper on "files"
...
Prevent using the quota stream wrapper on trashbin folders and other
metadata folders
2015-05-28 18:31:20 +02:00
Vincent Petry
29c68a4e61
Return 404 in shareinfo.php when outgoing s2s disabled
2015-05-28 17:59:43 +02:00
Lukas Reschke
173b147305
Merge pull request #16467 from owncloud/apps-fixsort
...
Sort apps by level, then by name
2015-05-28 16:10:27 +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
Vincent Petry
ded62ff693
Merge pull request #16501 from owncloud/enc_fix_move_versions_between_storages
...
[encryption] fix move versions between storages
2015-05-28 15:28:25 +02:00
Vincent Petry
474c99e19a
Merge pull request #16577 from owncloud/enc_improve_migration
...
only request encryption module for files which are not excluded
2015-05-28 11:31:33 +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
