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
Thomas Müller
793e1e8d6e
Check for current user to have the same id then the owner of the config file - fixes #12307
2015-01-12 16:49:36 +01:00
Morris Jobke
7a393abdbd
Merge pull request #13210 from owncloud/use-isset
...
Check for existence of $_GET keys
2015-01-12 16:35:31 +01:00
Thomas Müller
1d2bef0a01
Use a special filter expression for Oracle to filter the prefix - fixes #13220
2015-01-12 16:28:11 +01:00
Arthur Schiwon
f28235a7ef
fix retrieval of user groups
2015-01-12 16:25:11 +01:00
Robin Appelman
6daedaf344
Send the proper original name for uploaded files
2015-01-12 15:30:47 +01:00
Lukas Reschke
5f7c115dfe
Merge pull request #13268 from owncloud/dnd-files-container
...
Allow dropping files on the table container
2015-01-12 13:27:53 +01:00
Vincent Petry
512ba327f7
Allow dropping files on the table container
...
Make it possible to drop files below the table even if the table is
smaller than the window height.
Added a check to make sure upload is not triggered on invisible lists.
2015-01-12 12:29:26 +01:00
Björn Schießle
331d73c3a3
Merge pull request #13182 from owncloud/download_versions
...
make versions of shared files downloadable
2015-01-12 12:03:21 +01:00
Thomas Müller
ddf81c2ed9
Merge pull request #13254 from owncloud/fixsharel10n
...
make Share/Download buttons localized again
2015-01-12 09:31:35 +01:00
Jenkins for ownCloud
9e550ab844
[tx-robot] updated from transifex
2015-01-12 01:55:52 -05:00
Thomas Müller
e51a76b92d
Merge pull request #13257 from owncloud/fixrmperm
...
l10n: delete permanently fix
2015-01-11 19:28:32 +01:00
Volkan Gezer
d8adc76125
l10n: delete permanently fix
2015-01-11 17:15:58 +01:00
Thomas Müller
31a1a6e60b
Merge pull request #13256 from owncloud/versionup
...
version up
2015-01-11 16:29:45 +01:00
Volkan Gezer
eb44d99fb6
version up
2015-01-11 16:17:57 +01:00
Volkan Gezer
691fab8be3
make Share button localized again
...
it seems we have forgotten to use named FileAction
2015-01-11 15:57:45 +01:00
Volkan Gezer
f1aa8377fe
Merge pull request #13251 from owncloud/spaceoutside
...
keep spaces out of translation
2015-01-11 15:29:21 +01:00
Volkan Gezer
8558ff9c7f
Merge pull request #13250 from owncloud/bittypo
...
32-bit typo fix
2015-01-11 15:29:07 +01:00
Volkan Gezer
8cd0962c6a
suggestion by transifex translator
2015-01-11 13:47:37 +01:00
Volkan Gezer
2df331b6ed
keep spaces out of translation
...
otherwise translators cannot notice it on Transifex
2015-01-11 13:43:43 +01:00
Volkan Gezer
a1d86aab20
32-bit typo fix
2015-01-11 13:36:19 +01:00
Jenkins for ownCloud
3425c73815
[tx-robot] updated from transifex
2015-01-11 01:54:32 -05:00