Thomas Müller
e2a3547127
Merge pull request #13335 from owncloud/disable-rememberme-files-external
...
The files_external app might need the password so autologin must be disabled
2015-01-14 11:51:16 +01:00
Björn Schießle
5745b68fa9
Merge pull request #13311 from owncloud/fix_restore_keys
...
adapt decrypt all to the new folder structure
2015-01-14 11:40:22 +01:00
Vincent Petry
99304be4ef
Read version and product name from update template
...
During upgrade, the config settings aren't always available due to
base.php changes. This fix makes the update info page read the product
name and version from the update template, which already had them.
2015-01-14 11:31:42 +01:00
Olivier Paroz
356bfb36dc
Download the current public folder only
...
From within a shared/public directory, when drilling down folders, some
users want to be able to download what they're currently looking at, not
the whole shared folder. The whole archive is always a click away anyway
since a user can click on the home button.
2015-01-14 11:28:36 +01:00
Joas Schilling
caaae1094f
The files_external app might need the password so autologin must be disabled
2015-01-14 10:19:22 +01:00
Morris Jobke
65ee2b1de8
Merge pull request #13325 from owncloud/kill-strip-slashes
...
Get rid of `stripslashes()`
2015-01-14 08:27:42 +01:00
Jenkins for ownCloud
f367bbb49d
[tx-robot] updated from transifex
2015-01-14 01:55:16 -05:00
Arthur Schiwon
51d783ca6e
JS cleanup
2015-01-13 18:39:37 +01:00
Morris Jobke
c8fa85451c
Merge pull request #13320 from owncloud/fix-php-doc-for-files-view
...
Fix annotations in file view
2015-01-13 18:05:00 +01:00
Morris Jobke
0a400b4577
drop unused parameter
2015-01-13 18:04:20 +01:00
Lukas Reschke
3ff3f641d6
Get rid of stripslashes()
...
This conversions are actually totally unneeded and probably left-overs from ages where the safe_mode was still a valid thing.
2015-01-13 17:43:36 +01:00
Bjoern Schiessle
d50e70ba3a
set accept to 1 (=true) for all server-to-server shares on update, at this point in time all shares are created by the first version of server-to-server sharing and are accepted if they were added to the table
2015-01-13 17:24:00 +01:00
Morris Jobke
a836479287
move search folder into core/
2015-01-13 16:27:05 +01:00
Morris Jobke
55672280e0
Merge pull request #13318 from owncloud/fix-annotation
...
Fix PHP doc and enforce type
2015-01-13 15:24:34 +01:00
Lukas Reschke
d66facc762
Fix annotations in file view
2015-01-13 14:53:00 +01:00
Lukas Reschke
4766dac6f4
Fix PHP doc and enforce type
2015-01-13 14:47:54 +01:00
Morris Jobke
975f19f693
Merge pull request #13316 from owncloud/drop-dead-code
...
drop dead code - ref #13301
2015-01-13 14:33:00 +01:00
Bjoern Schiessle
83574053a3
if we download a public shared file we need to retrieve the user from the path
2015-01-13 14:22:54 +01:00
Robin Appelman
96dff341e2
Return valid fileinfo objects for part files
2015-01-13 13:59:28 +01:00
Morris Jobke
7746ac519f
drop dead code - ref #13301
2015-01-13 13:52:25 +01:00
Bernhard Posselt
ba8c050d2b
Merge pull request #13217 from owncloud/make-basic-auth-work-again
...
Fix Basic Auth in master for applications
2015-01-13 13:35:54 +01:00
Thomas Müller
543fa0d45b
Merge pull request #13291 from owncloud/node-searchcommonbasepathfix
...
Fix searchCommon to properly match path name
2015-01-13 13:25:51 +01:00
Robin Appelman
857695ec87
Return false if the login is canceled in a hook
2015-01-13 13:25:20 +01:00
Joas Schilling
6d73aff9ad
Merge pull request #13277 from owncloud/pasteurl
...
add https:// placeholder for From Link feature. closes #13255
2015-01-13 12:51:58 +01:00
Bjoern Schiessle
89f17ef6fe
adapt decrypt all and restore/delete key backups to the new folder structure for encryption key introduced with OC8
2015-01-13 12:45:33 +01:00
Vincent Petry
a2a7a60293
Merge pull request #13301 from owncloud/drop-etag-message
...
drop useless "!!! No reuse of etag" - fixes #13187
2015-01-13 12:24:24 +01:00
Robin McCorkell
79804166f1
Merge pull request #13305 from owncloud/remove-stray-minus-and-use-json-encode
...
Use json_encode on string
2015-01-13 10:39:14 +00:00
Lukas Reschke
f0ac8a278a
Use json_encode on string
...
It's better to encode the string to prevent possible (yet unknown) bugs in combination with PHP's type juggling.
Previously the boolean statements evaluated to either an empty string (false) or a not empty one (true, then it was 1). Not it always evaluates to false or true.
This also removes a stray - that was not intended there but shouldn't have produced any bugs. Just to increase readability.
Thanks @nickvergessen for spotting.
Addresses https://github.com/owncloud/core/pull/13235/files#r22852319
2015-01-13 11:08:18 +01:00
Morris Jobke
dc86cbd1e2
Merge pull request #13271 from owncloud/fix-table-prefix-oracle-master
...
Use a special filter expression for Oracle to filter the prefix - fixes ...
2015-01-13 10:31:04 +01:00
Morris Jobke
9b49b52fc6
drop useless "!!! No reuse of etag" - fixes #13187
2015-01-13 09:54:48 +01:00
Thomas Müller
67168e12e6
Merge pull request #13299 from owncloud/fix-ie8
...
usage of const in JS is supported in IE11+
2015-01-13 09:52:55 +01:00
Morris Jobke
3b2f33561b
Merge pull request #13278 from owncloud/repair-step-missing-etags
...
Adding repair step to fix missing etags - fixes #12172
2015-01-13 08:38:18 +01:00
Morris Jobke
c4aeb0b5b5
Merge pull request #13289 from owncloud/fav-keepfavoncancelrename
...
Properly update internal file info with updated tags
2015-01-13 08:28:30 +01:00
Morris Jobke
0402658c75
usage of const in JS is supported in IE11+
2015-01-13 08:20:37 +01:00
Jenkins for ownCloud
3ece0a7767
[tx-robot] updated from transifex
2015-01-13 01:56:58 -05:00
Lukas Reschke
ed797a248c
Merge pull request #13293 from owncloud/occ-required-posix
...
Check for the posix extension
2015-01-12 23:01:23 +01:00
Thomas Müller
d20a1bbdbf
Merge pull request #13154 from owncloud/fix13141
...
don't show no files yet when mask is in place, fixes #13141
2015-01-12 22:48:25 +01:00
Thomas Müller
7966eee007
Adding repair step to fix missing etags - fixes #12172
2015-01-12 20:20:19 +01:00
Thomas Müller
1f01552325
Check for the posix extension - refs https://github.com/owncloud/core/pull/13282#issuecomment-69602645
2015-01-12 20:17:02 +01:00
Volkan Gezer
18b5966f3a
add https:// placeholder for From Link feature. closes #13255
2015-01-12 20:11:45 +01:00
Vincent Petry
fcc3b3d5f7
Fix searchCommon to properly match path name
...
The internal path was matched without the last "/" which caused
"files_trashbin" to also match when the internal path was "files".
This adds the missing slash for the comparison.
2015-01-12 19:33:00 +01:00
Joas Schilling
ec70246be2
Merge pull request #13272 from owncloud/fav-renamekeepfav
...
Fixes issues when renaming favorite file
2015-01-12 19:12:31 +01:00
Vincent Petry
8cc13031e9
Return path attribute for ajax rename operations
...
This fixes an issue when renaming files from a flat list view like
"Favorites" or "Shared with you", in which case the path needs to be
present in the response to make sure the data-path attribute is properly
set in the JS side.
2015-01-12 18:15:31 +01:00
Vincent Petry
dac7828480
Return tags after rename
...
To make it possible for the web UI to correctly display the tag/favorite
information after a rename, this information is now returned in the
rename response
2015-01-12 18:14:17 +01:00
Vincent Petry
ef1dd3ea0a
Properly update internal file info with updated tags
...
Whenever tags are updated, they need to be updated in the file list's
file info array as well.
This commit also adds unit tests and makes sure that whichever tags are
sent back by the server after update are used when updating
attributes/fileinfo.
2015-01-12 17:58:57 +01:00
Morris Jobke
d36a2c8b04
Merge pull request #13285 from owncloud/fix-encryption-check-number-of-parts
...
Check array size, before using the 3rd element from it
2015-01-12 17:58:36 +01:00
Morris Jobke
58b985b4c0
Merge pull request #13282 from owncloud/occ-user-warning
...
Check for current user to have the same id then the owner of the config ...
2015-01-12 17:50:12 +01:00
Morris Jobke
2a03568623
Merge pull request #13279 from owncloud/upload-original-name
...
Send the proper original name for uploaded files
2015-01-12 17:48:12 +01:00
Morris Jobke
af4d60adb0
Merge pull request #13280 from owncloud/fix-12306
...
fix retrieval of user groups
2015-01-12 17:42:37 +01:00
Joas Schilling
5c03e2207b
Check array size, before using the 3rd element from it
2015-01-12 17:05:51 +01:00
