Commit graph

10164 commits

Author SHA1 Message Date
Robin McCorkell
9d0915013b Merge pull request #13352 from owncloud/hhvm-array-key
HHVM: Do not use key() on array as the result depends on the internal array pointer.
2015-01-15 01:06:45 +00:00
Andreas Fischer
b4a52e889a Do not use key() on array as the result depends on the internal array pointer. 2015-01-15 00:48:10 +01:00
Ross Nicoll
7620af7550 Updated Dropbox and Google UI Javascript to create input elements instead of anchor. 2015-01-14 17:21:39 +00:00
Ross Nicoll
02c6b72e25 Change from array() to [] style in files_external application info. 2015-01-14 17:16:12 +00:00
Morris Jobke
455ad005a0 Merge pull request #13350 from owncloud/autoload-translations
Autoload app's js translations
2015-01-14 18:12:05 +01:00
Vincent Petry
a9f0582e3e Use source storage permissions when scanning shared storage 2015-01-14 18:11:23 +01:00
Ross Nicoll
64f4f8fc84 Add support for SFTP key authentication
Add support for external files accessed via SFTP using public key exchange authentication.
Keys are generated automatically when the configuration is added, or can be regenerated on demand if a key is compromised.
Creation of a new configuration row now triggers focus on that row. This is used to trigger auto-configuration for SFTP keys.
Generated public keys are saved in user's data directory for easy retrieval by an external application.
Add controller for SFTP key generation AJAX
SFTP class initialisation no longer produces a warning if the password field is missing.
Add unit tests for SFTP with key authentication backend
2015-01-14 17:00:34 +00:00
Arthur Schiwon
3d94aa8953 update user or group count only, when the multiselect is closed 2015-01-14 17:31:20 +01:00
Arthur Schiwon
672bc28715 allow to read again objectclasses and groups under certain conditions 2015-01-14 15:15:55 +01:00
Lukas Reschke
01304aa27e Merge pull request #13351 from owncloud/check-for-existence
Check for existence of $_GET keys
2015-01-14 15:00:25 +01:00
Vincent Petry
87f81e5926 Remove unneeded addTranslations() calls 2015-01-14 14:36:23 +01:00
Lukas Reschke
96cd7c017a Check for existence of $_GET keys
`$dir` may for example very well not get passed at well.
2015-01-14 14:16:18 +01:00
Thomas Müller
25806346c2 remove deprecated code - fixes #13119 2015-01-14 13:56:49 +01:00
Morris Jobke
3a6d2fcc10 Merge pull request #13345 from owncloud/increase-files-external-versions
Increase files_externals oC required version and its own version
2015-01-14 13:24:08 +01:00
Thomas Müller
9b7421972b Merge pull request #13332 from oparoz/fix-download-button
Download the current public folder only
2015-01-14 12:24:06 +01:00
Joas Schilling
f031a479ad Increase files_externals oC required version and its own version 2015-01-14 12:21:47 +01:00
Björn Schießle
9a487f0445 Merge pull request #13286 from owncloud/sharing_upgrade
update script for new server-to-server sharing
2015-01-14 11:57:30 +01:00
Lukas Reschke
64ee942e7d Merge pull request #13288 from owncloud/enc_fix_public_download
[encryption] fix download of public shared files
2015-01-14 11:55:13 +01:00
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
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
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
Lukas Reschke
4766dac6f4 Fix PHP doc and enforce type 2015-01-13 14:47:54 +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
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
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
Jenkins for ownCloud
3ece0a7767 [tx-robot] updated from transifex 2015-01-13 01:56:58 -05: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
Volkan Gezer
18b5966f3a add https:// placeholder for From Link feature. closes #13255 2015-01-12 20:11:45 +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
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
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
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
Volkan Gezer
d8adc76125 l10n: delete permanently fix 2015-01-11 17:15:58 +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
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
Jenkins for ownCloud
3425c73815 [tx-robot] updated from transifex 2015-01-11 01:54:32 -05:00
Volkan Gezer
33bb69e3e6 Merge pull request #13226 from owncloud/fix-encoding
Don't double encode string
2015-01-10 18:11:36 +01:00
Jenkins for ownCloud
22e5220c1f [tx-robot] updated from transifex 2015-01-10 01:54:35 -05:00
Lukas Reschke
e4840b5250 Don't double encode string
We already use `.text()` here which automatically properly encodes the string. Thus the string will be double-encoded and look ugly. (i.e. when you search for ">" you will see "No results found for >")

Fixes itself.
2015-01-10 01:19:37 +01:00
Vincent Petry
59a1d16d0f Merge pull request #13204 from owncloud/enc_fix_key_lost
Encryption fix key lost if group share gets renamed
2015-01-09 18:40:51 +01:00
Lukas Reschke
f65cf498f4 Check for existence of $_GET keys
Otherwise PHP errors are thrown in the error log.
2015-01-09 17:46:14 +01:00
Thomas Müller
b1031c6355 Merge pull request #13188 from owncloud/add-check-if-user-is-logged-in
Add check if user is logged-in
2015-01-09 16:45:53 +01:00
Bjoern Schiessle
0500d3a506 unit tests 2015-01-09 15:49:44 +01:00
Bjoern Schiessle
6cc40552b1 don't move encryption keys if a mount point was renamed 2015-01-09 15:39:36 +01:00
Jan-Christoph Borchardt
720fe858a3 fix rename field position, fix #12927 2015-01-09 13:05:22 +01:00
Bjoern Schiessle
d699d31518 make versions of shared files downloadable 2015-01-09 12:46:24 +01:00
Lukas Reschke
1cfcec8684 Add check if user is logged-in
Otherwise a fatal PHP error is thrown since the filesystem is not setup:
```
( ! ) Fatal error: Call to a member function getOwner() on null in /Users/lreschke/Programming/core/lib/private/files/filesystem.php on line 817
Call Stack
1	0.0004	247792	{main}( )	../index.php:0
2	0.0946	5088776	OC::handleRequest( )	../index.php:28
3	0.1423	7491280	OC\Route\Router->match( )	../base.php:748
4	0.1664	8592152	call_user_func:{/Users/lreschke/Programming/core/lib/private/route/router.php:250} ( )	../router.php:250
5	0.1664	8592216	__lambda_func( )	../router.php:250
6	0.1665	8599064	require_once( '/Users/lreschke/Programming/core/apps/files_versions/ajax/getVersions.php' )	../route.php(135) : runtime-created function:1
7	0.1801	9061096	OCA\Files_Versions\Storage::getUidAndFilename( )	../getVersions.php:7
8	0.1801	9061144	OC\Files\Filesystem::getOwner( )	../storage.php:45
```

Furthermore this adds the CSRF check as a nice-to-have addition, the requests accessing this are done via the jQuery AJAX methods and thus the header is automatically added to all requests already.
2015-01-09 11:55:18 +01:00
Jörn Friedrich Dreyer
45a20744fc add js tests for filelist filtering 2015-01-09 10:49:22 +01:00
Lukas Reschke
a5099b01f9 Merge pull request #12984 from owncloud/ldap-user-cleanup-master
Ldap user cleanup master
2015-01-09 10:47:02 +01:00
Lukas Reschke
b4606ec24f Merge pull request #13184 from owncloud/fix-key
Verify existence of $_GET key
2015-01-09 10:39:22 +01:00
Jenkins for ownCloud
d4fc2f555b [tx-robot] updated from transifex 2015-01-09 01:55:22 -05:00
Lukas Reschke
199276bcbb Verify existence of $_GET key
Otherwise when the file without any specified mimetype was accessed the error log was flooded with entries such as "Undefined index: mime", there can be multiple issues found about this in the forum and our bugtracker.

To test this access `/index.php/apps/files/ajax/mimeicon.php` with and without `$_GET['mime']`.

Fixes itself.
2015-01-09 02:31:59 +01:00
Arthur Schiwon
c1a79d24c5 fix order of initalizing instance properties, and paremeter order in a method call 2015-01-08 17:45:07 +01:00
Thomas Müller
6b0ae34de6 Merge pull request #13170 from owncloud/extstorage-fixsharedmountpointrootleadingslash
Fix source path when share is a mount point
2015-01-08 15:02:16 +01:00
Arthur Schiwon
c7f273040e fix table name for getList 2015-01-08 14:21:40 +01:00
Lukas Reschke
bdfb039e05 Merge pull request #13165 from mypetyak/typos-in-external-storage-xml
Minor typo updates to External Storage description
2015-01-08 14:00:00 +01:00
Vincent Petry
01c83158bb Fix source path when share is a mount point
Whenever an external storage mount point is shared directly, its path is
empty which causes a leading slash to appear in the source path.

This fix removes the bogus leading slash in such situation.
2015-01-08 11:46:11 +01:00
Jenkins for ownCloud
6bda95037f [tx-robot] updated from transifex 2015-01-08 01:56:00 -05:00
Christopher Bunn
0f715708dc Minor typo updates to External Storage description
This text is visible to admin users when they read the description of
the External Storage app.
2015-01-07 22:37:20 -06:00
Martin
edcba11a91 smb: rename textfield from root to subfolder
"root" or "subfolder" -> "Remote subfolder" on selected storages

missed ftp...
2015-01-07 20:54:05 +01:00
Morris Jobke
bfb6e350d5 Merge pull request #13016 from owncloud/sharing_fixes
don't delete share table entries for the unique name if re-share permission was removed
2015-01-07 18:14:53 +01:00
Bjoern Schiessle
b6f63e9b3d don't delete share table entries for the unique name if re-share permission was removed 2015-01-07 16:36:13 +01:00
Jörn Friedrich Dreyer
0bb91cfcf3 don't show no files yet when mask is in place, fixes #13141 2015-01-07 15:59:39 +01:00
Joas Schilling
70dcebbf92 Correctly return false when translating a foreign activity 2015-01-07 15:02:25 +01:00
Arthur Schiwon
9668405ec7 doc fixes and removal of unnecessary use statements 2015-01-07 13:28:56 +01:00
Morris Jobke
5ce295907f Merge pull request #12687 from owncloud/auto-escape-t-placeholders
Auto escape t placeholders
2015-01-07 12:57:33 +01:00
Morris Jobke
bfdf0db7c0 Autoescape of placeholders in t() and p() - for JS
* add disableEscape parameter to disable this functionality
* drop usage of escapeHTML() that is now done inside t()
* add unit test for escaped and not escaped placeholder
* proper JSDoc
2015-01-07 12:56:32 +01:00
Arthur Schiwon
6c335ee6fc add test for mapping's getList method 2015-01-07 12:39:29 +01:00
Joas Schilling
fb37b3c687 Extend Test\TestCase and do not use uniqid() 2015-01-07 10:34:42 +01:00
Jenkins for ownCloud
2daf90dae6 [tx-robot] updated from transifex 2015-01-07 01:55:42 -05:00
Arthur Schiwon
b9235e2a24 inject DB Connection to user manager 2015-01-07 00:52:18 +01:00
Arthur Schiwon
64f0b055e6 inject IDateTimeFormatter to show-remnants command 2015-01-06 23:40:00 +01:00
Arthur Schiwon
40ecd30fba inject oc config to User_LDAP 2015-01-06 23:28:49 +01:00
Lukas Reschke
7528a1a475 Merge pull request #13130 from owncloud/getstoragestats-error-handling
Add error handling to getstoragestats.php
2015-01-06 18:35:09 +01:00
Thomas Müller
47eb0c59e6 Merge pull request #13128 from owncloud/files-scan-path
Fix check if a path argument is passed to occ files:scan
2015-01-06 18:17:19 +01:00
Arthur Schiwon
e724b78694 smaller fixes: coding style, PHPdoc, typos and few for DI 2015-01-06 17:50:06 +01:00
Morris Jobke
fe4592937a Merge pull request #12653 from owncloud/full_content_search_results
Full content width search results
2015-01-06 16:44:58 +01:00
Robin Appelman
64e3ebae74 Add error handling to getstoragestats.php 2015-01-06 15:56:06 +01:00
Robin Appelman
5f6da758b7 Fix check if a path argument is passed to occ files:scan 2015-01-06 15:27:03 +01:00
Jörn Friedrich Dreyer
357fbd88be use class for no results div instead of id. the elements are not unique. 2015-01-06 14:34:35 +01:00
Jörn Friedrich Dreyer
926737fdb7 clear search when navigating via breadcrumbs 2015-01-06 13:55:51 +01:00
Jenkins for ownCloud
6a3f69c2d0 [tx-robot] updated from transifex 2015-01-06 01:54:59 -05:00
Jörn Friedrich Dreyer
7a812801db correctly clear searchbox when switching filelists 2015-01-05 17:53:14 +01:00
Jörn Friedrich Dreyer
10038640ae fix onScroll breaking search, fix keyboard navigation, fix filter for files in other dirs 2015-01-05 14:28:09 +01:00
Jörn Friedrich Dreyer
23900a5a39 filter trashbin and share views 2015-01-05 13:11:50 +01:00
Morris Jobke
28c8f5a0f9 Check for version before mounting a public link
* ownCloud 7.0.0 is needed - version of merge of server <-> server
  sharing - https://github.com/owncloud/core/pull/8399
* adjust error message
2015-01-05 11:50:05 +01:00
Lukas Reschke
a0023974e3 Merge pull request #13099 from owncloud/fix-provisioning-api
Remove unnecessary setUp method from provisioning_api
2015-01-05 10:35:24 +01:00
Jenkins for ownCloud
8776271103 [tx-robot] updated from transifex 2015-01-05 01:54:36 -05:00
Tom Needham
f17f0ade7f Remove unnecessary setUp method 2015-01-04 23:10:44 +00:00
Jenkins for ownCloud
84ed1034b4 [tx-robot] updated from transifex 2015-01-04 01:54:53 -05:00
Morris Jobke
fcae87170d Merge pull request #13091 from owncloud/fix-provisioning-api
Fix remaining unit tests for provisioning_api
2015-01-03 22:41:44 +01:00
Tom Needham
a20de1548d Add proper group setup and teardown to all provisioning_api tests 2015-01-03 15:58:36 +00:00
Tom Needham
5c0d7f2ee5 Create admin group before running provisioning_api tests 2015-01-03 15:39:42 +00:00
Tom Needham
97d31946c3 Ensure admin group is present before running tests 2015-01-03 13:25:48 +00:00
Morris Jobke
92f062baac Merge pull request #13082 from mmattel/rename_text_no_external_storages
adopt text "no external storage configured"
2015-01-03 11:59:22 +01:00
Jenkins for ownCloud
05ffa3ab7a [tx-robot] updated from transifex 2015-01-03 01:54:29 -05:00
root
c44d41178a adopt text "no ecternal storage configured"
storage -> storages
2015-01-02 21:00:02 +01:00
Tom Needham
32d9563359 Change array element order to fix failing test 2015-01-02 19:07:31 +00:00
Tom Needham
a4f270a9ce Add placeholder app.php for provisioning_api so app is detected 2015-01-02 18:52:11 +00:00
Jörn Friedrich Dreyer
ba235eb51d delay hiding no results message until search is triggered 2015-01-02 16:13:15 +01:00
Jörn Friedrich Dreyer
6f820b0209 use " to avoid escaping ' 2015-01-02 14:59:55 +01:00
Jörn Friedrich Dreyer
152c8b3969 text and icon fixes 2015-01-02 14:58:39 +01:00
Jörn Friedrich Dreyer
2eec8dc156 correctly update search results when query is changed, show spinner when searching 2015-01-02 14:22:48 +01:00
Jörn Friedrich Dreyer
0cca9e26c4 show no files found message 2015-01-02 12:50:21 +01:00
Jörn Friedrich Dreyer
9e3f4e043f make OCA.Search.Files available in tests and for other apps 2015-01-02 10:57:25 +01:00
Jörn Friedrich Dreyer
6ba8881343 add file summary filter spec tests 2015-01-02 10:28:42 +01:00
Robin Appelman
f8700ec649 Fix rendering search results 2015-01-02 10:28:42 +01:00
Jörn Friedrich Dreyer
457f5abf6c fix count 2015-01-02 10:28:42 +01:00
Jörn Friedrich Dreyer
4fdd626f0a use correct visibilities 2015-01-02 10:28:42 +01:00
Jörn Friedrich Dreyer
b45d0f03fc fix js tests 2015-01-02 10:28:42 +01:00
Jörn Friedrich Dreyer
8abd954d9a instantiate file search 2015-01-02 10:28:42 +01:00
Jörn Friedrich Dreyer
66cf17b32b don't use full class name to register plugin 2015-01-02 10:28:42 +01:00
Jörn Friedrich Dreyer
8bf048376c allow getting the last query 2015-01-02 10:28:41 +01:00
Jörn Friedrich Dreyer
80ded08ec4 hide irrelevant stuff in empty filelist 2015-01-02 10:28:41 +01:00
Jörn Friedrich Dreyer
a6204efa0d show audio icon & image previews 2015-01-02 10:28:41 +01:00
Jörn Friedrich Dreyer
b93f2ddcb5 hide header when no files in list match 2015-01-02 10:28:41 +01:00
Jörn Friedrich Dreyer
7e6c660b00 filter new rows 2015-01-02 10:28:41 +01:00
Jörn Friedrich Dreyer
606f802b7b move search results below filelist, show hint when results are off screen, use js plugin mechanism 2015-01-02 10:28:41 +01:00
Jenkins for ownCloud
4b357274bb [tx-robot] updated from transifex 2015-01-02 01:54:28 -05:00
Jenkins for ownCloud
ec6e70889a [tx-robot] updated from transifex 2015-01-01 01:54:30 -05:00
Jenkins for ownCloud
573be9092d [tx-robot] updated from transifex 2014-12-31 01:54:33 -05:00
Jenkins for ownCloud
c8e946f633 [tx-robot] updated from transifex 2014-12-29 01:54:27 -05:00
Thomas Müller
9f327457dc Merge pull request #13023 from owncloud/provisioning_api-2
[jenkins] Add provisioning_api app
2014-12-28 14:29:49 +01:00
Thomas Müller
85e02460c8 Merge pull request #13025 from lyonel/master
user_ldap is too verbose by default
2014-12-27 21:39:23 +01:00
Thomas Müller
688a4022df Merge pull request #13012 from owncloud/small_fix
only send activity if we have a valid path and the file is readable
2014-12-27 21:38:47 +01:00
Jenkins for ownCloud
d2e53d1022 [tx-robot] updated from transifex 2014-12-27 01:54:33 -05:00
Jenkins for ownCloud
0836ce9cd8 [tx-robot] updated from transifex 2014-12-26 01:54:28 -05:00
Jenkins for ownCloud
e0fc26a5cb [tx-robot] updated from transifex 2014-12-25 01:54:29 -05:00
Tom Needham
dc85c20b18 Add provisioning_api app
enable unit tests for provisioning api

fix admin docu key
2014-12-24 22:15:20 +01:00
Lyonel Vincent
f94b300602 Be less verbose when using a paged search
Lower the priority from INFO to DEBUG
2014-12-24 16:35:36 +01:00
Lyonel Vincent
5a00b33a90 Be less verbose when disabling SSL cert validation
change log level from WARN to DEBUG
2014-12-24 16:32:27 +01:00
Jenkins for ownCloud
801b9e0494 [tx-robot] updated from transifex 2014-12-24 01:54:33 -05:00
Bjoern Schiessle
8c48be453e only send activity if we have a valid path and the file is readable 2014-12-23 13:32:54 +01:00
Morris Jobke
5352b4b2b8 Merge pull request #10292 from owncloud/external-share-delete
Fix trashbin when deleting a file over an external share
2014-12-23 11:21:06 +01:00
Jenkins for ownCloud
d8f04f5a97 [tx-robot] updated from transifex 2014-12-23 01:55:23 -05:00
Björn Schießle
711220e82d Merge pull request #12997 from owncloud/sharing_activities
add activity if public shared file/folder was downloaded
2014-12-22 23:31:07 +01:00
Robin Appelman
3afcc71764 Make sure the path passed to the activity manager is normalized 2014-12-22 18:50:00 +01:00
Bjoern Schiessle
393deb5961 add activity if public shared file/folder was downloaded 2014-12-22 18:50:00 +01:00
Thomas Müller
cf595ecc67 Merge pull request #12860 from owncloud/remove-apparently-unused-file
Remove unused file
2014-12-22 14:47:14 +01:00
Morris Jobke
eab4c029c2 Merge pull request #12961 from owncloud/try_to_cache_keys
cache keys to read them only once from the hard disc
2014-12-22 09:50:29 +01:00
Jenkins for ownCloud
92c8cd3933 [tx-robot] updated from transifex 2014-12-22 01:54:49 -05:00
Morris Jobke
510488ad3e Merge pull request #12942 from owncloud/favs-missingsharedsubdirs
Fix issues with searchByTag in shared storage
2014-12-21 10:38:34 +01:00
Jenkins for ownCloud
312891c603 [tx-robot] updated from transifex 2014-12-21 01:54:36 -05:00
Arthur Schiwon
61ed363f82 planned refactorings for OC 8 2014-12-20 18:28:29 +01:00
Arthur Schiwon
3ca70d647a move from \OC\Preferences to \OCP\IConfig 2014-12-20 16:33:37 +01:00
Arthur Schiwon
144d95de7d basic adjustments for OC 8. I.e. no visible issues, LDAP tests pass. 2014-12-20 16:09:04 +01:00
Jenkins for ownCloud
5a54ca380d [tx-robot] updated from transifex 2014-12-20 01:56:24 -05:00
Arthur Schiwon
4fa39250e7 LDAP User Cleanup: Port from stable7 without further adjustements
LDAP User Cleanup

background job for user clean up

adjust user backend for clean up

register background job

remove dead code

dependency injection

make Helper non-static for proper testing

check whether it is OK to run clean up job. Do not forget to pass arguments.

use correct method to get the config from server

methods can be private, proper indirect testing is given

no automatic user deletion

make limit readable for test purposes

make method less complex

add first tests

let preferences accept limit and offset for getUsersForValue

DI via constructor does not work for background jobs

after detecting, now we have retrieving deleted users and their details

we need this method to be public for now

finalize export method, add missing getter

clean up namespaces and get rid of unnecessary files

helper is not static anymore

cleanup according to scrutinizer

add cli tool to show deleted users

uses are necessary after recent namespace change

also remove user from mappings table on deletion

add occ command to delete users

fix use statement

improve output

big fixes / improvements

PHP doc

return true in userExists early for cleaning up deleted users

bump version

control state and interval with one config.php setting, now ldapUserCleanupInterval. 0 will disable it. enabled by default.

improve doc

rename cli method to be consistent with  others

introduce ldapUserCleanupInterval in sample config

don't show last login as unix epoche start when no  login happend

less log output

consistent namespace for OfflineUser

rename GarbageCollector to DeletedUsersIndex and move it to user subdir

fix unit tests

add tests for deleteUser

more test adjustements

Conflicts:
	apps/user_ldap/ajax/clearMappings.php
	apps/user_ldap/appinfo/app.php
	apps/user_ldap/lib/access.php
	apps/user_ldap/lib/helper.php
	apps/user_ldap/tests/helper.php
	core/register_command.php
	lib/private/preferences.php
	lib/private/user.php

add ldap:check-user to check user existance on the fly

Conflicts:
	apps/user_ldap/lib/helper.php

forgotten file

PHPdoc fixes, no code change

and don't forget to adjust tests
2014-12-19 19:47:54 +01:00
Björn Schießle
8164415b45 Merge pull request #12749 from owncloud/server2server-sharing-ng
server to server sharing next generation
2014-12-19 19:04:44 +01:00
blizzz
ad6814f920 Merge pull request #12101 from owncloud/ldap_split_mapping
Ldap split mapping from Access superclass
2014-12-19 18:52:30 +01:00
Arthur Schiwon
ec0f80fee9 Split mapping from Access and Helper classes into it's own. Fully test them, too.
remove unused methods

split mapping methods off from Access class

fix DB query handling

move 'clear mapping' methods from static helper to new mapping class

add tests

test directly with DB

finishing tests and fix return value from setDNbyUUID

add corresponding class for groups and make abstract test class neutral. helper tests is now obsolete as the tested functions were moved to the new mapper class.

add missing info to PHPDoc

add unmap method

fix namespaces

fix test inheritance

PHPDoc and a small code restructure for scrutinizer, no effective changes

PostgreSQL does not accept LIMIT in DELETE queries

phpdoc fixes, no code changes
2014-12-19 18:26:12 +01:00
Bjoern Schiessle
aea991c22e cache keys to read them only once from the hard disc 2014-12-19 16:04:13 +01:00
Bjoern Schiessle
24993280ed Next step in server-to-server sharing next generation, see #12285
Beside some small improvements and bug fixes this will probably the final state for OC8.

To test this you need to set up two ownCloud instances. Let's say:

URL: myPC/firstOwnCloud user: user1
URL: myPC/secondOwnCloud user: user2
Now user1 can share a file with user2 by entering the username and the URL to the second ownCloud to the share-drop-down, in this case "user2@myPC/secondOwnCloud".

The next time user2 login he will get a notification that he received a server-to-server share with the option to accept/decline it. If he accept it the share will be mounted. In both cases a event will be send back to user1 and add a notification to the activity stream that the share was accepted/declined.

If user1 decides to unshare the file again from user2 the share will automatically be removed from the second ownCloud server and user2 will see a notification in his activity stream that user1@myPC/firstOwnCloud has unshared the file/folder from him.
2014-12-19 15:20:24 +01:00
Thomas Müller
2d64797320 Merge pull request #12956 from owncloud/jenkins-user-backend-names
[jenkins only] introduce names for user backends - IUserBackend
2014-12-19 13:15:50 +01:00
Morris Jobke
678642a6a2 Merge pull request #12935 from owncloud/public-tagsmanagerissue
Only populate tags in main file list
2014-12-19 12:48:20 +01:00
Morris Jobke
6da33e1ea7 introduce names for user backends - IUserBackend
* LDAP with multiple servers also proved backendName
2014-12-19 10:17:17 +01:00
Thomas Müller
b32dc3f2a4 Merge pull request #12906 from owncloud/keyboardnav-feedback
Accessibility: Keyboard navigation feedback
2014-12-19 09:54:28 +01:00
Morris Jobke
39d6ddd38a Merge pull request #12865 from owncloud/files-tags-webdav
Returns tags through WebDAV
2014-12-19 09:33:28 +01:00
Jenkins for ownCloud
028b0efd5c [tx-robot] updated from transifex 2014-12-19 01:56:51 -05:00
Jan-Christoph Borchardt
7b2ae46762 first part of fixing feedback for file list when using keyboard 2014-12-19 00:34:06 +01:00
Morris Jobke
3036a8714d Merge pull request #12941 from owncloud/wave-accessibility-compliance
Wave accessibility compliance
2014-12-19 00:30:56 +01:00
Morris Jobke
75e8b39826 Merge pull request #12879 from owncloud/mountconfig
Add mount specific options
2014-12-18 23:38:14 +01:00
Jörn Friedrich Dreyer
891474b0d6 Merge pull request #12759 from owncloud/core-reduce-js-and-css
make sure styles and scripts are only loaded once
2014-12-18 23:18:37 +01:00
Jörn Friedrich Dreyer
49318b4d93 Merge pull request #12896 from owncloud/drop-deprecated
first step to drop \OCP\Config:: in favour of IConfig
2014-12-18 23:01:49 +01:00
Morris Jobke
7798ea0cd7 show spinner on file upload in IE8, 9 2014-12-18 22:24:07 +01:00
Vincent Petry
11b3aa2dbe Fix issues with searchByTag in shared storage 2014-12-18 17:27:56 +01:00
Jan-Christoph Borchardt
cd81687a38 properly escape variable 2014-12-18 17:19:23 +01:00
Jan-Christoph Borchardt
96ae18db59 get rid of unnecessary alt and title attributes 2014-12-18 17:05:27 +01:00
Jan-Christoph Borchardt
7faf3d17e5 fix accessibility for deleted files 2014-12-18 16:54:39 +01:00
Robin Appelman
1ef01de402 Merge pull request #12907 from owncloud/delete-invalid-external-share
Fix deleting invalid s2s shares
2014-12-18 16:38:13 +01:00
Jan-Christoph Borchardt
9009f5f727 add empty alt text to decorative preview of public share image 2014-12-18 16:00:55 +01:00
Jan-Christoph Borchardt
137d19f6b1 fix accessibility for 'New' file inputs 2014-12-18 15:52:42 +01:00
Vincent Petry
4b1b93507d Only populate tags in main file list
Moved populateTags to be done on the main file list.
This prevents the public file list to go through the same code and cause
an error when there is no user.
2014-12-18 15:36:18 +01:00
Jan-Christoph Borchardt
0e78415cb1 fix accessibility of file upload 2014-12-18 14:12:34 +01:00
Vincent Petry
10a0fc2856 Merge pull request #12925 from owncloud/fix-js-unit-tests
be more explicit in JS unit tests - caused by accessibility issues
2014-12-18 12:10:11 +01:00
Jan-Christoph Borchardt
ea548cdaaa fix accessibility of logos 2014-12-18 10:51:41 +01:00
Jenkins for ownCloud
5c6e08213e [tx-robot] updated from transifex 2014-12-18 01:56:40 -05:00
Morris Jobke
ec0401f97b be more explicit in JS unit tests - caused by accessibility issues 2014-12-18 01:27:58 +01:00
Thomas Müller
82f8726903 Merge pull request #12900 from owncloud/more-accessibility
More accessibility fixes for Files
2014-12-18 01:21:01 +01:00
Thomas Müller
a581dcaadb Merge pull request #12924 from owncloud/improve-emptystates
Improve empty states
2014-12-18 01:10:13 +01:00
Jan-Christoph Borchardt
0bda42b8e3 add empty state for external storages 2014-12-17 21:57:31 +01:00
Morris Jobke
7c1b9aedd5 Setup a docker container that holds a webdav instance to test files_external
document docker parameter and use random host port
fix typo
copy autotest.sh to autotest-external.sh
adds ability to add start* and stop* scripts in env in external tests
run files_external WebDAV tests against ownCloud instance
introduce executor number to be able to shut down the correct docker container
fetch docker images in advance - this also fetches latest versions of the docker images
add second argument to autotest-external.sh which can specify a single test to run
print out the explicit test run
change naming schema of files_external setup scripts
2014-12-17 21:50:35 +01:00
Jan-Christoph Borchardt
59dec3834f wording fix for Files app empty state 2014-12-17 21:45:51 +01:00
Jan-Christoph Borchardt
38931176df apply empty state for 'Deleted files' 2014-12-17 21:45:34 +01:00
Jan-Christoph Borchardt
ab2ae91b11 improve empty state of 'All files' 2014-12-17 21:27:14 +01:00
Jan-Christoph Borchardt
16c62a346c improve empty states for sharing and shared links as well 2014-12-17 21:22:28 +01:00
Jan-Christoph Borchardt
e3192bfa26 use empty state for 'Shared with you' as well 2014-12-17 21:13:53 +01:00
Jan-Christoph Borchardt
2be66044cc even better empty state for Favorites, and general Empty State style 2014-12-17 20:59:26 +01:00
Robin McCorkell
c20be24559 Merge pull request #12793 from owncloud/mountconfig-store-id
Add the storage id to the mount config
2014-12-17 17:53:11 +00:00
Morris Jobke
a641bb7592 Merge pull request #12902 from owncloud/fix-filelist-thumbnails
Propertly restore thumbnail on cancel/rename/move
2014-12-17 17:13:21 +01:00
Vincent Petry
0b3f0716fc Returns and update tags through WebDAV PROPFIND and PROPPATCH
Added oc:tags and oc:favorites in PROPFIND response.
It is possible to update them with PROPPATCH.
These properties are optional which means they need to be requested
explicitly
2014-12-17 16:50:35 +01:00
Robin Appelman
e656af4c83 Root always exists 2014-12-17 16:09:41 +01:00
jknockaert
e426375114 update enc stream 2014-12-17 15:48:05 +01:00
Robin Appelman
d075b1d743 Add the storage id to the mount config 2014-12-17 14:22:03 +01:00
Jan-Christoph Borchardt
6f4ed59883 use method to only visually hide elements, show only for screen reader 2014-12-17 14:12:13 +01:00
Robin Appelman
fd85424742 Add getMountPoint to FileInfo 2014-12-17 14:03:50 +01:00
Robin Appelman
95a145f67f Load mount specific options from the mount config 2014-12-17 14:03:50 +01:00
Jan-Christoph Borchardt
532ba99f1c Merge pull request #12895 from owncloud/favorites-polish
polish the Favorites design
2014-12-17 13:42:20 +01:00
Jan-Christoph Borchardt
e2977ff4c1 fix favorite star flickering on empty state page 2014-12-17 13:40:57 +01:00
Vincent Petry
ab35459cac Propertly restore thumbnail on cancel/rename/move
Since the thumbnail is now in a div, the code that tries to change the
thumbnail have been adapted here as well.
2014-12-17 13:12:57 +01:00
Jan-Christoph Borchardt
1b5f43e7c3 add text to Settings button 2014-12-17 12:20:38 +01:00
Jan-Christoph Borchardt
9f9aa44b57 add alt text to 'Cancel upload' button 2014-12-17 12:05:45 +01:00
Jan-Christoph Borchardt
4344b3d3cf fix Delete action text being translatable 2014-12-17 11:55:35 +01:00
Jan-Christoph Borchardt
edc8967c93 add text to Delete action 2014-12-17 11:50:58 +01:00
Jan-Christoph Borchardt
e5875fda38 properly name form labels for the file selection 2014-12-17 11:40:21 +01:00
Jan-Christoph Borchardt
bac2683c55 fix alt text for breadcrumbs home icon 2014-12-17 11:26:42 +01:00
Morris Jobke
d41082f4d6 first step to drop \OCP\Config:: in favour of IConfig 2014-12-17 11:12:37 +01:00
Jan-Christoph Borchardt
c7cf0d0386 fix file list summary left alignment 2014-12-17 11:08:39 +01:00
Jan-Christoph Borchardt
433d1de923 fix empty state for Favorites 2014-12-17 11:04:22 +01:00
Jan-Christoph Borchardt
f2d7fad0fb put Favorites second in list, after 'All files' 2014-12-17 11:00:16 +01:00
Jenkins for ownCloud
6d80524e67 [tx-robot] updated from transifex 2014-12-17 01:56:41 -05:00
Thomas Müller
775f6a1354 make sure styles and scripts are only loaded once 2014-12-16 18:26:43 +01:00
Jenkins for ownCloud
5b9c453071 [tx-robot] updated from transifex 2014-12-16 01:55:32 -05:00
Lukas Reschke
be3d4fd303 Merge pull request #12360 from owncloud/files-tags
Add favorites to files app
2014-12-15 19:55:18 +01:00
Lukas Reschke
a0a3322b94 Remove unused file
That file is apparently unused - introduced with 30b58f5677

I guess we can remove it...
2014-12-15 17:29:16 +01:00
Vincent Petry
207d77e5cd Fixed small code style issues 2014-12-15 17:20:41 +01:00
Jörn Friedrich Dreyer
6602d3ac77 Merge pull request #12555 from owncloud/app_specific_search
introduce inApps[] filter for search via ajax query
2014-12-15 16:14:40 +01:00
Vincent Petry
976baed5f9 Remove spinner when toggling file favorite 2014-12-15 15:50:57 +01:00
Vincent Petry
33eb4483b2 Fixed has-favorites CSS 2014-12-15 15:18:29 +01:00
Jan-Christoph Borchardt
fb220a1e09 shift actions to the left a bit to account for right shift due to favorites action, not not overlap with size info 2014-12-15 15:12:37 +01:00
Jan-Christoph Borchardt
4dbe8c6771 add CSS to shift header to account for when favorites are present 2014-12-15 15:11:51 +01:00
Vincent Petry
1d22cd5b22 Use star icon for favorites 2014-12-15 12:44:41 +01:00
Vincent Petry
dfe922b72a Correctly replace favorites icon when re-rendering file actions 2014-12-15 12:10:54 +01:00
Vincent Petry
a5bb66f4a7 Added favorites feature to the files app 2014-12-15 12:10:54 +01:00
Morris Jobke
b831914aa6 Merge pull request #11991 from owncloud/bower-jquery-ui
bower jquery-ui - exported changes to a separate css file
2014-12-15 11:39:31 +01:00
Jenkins for ownCloud
036456fe16 [tx-robot] updated from transifex 2014-12-15 01:54:30 -05:00
Jenkins for ownCloud
6ae0217326 [tx-robot] updated from transifex 2014-12-14 01:54:56 -05:00
Morris Jobke
5b3971f002 Merge pull request #12639 from owncloud/bad_mtime_format
Fix formatting of bad dates from external storages
2014-12-13 10:07:10 +01:00
Morris Jobke
edcd2f2706 bower jquery-ui - exported changes to a separate css file 2014-12-13 09:47:34 +01:00
Morris Jobke
29e1c3a898 Merge pull request #12795 from owncloud/files-layoutchanges
Move file thumbnail element into the label tag
2014-12-13 09:00:43 +01:00
Jenkins for ownCloud
416e21d902 [tx-robot] updated from transifex 2014-12-13 01:55:24 -05:00
Robin McCorkell
fdbb68a3c3 Return ? if mtime is 0 or -1
Tooltip contains 'Unable to determine date'. Fixes #6395
2014-12-12 23:54:18 +00:00
Vincent Petry
4b57892c4e Merge pull request #12778 from owncloud/searchbytags2
Added searchByTags to view, storage and cache
2014-12-12 14:27:19 +01:00
Thomas Müller
6b4502adeb Merge pull request #12812 from owncloud/remove-53-workaround
Remove conditional check for 5.3 compatibility
2014-12-12 13:16:49 +01:00
Joas Schilling
4f92e4a233 Merge pull request #12808 from owncloud/add-special-parameterlist-to-manager
Add special parameterlist to manager
2014-12-12 13:03:26 +01:00
Vincent Petry
ffd5e93f70 Merge pull request #12789 from owncloud/external-icon
fix and compress files_external icon
2014-12-12 12:46:57 +01:00
Lukas Reschke
5eaa2214b8 Remove conditional check for 5.3 compatibility 2014-12-12 12:25:59 +01:00
Robin Appelman
3bf0922b13 Merge pull request #12527 from owncloud/js-pluginsystem
Simple Plugin system for Javascript
2014-12-12 11:43:31 +01:00
Joas Schilling
46def69574 Specify list of activity parameters for sharing extension 2014-12-12 11:41:01 +01:00
Vincent Petry
15ecb28d50 Make $userId mandatory for searchByTags
$userId is now a mandatory parameter for searchByTags.

Also fixed some places in the code where the argument was missing (Node
API and View)
2014-12-12 11:18:35 +01:00
Gadzy
ba3957fb8a Check for share by link enabled
Display "Shared by link" section only if sharing by link is enabled.
2014-12-12 10:23:51 +01:00
Morris Jobke
e969fe6b12 Merge pull request #12698 from owncloud/handle_readonly_shared_files
Handle readonly shared files
2014-12-12 08:34:28 +01:00
Jenkins for ownCloud
68932b30fd [tx-robot] updated from transifex 2014-12-12 01:55:24 -05:00
Vincent Petry
a89aad05c0 Replace input checkbox CSS selector with .electCheckBox 2014-12-11 18:23:30 +01:00
Vincent Petry
81e9d43e23 Move file thumbnail into the label element 2014-12-11 18:21:25 +01:00
Vincent Petry
25dde7e93b Added searchByTags to view, storage and cache 2014-12-11 17:38:50 +01:00
Jörn Friedrich Dreyer
c615b3527f show readonly message in file conflict dialog, make it always selected 2014-12-11 16:32:27 +01:00
Jan-Christoph Borchardt
c588ccf96a fix and compress files_external icon 2014-12-11 15:33:31 +01:00
Jenkins for ownCloud
dc506dcfbf [tx-robot] updated from transifex 2014-12-11 01:55:27 -05:00
Thomas Müller
80ae311329 Merge pull request #11892 from owncloud/remove_triggerupdate
Remove triggerupdate.php & add quiet option for CLI scanner
2014-12-10 16:17:29 +01:00
Jörn Friedrich Dreyer
1d490b559c introduce inApps[] filter for search via ajax query, make file results show up in files app only
use more flexible return type

check array with !empty instead of count
2014-12-10 15:51:59 +01:00
Jörn Friedrich Dreyer
0f17486c1d make path absolute 2014-12-10 11:04:17 +01:00
Morris Jobke
e3de51078d Merge pull request #12090 from AdamWill/google-rename-delete
google: delete original after successful rename
2014-12-10 09:10:17 +01:00
Morris Jobke
3026cdbc80 Merge pull request #12549 from owncloud/shared-cache-non-existing
Dont return cached date in shared cache when the file doesn't exist
2014-12-10 08:49:40 +01:00
Jenkins for ownCloud
ea95bb0189 [tx-robot] updated from transifex 2014-12-10 01:55:34 -05:00
Morris Jobke
bfcd5a3802 Merge pull request #11214 from owncloud/issue/10836
Add an option to disallow sending sharing emails to non-owncloud users
2014-12-09 14:05:52 +01:00
Joas Schilling
26861a98c5 Merge pull request #12568 from owncloud/autoload-encryption-classes
Fix namespaces of encryption classes and encryption tests
2014-12-09 12:56:57 +01:00
Joas Schilling
539c0aeb04 Add an option to disallow sending sharing emails to non-owncloud users
Fix #10836
2014-12-09 11:32:39 +01:00
Thomas Müller
9ca8b864e2 Merge pull request #12708 from owncloud/l10nsaved
translated saved message in files external
2014-12-09 10:46:35 +01:00
Lukas Reschke
17f85ec5a9 Merge pull request #12688 from owncloud/rename-alt
introduce alt text for rename icon - fixes #12067
2014-12-09 10:37:33 +01:00
Lukas Reschke
3566edbcec Merge pull request #12715 from owncloud/fix-broken-personal-page
remove duplicate loaded personal.js - fixes #12674
2014-12-09 10:35:08 +01:00
Morris Jobke
4d2573bff7 Merge pull request #12709 from owncloud/fix-11955
Skip headers that can not be split
2014-12-09 09:52:59 +01:00
Joas Schilling
b85e34c1da Correctly namespace encryption tests 2014-12-09 09:47:27 +01:00
Joas Schilling
e67fe0336b Use self:: instead of the class name in encryption tests 2014-12-09 09:47:27 +01:00
Joas Schilling
efac8ced90 Update OCA\Encryption to OCA\Files_Encryption in the encryption app itself 2014-12-09 09:47:26 +01:00
Joas Schilling
78a307995c Fix namespace of Files_Encryption outside of the app 2014-12-09 09:47:26 +01:00
Joas Schilling
7f7006643f Fix namespace of files_encryption classes and autoload them 2014-12-09 09:47:26 +01:00
Thomas Müller
c36bac3abd Merge pull request #12406 from owncloud/drop-getApps-getUsers
Config cleanup - OC_Preferences refactoring
2014-12-09 09:36:38 +01:00
Morris Jobke
b9fab7441c remove duplicate loaded personal.js - fixes #12674 2014-12-09 09:27:10 +01:00
Jenkins for ownCloud
8f8f9deb66 [tx-robot] updated from transifex 2014-12-09 01:56:38 -05:00
Lukas Reschke
25a87d4058 Merge pull request #12577 from owncloud/public-mount-api
Add a public api for apps to add mounts
2014-12-08 22:57:33 +01:00
Morris Jobke
0d4f0ab871 reduce OC_Preferences, OC_Config and \OCP\Config usage
* files_encryption
* files_versions
* files_trashbin
* tests
* status.php
* core
* server container
2014-12-08 22:42:37 +01:00
Victor Dubiniuk
adc7135429 Skip headers that can not be split 2014-12-08 23:43:43 +03:00
Volkan Gezer
26645c072a translated saved message in files external 2014-12-08 21:40:15 +01:00
Lukas Reschke
de3ead5ab9 Merge pull request #12704 from owncloud/fix-12647-2
preserve an asterisk at the start when escaping a search term
2014-12-08 19:14:59 +01:00
Arthur Schiwon
0577bb569a add doc 2014-12-08 17:22:52 +01:00
Arthur Schiwon
45443ee28c preserve an asterisk at the start when escaping a search term 2014-12-08 17:19:57 +01:00
Robin Appelman
baf5c44bec Merge pull request #12696 from owncloud/trashbin-selected-delete
Fix deleting selected files in the trashbin
2014-12-08 16:30:53 +01:00
Morris Jobke
1bfa405a93 introduce alt text for rename icon - fixes #12067 2014-12-08 15:49:09 +01:00
Robin Appelman
b2d4e53f66 Fix deleting selected files in the trashbin 2014-12-08 15:16:15 +01:00
Morris Jobke
1362c0b67a Merge pull request #12452 from owncloud/server2server-ng-ocs
OCS API for server-to-server sharing
2014-12-08 14:12:03 +01:00
Lukas Reschke
d3188159d2 Merge pull request #12394 from owncloud/files-fileactionsimprovements
Improve FileActions JS to allow for custom rendering
2014-12-08 11:30:21 +01:00
Jenkins for ownCloud
2784d580bd [tx-robot] updated from transifex 2014-12-08 01:54:57 -05:00
Thomas Müller
d571f42860 Merge pull request #12668 from owncloud/keepspace
Keep spaces out of the string
2014-12-07 13:15:37 +01:00
Jenkins for ownCloud
8ee9ee29ea [tx-robot] updated from transifex 2014-12-07 01:54:32 -05:00
Volkan Gezer
57452a3641 Keep spaces out of the string
Otherwise translators cannot notice them on Transifex.
2014-12-07 01:57:34 +01:00
Jenkins for ownCloud
94eb2e782f [tx-robot] updated from transifex 2014-12-06 01:54:56 -05:00
Lukas Reschke
1be5a3ca89 Merge pull request #12166 from helmutschneider/aws-2.7.5
Upgrade AWS sdk to 2.7.5. Fixes #12023
2014-12-05 20:12:53 +01:00
Lukas Reschke
116a1b366a Merge pull request #11485 from brumsoel/master
Fix timestamp comparator return value
2014-12-05 19:53:09 +01:00
Vincent Petry
89db2a0277 Merge pull request #12523 from owncloud/port-11747
Only store user credentials when SMB_OC storage is enabled
2014-12-05 18:04:06 +01:00
Jenkins for ownCloud
4d53f163fd [tx-robot] updated from transifex 2014-12-05 01:55:52 -05:00
Arthur Schiwon
1c369093e5 cache total user count
Conflicts:
	apps/user_ldap/user_ldap.php
2014-12-04 19:09:13 +01:00
Arthur Schiwon
ee168a121d Forward port of #12493
add ldap-search command to occ

Conflicts:
	apps/user_ldap/appinfo/register_command.php

LDAP search filter creation changes:

1. do not prepend * wildcard to search terms. Will result in faster search, but
you don't find "foobar"  when looking for "bar"
2. advanced behaviour when search string contains a space and multiple search
attributes are present. The search string is split into single words. The
resulting filter requires that each word at least appears once in any search
attribute. This is supposed to return better results in big LDAPs.

trim search string before passing it on
2014-12-04 19:02:09 +01:00
Vincent Petry
bf887eca8b Remove obsoleted filelist prototype backup in tests 2014-12-04 18:39:20 +01:00
Robin Appelman
a369d78124 Use the mount config api for files_external 2014-12-04 16:47:30 +01:00
Robin Appelman
f4701d7721 Add public api for mount configurations 2014-12-04 16:47:27 +01:00
Morris Jobke
a0488453ac Merge pull request #12596 from owncloud/remove-travis-traces
Remove last traces of travis integration
2014-12-04 16:04:15 +01:00
Jörn Friedrich Dreyer
3cdaa4094f add quiet option, ref #8794 2014-12-04 13:44:30 +01:00
Jörn Friedrich Dreyer
7ef6df04da remove triggerupdate, ref #11872 2014-12-04 13:44:30 +01:00
Bjoern Schiessle
698ecbf308 OCS API for server-to-server sharing 2014-12-04 13:18:13 +01:00
Bjoern Schiessle
1509dd1358 update error message 2014-12-04 12:01:11 +01:00
Bjoern Schiessle
0dd44eaf27 OC8 and later requires PHP >= 5.4, so we can remove the check from the encryption app 2014-12-04 11:17:44 +01:00
Morris Jobke
2c5e4b3d3f Remove last traces of travis integration 2014-12-04 10:09:13 +01:00
Jenkins for ownCloud
5aad902507 [tx-robot] updated from transifex 2014-12-04 01:54:42 -05:00
brumsel
0dcfd5f20b Modified filesort test cases to test for large sizes & timestamps 2014-12-03 23:45:57 +01:00
brumsel
4ba520e214 Merge remote-tracking branch 'upstream/master' 2014-12-03 23:04:49 +01:00
Bjoern Schiessle
0a173e2b58 fix typo 2014-12-03 19:46:32 +01:00
Morris Jobke
3fdb1937a3 Merge pull request #12382 from owncloud/enc_reorganize_folders2
[encryption] reorganize folder structure (second try to make Jenkins happy)
2014-12-03 16:08:40 +01:00
Thomas Müller
6daa588e1c Merge pull request #12556 from owncloud/add-route-for-versions
Add route for download of versions
2014-12-03 14:01:58 +01:00
Lukas Reschke
8c8c257ce3 Merge pull request #12554 from owncloud/versions-app-autoload
Autoload lib files of versions app
2014-12-03 09:34:57 +01:00
Jenkins for ownCloud
af50df8912 [tx-robot] updated from transifex 2014-12-03 01:54:32 -05:00
Lukas Reschke
c4e0c02526 Add route for download of versions
Otherwise on master it was not possible anymore to download older versions.

Fixes itself.
2014-12-02 17:52:31 +01:00
Morris Jobke
f9958153ef Merge pull request #12333 from owncloud/delete-selected-files
Fix deleting non deletable files by selecting them
2014-12-02 17:32:04 +01:00
Joas Schilling
1bd018a70c Autoload exception from files_trashbin 2014-12-02 17:26:42 +01:00
Joas Schilling
694003d147 Autoload lib files of versions app 2014-12-02 17:21:19 +01:00
Bjoern Schiessle
9ca9acf3f8 small fixes 2014-12-02 16:08:06 +01:00
Bjoern Schiessle
2e78217f17 delete old keys if file was moved to a different mount point 2014-12-02 16:03:54 +01:00
Bjoern Schiessle
49cfc30359 upgrade to new folder structure 2014-12-02 16:03:54 +01:00
Robin Appelman
ce10b93519 Dont return cached date in shared cache when the file doesn't exist 2014-12-02 15:28:11 +01:00
Vincent Petry
c02ef69521 Simple Plugin system for Javascript 2014-12-01 16:20:44 +01:00
Lukas Reschke
805be635fa Only store user credentials when SMB_OC storage is enabled
Conflicts:
	apps/files_external/lib/smb_oc.php
2014-12-01 11:18:29 +01:00
Adam Williamson
415411a3d5 google: delete original after successful rename
In GDrive, filenames aren't unique, and directories are just
special files - so you can have multiple files with the same
name, multiple directories with the same name, and even files
with the same names as directories.

OC doesn't handle this at all, though, and just wants to act
as if file and directory names *are* unique. So when renaming,
we must check if there's an existing object with the same
file or directory name before we commit the rename, and
explicitly delete it if the rename is successful. (Other
providers like dropbox do the same for files, but intentionally
don't do it for directories; we really need to do it for
directories too.)

A good way to observe this is to run the storage unit tests
and look at the state of the Drive afterwards. Without this
commit, there will be several copies of all the test files
and directories. After this commit, there's just one of each.

We can't just say "hey, Drive lets us do this, what's the
problem?" because we don't handle multiple-objects, same-name
cases - getDriveFile() just bails and prints an error if it
searches for the file or directory with a given name and gets
multiple results.
2014-11-30 15:34:35 -08:00
Jenkins for ownCloud
40badba703 [tx-robot] updated from transifex 2014-11-30 01:54:25 -05:00
Jenkins for ownCloud
83d097c524 [tx-robot] updated from transifex 2014-11-29 01:54:28 -05:00
Jenkins for ownCloud
96b0328d39 [tx-robot] updated from transifex 2014-11-28 01:55:29 -05:00
Jenkins for ownCloud
87a2aabb98 [tx-robot] updated from transifex 2014-11-27 01:54:46 -05:00
Morris Jobke
60f7a86323 Merge pull request #12448 from owncloud/no503forRoot
Don't show favicon to prevent iteration through subfolders
2014-11-26 17:06:43 +01:00
Lukas Reschke
8af346a84d Don't show favicon to prevent iteration through subfolders
The codepath for generating the favicons iterates through subnodes and if one of those nodes is unavailable is throwing a 503 exception. Since these favicons don't have any use except of "making a tool for developers looking nicer" I consider it feasible to remove them.
2014-11-26 12:38:26 +01:00
Robin Appelman
a2457b5fb9 Merge pull request #6989 from AdamWill/google-1
Migrate Google Drive external storage app to v1.0.6-beta of the google-api-php-client library
2014-11-26 12:17:57 +01:00
Robin Appelman
e8cbb8e2d8 Add js unit test 2014-11-26 12:14:35 +01:00
Robin Appelman
9c86665ef4 Dont show the delete button for selected files if one of the selected files is not deletable 2014-11-26 12:14:35 +01:00
Robin Appelman
4321d7522e Check if files are deletable before trying to delete them 2014-11-26 12:14:35 +01:00
Bjoern Schiessle
a90606fb14 change private/public key names for consistency reasons 2014-11-26 10:57:47 +01:00
Bjoern Schiessle
266f1a2afa harmonize copyright notice 2014-11-26 10:57:47 +01:00
Bjoern Schiessle
fd86d76f98 new folder structure for keys
all keys are now in files_encryption/key/path_to_file/filename/
share keys are named: user.shareKey
file key is named: fileKey
2014-11-26 10:57:47 +01:00
Lukas Reschke
c749570a06 Merge pull request #12411 from owncloud/unknown-command-windows
Replace some more "command -v" calls with the Helper method
2014-11-26 10:29:41 +01:00
Morris Jobke
c5fa8f1bdc Merge pull request #12421 from owncloud/issue/6101-remove-namespace-permission-constants
Issue/6101 remove namespace permission constants
2014-11-26 08:31:23 +01:00
Jenkins for ownCloud
3766d98df6 [tx-robot] updated from transifex 2014-11-26 01:54:31 -05:00
Thomas Müller
e6a7022037 Merge pull request #12410 from owncloud/no_session_for_public_share_key
don't store private public-share-key in session
2014-11-25 22:26:40 +01:00
Joas Schilling
0274dcba57 Replace some more "command -v" calls with the Helper method 2014-11-25 18:10:03 +01:00
Joas Schilling
2c39aec8cb Replace deprecated constant with new class constant 2014-11-25 16:30:21 +01:00
Bjoern Schiessle
4643a5d238 replace \OC:: with \OC::->getSession() 2014-11-25 16:15:32 +01:00
Bjoern Schiessle
1d33503487 we no longer need to keep the session open for encryption 2014-11-25 13:37:11 +01:00
Bjoern Schiessle
917bef39b7 don't store private public-share-key in session 2014-11-25 12:32:25 +01:00
Bjoern Schiessle
f274833403 remove unused variable 2014-11-25 10:12:10 +01:00
Morris Jobke
6fb2477fb7 Merge pull request #12262 from owncloud/removeAbsoluteDirectoryPathFromTemplate
Don't disclose relative directory path for single shared files of user
2014-11-25 10:09:16 +01:00
Morris Jobke
bc3c835f6a Merge pull request #12390 from owncloud/use-session-in-case
Close session only if encryption app is not enabled
2014-11-25 09:32:16 +01:00
Morris Jobke
02095d4f20 Merge pull request #11837 from owncloud/fix-11328
unify count filters and introduce display name attribute detection
2014-11-24 18:13:01 +01:00
Vincent Petry
e689bc745f Improve FileActions JS to allow for custom rendering
This improves the OCA.Files.FileActions class to support passing a
"render" function in the action object.

The default function "_defaultRenderFunction" is used by default and
renders actions in the usual actions container.

Moved "Rename" and "Delete" to custom render functions.
2014-11-24 16:26:50 +01:00
Bjoern Schiessle
1645c8f819 use login name to verify password 2014-11-24 15:44:43 +01:00
Lukas Reschke
8589079590 Close session only if encryption app is not enabled
Fixes https://github.com/owncloud/core/issues/12389
2014-11-24 15:02:49 +01:00
Morris Jobke
8782b2237c Merge pull request #12084 from owncloud/sharing_fix_shared_with_info
sharing: make sure that we only find the shares from a given owner
2014-11-24 11:44:43 +01:00
Jenkins for ownCloud
0edcfc1dc1 [tx-robot] updated from transifex 2014-11-24 01:54:35 -05:00
Jenkins for ownCloud
fa3f7ad9e9 [tx-robot] updated from transifex 2014-11-22 01:55:21 -05:00
Arthur Schiwon
9aef83b579 make scrutinizer happier and always count users on assisted mode, even with xp'ed mode (would be a regression otherwise) 2014-11-22 00:51:41 +01:00
Arthur Schiwon
503de94392 make updateCount work properly with new xp'd mode as well as without 2014-11-21 16:23:56 +01:00
Bjoern Schiessle
a7ebfe87c9 also check for the correct owner if it was submitted 2014-11-21 16:17:37 +01:00
Arthur Schiwon
c07c338c90 fix counting when ldapPagingSize is 0 2014-11-21 14:51:20 +01:00
Jenkins for ownCloud
f8421958b3 [tx-robot] updated from transifex 2014-11-21 02:54:26 -05:00
Arthur Schiwon
b5e707b1bf trigger count on the correct filter 2014-11-20 18:31:40 +01:00
Arthur Schiwon
6b6147dafd phpdoc and mixed up letters 2014-11-20 18:31:40 +01:00
Arthur Schiwon
031d6c179f better readbility, no effective changes 2014-11-20 18:31:40 +01:00
Arthur Schiwon
0e6d47123a use underscore.js for undefined checks 2014-11-20 18:31:40 +01:00
Arthur Schiwon
d8bb8afee3 this happens already before counting, no need anymore 2014-11-20 18:31:40 +01:00
Arthur Schiwon
c9e865629e JS doc 2014-11-20 18:31:40 +01:00
Arthur Schiwon
4a3fe42b16 a corrected email attribute needs to be saved, not only returned 2014-11-20 18:31:39 +01:00
Arthur Schiwon
f9b4f5f4e5 to reassure that selected attributes still work, do not count all matching entries but limit it to 1 in order to make it faster 2014-11-20 18:31:39 +01:00
Arthur Schiwon
71944a59a5 detectors (email, displayname..) are now started in one place, triggered from only 2 places. more reliable structure and flow, saves requests 2014-11-20 18:31:39 +01:00
Arthur Schiwon
f725cc66a3 consolidate user count filter in wizard and user back end 2014-11-20 18:31:39 +01:00
Arthur Schiwon
cb3af1dce2 detect user display name attribute and return user count depending on its presence 2014-11-20 18:31:39 +01:00
Vincent Petry
391ece46e3 Fix file upload to ext storage when recovery key is enabled
Fixes an issue when uploading files to external storage when recovery
keys are enabled

The Util class only works with real users, so instantiating it with the
virtual recovery key user or public key user can cause issues.
2014-11-20 16:43:44 +01:00
Lukas Reschke
713c8e0dac Merge pull request #12325 from owncloud/removeunneccessarylang
cleanup languages. closes #11274
2014-11-20 16:12:49 +01:00
Thomas Müller
cbb9caf030 Merge pull request #12226 from owncloud/remove-phpass
Remove phpass and migrate to new Hasher interface
2014-11-20 14:59:59 +01:00
Morris Jobke
46e6104795 Merge pull request #12297 from owncloud/issue/10991-all-testcase
Issue/10991 all testcase
2014-11-20 14:53:18 +01:00
Volkan Gezer
995fe4a176 cleanup languages. closes #11274 2014-11-20 14:46:17 +01:00
Morris Jobke
288acb55a0 Merge pull request #12305 from owncloud/sharelist-nodelete
Remove delete button in shared with others list
2014-11-20 13:32:07 +01:00
Vincent Petry
63fa8ec69a JSHint fixes in sharedfilelistSpec unit test file 2014-11-19 17:44:05 +01:00
Vincent Petry
98ec0451be Remove delete button in shared with others list
Whenever a file is shared with others or with link, a delete button used
to be visible that triggered a direct deletion.

This button has been removed to avoid accidental deletion from people
who might believe it was an unshare button. Unsharing is still possible
inside the share dropdown.
2014-11-19 17:42:57 +01:00
Joas Schilling
76ebd3a050 Make apps/ extend the \Test\TestCase and fix overwritten methods 2014-11-19 14:52:09 +01:00
Joas Schilling
bb540722cd Use base class to reset the file mapper 2014-11-19 14:52:07 +01:00
Lukas Reschke
284ba5b688 Merge pull request #12290 from owncloud/ext-preventbreakageduetobugs2
Show warning when invalid user was passed
2014-11-19 14:27:32 +01:00
Lukas Reschke
1c8f9564a4 Merge pull request #11696 from owncloud/addWarningToEncryptionLostPassword
Warn for password reset when files_encryption is enabled
2014-11-19 13:05:02 +01:00
Morris Jobke
dc9eaf59dc Merge pull request #12276 from owncloud/undelete-only-if-files-trashin-is-enabled
Only show undelete capability if files_trashbin is enabled
2014-11-19 11:42:19 +01:00
Jenkins for ownCloud
705976ba0a [tx-robot] updated from transifex 2014-11-19 01:54:59 -05:00
Lukas Reschke
61641293f4 Only show undelete capability if files_trashbin is enabled
Fixes the OCS capability API at /ocs/v1.php/cloud/capabilities
2014-11-18 23:06:39 +01:00
Lukas Reschke
a6ebb17610 Remove unused variable and make Scrutinizer happy. 2014-11-18 18:52:00 +01:00
Lukas Reschke
f3ab4f3faf Don't disclose relative directory path for single shared files of user
The "dir" key is used within the public sharing template to indicate in which directory the user currently is when sharing a directory with subdirectories. This is needed by the JS scripts.

However, when not accessing a directory then "dir" was set to the relative path of the file (from the user's home directory), meaning that for every public shared file the sharee can see the path.
(For example if you share the file "foo.txt" from "finances/topsecret/" the sharee would still see the path "finances/topsecret/" from the shared HTML template)

This is not the excpected behaviour and can be considered a privacy problem, this patch addresses this by setting "dir" to an empty key.
2014-11-18 18:51:57 +01:00
Lukas Reschke
5f07fb15dc Fix case-sensitivity 2014-11-18 18:50:47 +01:00
Lukas Reschke
1b85f40cbe $file only contains the filename and not the absolute path, that means that files in a subdirectory will not get properly resolved and an empty filesize is returned.
This feature only exists on master.
2014-11-18 17:14:26 +01:00
Morris Jobke
230e517f35 Merge pull request #12220 from owncloud/remove-unused-code
Remove unused code
2014-11-18 10:36:32 +01:00
Jenkins for ownCloud
91f7c0af6e [tx-robot] updated from transifex 2014-11-18 01:54:31 -05:00
Bjoern Schiessle
f6efbfcf0b listen to the post_passwordReset hook, backup the old keys and create a new key pair for the user 2014-11-17 17:50:20 +01:00
Morris Jobke
146cb920c9 Merge pull request #12218 from owncloud/issue/10991-fixes
Issue/10991 Make unit tests pass on windows
2014-11-17 16:44:45 +01:00
Lukas Reschke
8dbedbb849 Remove unused code
We don't support direct updates from older ownCloud versions except the previous one therefore this code is unused and can be removed.
2014-11-17 14:01:39 +01:00
Lukas Reschke
8595b76df2 Remove phpass and migrate to new Hasher interface
This PR removes phpass and migrates to the new Hasher interface.

Please notice that due to https://github.com/owncloud/core/issues/10671 old hashes are not updated but the hashes are backwards compatible so this shouldn't hurt.
Once the sharing classes have a possibility to update the passwords of single shares those methods should be used within the newHash if block.
2014-11-17 13:39:13 +01:00
Joas Schilling
6625d5c88f Correctly restore previous root mount point after testing 2014-11-17 10:48:19 +01:00
Joas Schilling
b228226700 Fix single run of encryption tests and usages of uniqid() and fopen() 2014-11-17 10:48:13 +01:00
Joas Schilling
a3a064fe96 Skip some more tests on Windows which just can not work at all 2014-11-17 10:48:06 +01:00
Jenkins for ownCloud
9df50c7be6 [tx-robot] updated from transifex 2014-11-17 01:54:33 -05:00
Jenkins for ownCloud
55889d7eb4 [tx-robot] updated from transifex 2014-11-16 01:55:00 -05:00
Jenkins for ownCloud
580d27eed2 [tx-robot] updated from transifex 2014-11-15 01:54:28 -05:00
Vincent Petry
c941c3fa51 Show warning when invalid user was passed
Sometimes there are bugs that cause setupFS() to be called for
non-existing users. Instead of failing hard and breaking the instance,
this fix simply logs a warning.
2014-11-14 16:43:23 +01:00
Vincent Cloutier
fad621140b Added download size on public sharing 2014-11-14 16:26:59 +01:00
Lukas Reschke
988c85d292 Refactor file sharing public link handling
fixes download issue introduced by #10755

Conflicts:
	apps/files_sharing/public.php
2014-11-14 16:26:59 +01:00
Jörn Friedrich Dreyer
df18bd3e0d Merge pull request #12162 from owncloud/ext-s3-missingfolderwithsamename
Do not remove dir entry if it has the same name as the parent
2014-11-14 10:37:10 +01:00
Jenkins for ownCloud
0811b39e5f [tx-robot] updated from transifex 2014-11-14 01:54:47 -05:00
Johan Björk
e0056c4a0d Upgrade AWS sdk to 2.7.5 2014-11-13 23:37:34 +01:00
Vincent Petry
914f4cb6f2 Do not remove dir entry if it has the same name as the parent
This fixes an issue when a subdir has the same name as its parent, it
would get exluded from the list.
2014-11-13 17:37:56 +01:00
blizzz
559b34e53d Merge pull request #12005 from owncloud/bower-multiselect
Move multiselect to user_ldap
2014-11-13 14:43:06 +01:00
Vincent Petry
5ca869c324 Merge pull request #9177 from owncloud/jsdocexperiment
Improved JS Docs + added build script for JS Docs
2014-11-13 11:16:08 +01:00
Jenkins for ownCloud
a069171cda [tx-robot] updated from transifex 2014-11-13 01:54:36 -05:00
Morris Jobke
f39cb3fbc9 Migrate multiselect to user_ldap 2014-11-13 00:47:14 +01:00
Vincent Petry
e0b797c43c Merge pull request #12087 from AdamWill/google-touch
google: fix touch() when $mtime is set (Google wants RFC3339) #11267
2014-11-12 18:24:57 +01:00
Jenkins for ownCloud
1846fb0285 [tx-robot] updated from transifex 2014-11-12 01:55:24 -05:00
Morris Jobke
081787d6ae Fix infinite loop if count and limit is 0
* otherwise it will always think it hits the limit and need another round to fetch additional results
2014-11-11 12:15:30 +01:00
Morris Jobke
9368de5a8b Merge pull request #11789 from owncloud/fix-11762
[LDAP] Login: dont fail with 500 if configured display name attribute is not set
2014-11-11 11:16:41 +01:00
Jenkins for ownCloud
664cc4ac0e [tx-robot] updated from transifex 2014-11-11 01:55:23 -05:00
Adam Williamson
f76419d190 fix touch() when $mtime is set (Google wants RFC3339) #11267
ownCloud passes us a Unix time integer, but the GDrive API wants
an RFC3339-formatted date. Actually it wants a single particular
RFC3339 format, not just anything that complies will do - it
requires the fractions to be specified, though RFC3339 doesn't.

This resolves issue #11267 (and was also noted by PVince81 in
reviewing PR #6989).
2014-11-10 11:56:01 -08:00
Morris Jobke
2023878d53 Merge pull request #10966 from owncloud/storage-root-share-permissions
Dont' use mountpoint permissions as share permissions for external storages
2014-11-10 13:11:22 +01:00
Morris Jobke
8afb623f08 Merge pull request #12070 from owncloud/accessibility-fixes
Accessibility fixes
2014-11-10 13:06:46 +01:00
Vincent Petry
676b911b22 Merge pull request #12027 from owncloud/cleanup_exceptions
[encryption] clean up encryption exceptions
2014-11-10 12:46:53 +01:00
Jenkins for ownCloud
c3e3432662 [tx-robot] updated from transifex 2014-11-10 01:54:30 -05:00
Jenkins for ownCloud
46010655d2 [tx-robot] updated from transifex 2014-11-09 01:54:30 -05:00
Jenkins for ownCloud
da14a605d5 [tx-robot] updated from transifex 2014-11-08 01:54:35 -05:00
Adam Williamson
c237acb395 google: disable compression when curl is not available
This is a slightly hacky workaround for
https://github.com/google/google-api-php-client/issues/59 .
There's a bug in the Google library which makes it go nuts on
file uploads and transfer *way* too much data if compression is
enabled and it's using its own IO handler (not curl). Upstream
'fixed' this (by disabling compression) for one upload
mechanism, but not for the one we use. The bug doesn't seem to
happen if the google lib detects that curl is available and
decides to use it instead of its own handler. So, let's disable
compression, but only if it looks like the Google lib's check
for curl is going to fail.
2014-11-07 22:52:07 -08:00
Adam Williamson
b3bccce267 update google-api-php-client to 1.0.6-beta
Latest version with various bugfixes, also implements support
for using curl instead of its own io class when available; this
avoids the bug that causes severe excess bandwidth use due to
some kind of zlib issue.
2014-11-07 22:33:40 -08:00
Bjoern Schiessle
2af7256267 only set the values we need and make sure that we write the file info for both
the real file and the part file, because some information from the part file
might be needed later
2014-11-07 15:20:52 +01:00
Bjoern Schiessle
3d19bb2e51 also try to get file info from part file 2014-11-07 15:17:24 +01:00
Bjoern Schiessle
a10ae2816e clean up encryption exceptions 2014-11-07 13:48:31 +01:00
Lukas Reschke
e345697cab Merge pull request #11954 from owncloud/enc_stop_uploading_if_private_key_is_missing
Enc stop uploading if private key is missing
2014-11-07 11:19:04 +01:00
Jenkins for ownCloud
7d47d50724 [tx-robot] updated from transifex 2014-11-07 01:55:10 -05:00
Adam Williamson
04369fb9cc scrutinizer fix: explicitly declare Google class property $client 2014-11-06 21:28:05 -08:00
Adam Williamson
f9bd43ff03 scrutinizer fix: correct @return for getDriveFile() 2014-11-06 21:27:12 -08:00
Adam Williamson
5935758b3a bump google lib to c6949531d2 (post 1.0.3-beta, including query separator fix)
This is the upstream commit that merged my query separator fix. It's slightly
after the 1.0.3-beta tag. I eyeballed the other post 1.0.3-beta changes and
none of them looks like any kind of problem, so we may as well just use this
upstream state.
2014-11-06 18:47:11 -08:00
Adam Williamson
61d70b17ee google drive: set access type to 'offline' when requesting token
We need to do this in order to be able to refresh the access token without
prompting the user for their credentials every hour. This was the default
in 0.6 of the Google library, but needs to be explicitly specified in 1.0.
2014-11-06 18:47:11 -08:00
Adam Williamson
18707f5aba fix a bug in google-api-php-client: generates an auth url that doesn't work
Submitted upstream as https://github.com/google/google-api-php-client/issues/76
Google's php lib has a function to generate a URL for OAuth2 authentication.
It uses http_build_query() to generate the query part of the URL, and in PHP
5.3 or later, this uses an encoded ampersand - &amp; - as the query separator,
not a raw one. However, Google's OAuth server apparently can't handle encoded
ampersands as separators and so it fails.

This patch explicitly sets a raw ampersand as the separator. If Google decides
to fix their OAuth server instead of merging this patch into google-api-php-
client, we can drop this patch as soon as that happens.
2014-11-06 18:47:11 -08:00
Adam Williamson
d96c06f1a3 files_external/3rdparty: update google-api-php-client to 1.0.2-beta 2014-11-06 18:47:11 -08:00
Adam Williamson
62b859d66f Migrate Google Drive storage app to v1.0.0 of the client library 2014-11-06 18:47:11 -08:00
Robin Appelman
0f3fd89f7d Fix sharing tests 2014-11-06 18:31:41 +01:00
Robin Appelman
7ecd220715 Setup shared mounts for the correct user when setting up the filesystem for the non-logged in user 2014-11-06 18:31:40 +01:00
Robin Appelman
9c79c2fa17 Dont make real users in tests 2014-11-06 18:31:40 +01:00
Jan-Christoph Borchardt
a410055291 add relevant focus styles to the existing hover styles 2014-11-06 16:22:57 +01:00
Jan-Christoph Borchardt
af743efff0 add alt text for file actions, but leave empty since text is directly next to it 2014-11-06 15:33:38 +01:00
Bjoern Schiessle
8104a4e24e check if the provided password is really the current log-in password 2014-11-06 11:12:20 +01:00
Morris Jobke
226d43a1cf manage select2 via bower 2014-11-06 09:27:12 +01:00
Jenkins for ownCloud
fa4018d36c [tx-robot] updated from transifex 2014-11-06 01:55:04 -05:00
Jan-Christoph Borchardt
e869db47b0 unbold labels and folders 2014-11-05 14:13:09 +01:00
Thomas Müller
7f41048a33 Merge pull request #11962 from owncloud/fix-server-sharing-strings
adjust strings - fixed #11930
2014-11-05 13:43:23 +01:00
Bjoern Schiessle
c2a45c1238 throw exception if private key is missing 2014-11-05 13:05:46 +01:00
Vincent Petry
97cbec8b8d Merge pull request #11853 from owncloud/close-session-for-trashbin
Close session for files_trashbin
2014-11-05 12:44:10 +01:00
Thomas Müller
8116d903dd adjust strings - fixed #11930 2014-11-05 11:08:17 +01:00
Jenkins for ownCloud
c8f55e7f87 [tx-robot] updated from transifex 2014-11-05 01:54:36 -05:00
Vincent Petry
ee6d8c9d58 Store curl error message directly 2014-11-04 17:37:15 +01:00
Bjoern Schiessle
0580c232d7 still try to encrypt files, even if the session is not initialized. The stream wrapper will throw an error which is better than silently continue. 2014-11-04 17:16:36 +01:00
Vincent Petry
768f3979e0 Check for cert bundle existence before using it 2014-11-04 16:44:42 +01:00
Vincent Petry
79a7297880 Merge pull request #11934 from owncloud/trash-restorefixonlyrescantrashfolder
Only rescan trash folder when checking deleted versions
2014-11-04 14:16:58 +01:00
blizzz
b26f11c16f Merge pull request #11362 from mark0n/rm_ldap_conf_cli
Add a CLI command that deletes an LDAP config
2014-11-04 13:19:45 +01:00
Vincent Petry
97a51c46ed Only rescan trash folder when checking deleted versions
This fix prevents the file scanner to rescan the WHOLE storage and reset
the etags by mistake.
2014-11-04 12:29:42 +01:00
Morris Jobke
1979ec70a5 JS unit tests fix - use toBeUndefined() instead of toEqual(null) 2014-11-04 10:37:16 +01:00
Jenkins for ownCloud
287faf9923 [tx-robot] updated from transifex 2014-11-04 01:55:05 -05:00
blizzz
dc9ea893fd Merge pull request #11172 from owncloud/user-ldap-no-bcmath
Fix ldap convertSID2Str() / Remove BCMath dependency
2014-11-03 14:03:26 +01:00
Björn Schießle
79b650a023 Merge pull request #11825 from owncloud/fix_rename_files_in_shared_folder
move versions if a file was renamed in a shared folder
2014-11-03 12:53:14 +01:00
Andreas Fischer
d1410b46a9 user_ldap: Reimplement convertSID2Str() without BCMath dependency.
Also explicitly format sub-id integers as unsigned, which is required for
32-bit systems.
2014-11-03 12:07:53 +01:00
Jenkins for ownCloud
fd480d6c40 [tx-robot] updated from transifex 2014-11-02 01:54:24 -05:00
Jenkins for ownCloud
469b2655d5 [tx-robot] updated from transifex 2014-11-02 01:54:29 -04:00
Jenkins for ownCloud
d8f7780f4f [tx-robot] updated from transifex 2014-11-01 01:54:37 -04:00
Bjoern Schiessle
ebe1d3df0a don't move versions if only the mount point was renamed 2014-10-31 16:42:54 +01:00
Robin Appelman
83126ab675 Add unit tests 2014-10-31 15:22:08 +01:00
Robin Appelman
307071cfec Keep the share permissions from mountpoints 2014-10-31 14:43:32 +01:00
Robin Appelman
2705588073 Dont' use mountpoint permissions as share permissions for external storages 2014-10-31 14:43:32 +01:00
Jörn Friedrich Dreyer
fe9e6be35c test files external amazon s3 storage id migration 2014-10-31 14:26:09 +01:00
Jörn Friedrich Dreyer
69a3d8eb1a fix files_external storage id migration 2014-10-31 14:25:55 +01:00
Vincent Petry
0f3e6cb50a Improved Javascript docs for JSDoc
Added namespaces so that JSDoc can find them.
Fixed a few warnings.
Improved some comments.
2014-10-31 13:43:30 +01:00
Lukas Reschke
e0528c7598 Merge pull request #11876 from owncloud/remove-pointless-requires
remove unnecessary require calls - the ownCloud class loader is supposed...
2014-10-31 13:10:59 +01:00
Vincent Petry
a9b41cbf54 Merge pull request #11850 from owncloud/fix-11848
on xp'ed mode and switching configurations: save raw mode instead of tog...
2014-10-31 08:38:05 +01:00
Jenkins for ownCloud
e00f25e5b0 [tx-robot] updated from transifex 2014-10-31 01:55:39 -04:00
Vincent Petry
146c46b73a Merge pull request #11659 from jknockaert/master
rework getFileSize
2014-10-30 18:06:25 +01:00
Thomas Müller
f776bcd4a0 remove unnecessary require calls - the ownCloud class loader is supposed to take care of this 2014-10-30 17:20:40 +01:00
Jan-Christoph Borchardt
108cdeb892 Merge pull request #11867 from owncloud/settings-sidebar-admin
introduce sidebar for admin page
2014-10-30 17:03:03 +01:00
Jan-Christoph Borchardt
1dfabfb491 admin settings: fix LDAP settings header layout 2014-10-30 16:04:26 +01:00
Thomas Müller
24feb74638 fixing ldap listing in admin sidebar - needs styling review 2014-10-30 13:55:33 +01:00
Vincent Petry
5536f6edd0 Properly register sharing hooks and proxies
This will fix failing tests when shares weren't cleant up on delete due
to missing hooks.

Added login for user1 in setUp().
2014-10-30 12:05:15 +01:00
Jenkins for ownCloud
ea55848fa1 [tx-robot] updated from transifex 2014-10-30 01:55:14 -04:00
Lukas Reschke
2cd35e94b4 Close session for files_trashbin
When restoring huge folders the interface will be unresponsive otherwise
2014-10-29 22:53:59 +01:00
Arthur Schiwon
8a48b088ed on xp'ed mode and switching configurations: save raw mode instead of toggling filter mode in tabs since their status is unknown and dealt with by the Wizard. Fixes #11848 2014-10-29 18:53:07 +01:00
Vincent Petry
106b9eb55c Merge pull request #11409 from owncloud/watcher-reuse
Pass the cached data to the filesystem watcher
2014-10-29 16:38:16 +01:00
Morris Jobke
7d10ec41e6 Merge pull request #11835 from owncloud/enc-fixmovingsharekeystofolder
Fix moving share keys as non-owner to subdir
2014-10-29 15:59:42 +01:00
Vincent Petry
e8f9b929bd Added encryption test when moving file as non-owner 2014-10-29 12:57:12 +01:00
Vincent Petry
f44e617dfd Fix warning with unset extension check 2014-10-29 12:56:49 +01:00
Vincent Petry
b920f888ae Fix moving share keys as non-owner to subdir
This fix gathers the share keys BEFORE a file is moved to make sure that
findShareKeys() is able to find all relevant keys when the file still
exists.

After the move/copy operation the keys are moved/copied to the target
dir.

Also: refactored preRename and preCopy into a single function to avoid
duplicate code.
2014-10-29 12:22:50 +01:00
Thomas Müller
9f7c571e40 update all translation files to js and json 2014-10-29 10:13:50 +01:00
Lukas Reschke
206cb5ba63 Fix typo 2014-10-29 10:11:01 +01:00
Bjoern Schiessle
9d1be0bbaf get the source path and owner in a pre hook and the target path and owner in a
post hook
2014-10-29 10:11:01 +01:00
Vincent Petry
ec1a73fab9 Added OC.L10N namespace with translation functions
Added addTranslations and fixed de.js file

Fixed de.js to use OC.L10N.register() and use to correct expected
format.

Added JS unit tests for OC.L10N class

Include translations JS script for all apps
2014-10-29 10:09:12 +01:00
Jenkins for ownCloud
cb944814d9 [tx-robot] updated from transifex 2014-10-29 01:54:45 -04:00
jknockaert
4faee4011d initialisation of cipher 2014-10-28 19:19:10 +01:00
Jenkins for ownCloud
23873d80fe [tx-robot] updated from transifex 2014-10-28 01:55:38 -04:00
Arthur Schiwon
05b2a037f2 dont fail with 500 if configured display name attribute is not set 2014-10-27 15:58:23 +01:00
Jenkins for ownCloud
5d391910c5 [tx-robot] updated from transifex 2014-10-27 01:54:28 -04:00
Jenkins for ownCloud
214af9523a [tx-robot] updated from transifex 2014-10-26 01:54:32 -04:00
Lukas Reschke
acec1afe17 Merge pull request #11760 from owncloud/add-type-hints-where-sensible
Add type hinting to functions
2014-10-25 14:09:48 +02:00
Jenkins for ownCloud
3652f02e48 [tx-robot] updated from transifex 2014-10-25 01:54:35 -04:00
Lukas Reschke
b3a04840b5 Add type hinting to functions
It's only reasonable to have proper type hinting here which might even help us to catch bugs.
2014-10-24 14:13:40 +02:00
Robin Appelman
4438c7de1d Fix shared cache getFolderContents 2014-10-24 12:32:55 +02:00
Robin Appelman
6ed9f53fcd also update shared watcher 2014-10-24 12:32:55 +02:00
Lukas Reschke
d060180140 Use function outside of loop
Otherwise the function is executed n times which is a lot of overhead
2014-10-24 12:27:53 +02:00
Lukas Reschke
9739a25547 Merge pull request #11758 from owncloud/fix-permissions
Make files non executable
2014-10-24 12:15:19 +02:00
Lukas Reschke
0525341a12 Merge pull request #11754 from owncloud/fix-division-null
Prevent division by zero
2014-10-24 11:59:29 +02:00
Lukas Reschke
2d2a4741ce Make files non executable
There is not much sense in having these files marked executable, we should avoid that.
2014-10-24 11:14:51 +02:00
Jenkins for ownCloud
9babcfb9e2 [tx-robot] updated from transifex 2014-10-24 01:55:11 -04:00
Lukas Reschke
3efac5a4f2 Prevent division by zero
Potentially fixes https://github.com/owncloud/core/issues/11742
2014-10-24 00:10:22 +02:00
Morris Jobke
7c14a17361 Merge pull request #11721 from owncloud/fix-s3-regression
[master] Fix S3 connection regression
2014-10-23 12:42:42 +02:00
Morris Jobke
ca01530f57 Merge pull request #11726 from owncloud/s3-fixunittests
Fix S3 folder creation for new AWS API
2014-10-23 12:35:44 +02:00
Jenkins for ownCloud
e75c2edba6 [tx-robot] updated from transifex 2014-10-23 01:55:51 -04:00
Vincent Petry
188effa433 Fix S3 folder creation for new AWS API
This also fixes the unit tests
2014-10-22 23:00:30 +02:00
Vincent Petry
71dce48bd3 Fix S3 connection 2014-10-22 22:17:07 +02:00
Vincent Petry
075e8d8e86 Lazy initialize external storages
Fixed the following external storages to not connect in the constructor,
but do it on-demand when getConnection() is called.
- S3
- SWIFT
- SFTP
2014-10-22 12:42:36 +02:00
Jörn Friedrich Dreyer
a9aa7841c9 Merge pull request #11684 from owncloud/guess_mimetype_on_touch
guess mimetype on touch
2014-10-22 12:32:09 +02:00
Jenkins for ownCloud
916e710ece [tx-robot] updated from transifex 2014-10-22 01:55:22 -04:00
Lukas Reschke
cb36666600 Merge pull request #11630 from owncloud/kill-some-legacy
remove legacy class OC_Updater
2014-10-21 14:01:49 +02:00
Jörn Friedrich Dreyer
1c9004409b guess mimetype on touch 2014-10-21 12:58:26 +02:00
Lukas Reschke
3e499d1ac4 Merge pull request #11675 from owncloud/urlencode-for-special-characters
URLEncode filenames to be compatible with special characters
2014-10-21 10:05:00 +02:00
Jenkins for ownCloud
8485743e33 [tx-robot] updated from transifex 2014-10-21 01:55:45 -04:00
jknockaert
da44150a15 small fix 2014-10-20 23:25:54 +02:00
jknockaert
d277ef6ac2 bugfixes 2014-10-20 23:04:11 +02:00
Lukas Reschke
f451ecb8d8 URLEncode filenames to be compatible with special characters 2014-10-20 20:00:34 +02:00
Thomas Müller
d9907b6fa3 move some deprecated usage of OC_Config and OC_AppConfig to \OC::server 2014-10-20 14:44:44 +02:00
Jörn Friedrich Dreyer
cb3a4d22b1 make tests compatible with hook based skeleton generation 2014-10-20 11:29:20 +02:00
Jörn Friedrich Dreyer
9b0f0df7f5 make skeleton compatible with objectstore
suspend encryption proxy when copying skeleton
2014-10-20 11:28:36 +02:00
Jenkins for ownCloud
87da62072b [tx-robot] updated from transifex 2014-10-20 01:54:34 -04:00
jknockaert
1b7e9d66b3 ok; still some bugs that had to be fixed 2014-10-20 00:28:41 +02:00
jknockaert
3be57d0169 small fix 2014-10-19 22:54:34 +02:00
jknockaert
e318858152 rework getFileSize 2014-10-19 22:27:15 +02:00
Jenkins for ownCloud
245ae7e071 [tx-robot] updated from transifex 2014-10-19 01:54:36 -04:00
Jenkins for ownCloud
68dd1edbfe [tx-robot] updated from transifex 2014-10-18 01:55:30 -04:00
Arthur Schiwon
e16122f2a1 add one simple cache test 2014-10-17 20:16:04 +02:00
Arthur Schiwon
4e8c7570d4 make performance less bad. Still far from good, but at least it works 2014-10-17 20:16:04 +02:00
Arthur Schiwon
5170dc3ae6 fix retrievel of group members and cache group members
fix changed variable name
2014-10-17 20:14:52 +02:00
Björn Schießle
2e875bc6b6 Merge pull request #11631 from owncloud/fix-undefine-encryption-exception
fixing usage of EncryptionException
2014-10-17 14:18:59 +02:00
Morris Jobke
f1a5ebd59d Merge pull request #11611 from owncloud/fix-svg-master
Fix SVG icons
2014-10-17 12:01:27 +02:00
Thomas Müller
d37eee09a5 fixing usage of EncryptionException 2014-10-17 11:46:22 +02:00
Jörn Friedrich Dreyer
e679a4c81c Merge pull request #11552 from owncloud/fix_files_external_flickering
Fix files external flickering
2014-10-17 09:49:52 +02:00
Jenkins for ownCloud
92f2914335 [tx-robot] updated from transifex 2014-10-17 01:58:25 -04:00
blizzz
8553e04a78 Merge pull request #11478 from owncloud/fix-11448
LDAP: add setting to wizard that disables auto-detection and enables raw mode
2014-10-16 15:35:30 +02:00
Lukas Reschke
9cfbf7ed1c Fix SVG icons
FIXME: Ugly hack to prevent SVG of being returned if the SVG
provider is not enabled.
This is required because the preview system is designed in a
bad way and relies on opt-in with asterisks (i.e. image/*)
which will lead to the fact that a SVG will also match the image
provider.

Conflicts:
	lib/private/preview.php
2014-10-16 12:35:51 +02:00
Robin Appelman
c71deea0d5 Fix SPACE_UNKNOWN constant 2014-10-16 12:26:26 +02:00
Arthur Schiwon
7b15fcc3f8 left-align checkbox on server tab 2014-10-16 12:08:05 +02:00
Vincent Petry
08582d145c Merge pull request #11524 from nazar-pc/patch-1
Page size calculation based on real page height
2014-10-16 11:21:49 +02:00
Jörn Friedrich Dreyer
0254a3c406 make trashbin compatible with objectstore, replace glob with search in cache, make unknown free space work like unlimited free space 2014-10-16 10:15:43 +02:00
Jenkins for ownCloud
c8d8578d1a [tx-robot] updated from transifex 2014-10-16 01:56:30 -04:00
Nazar Mokrynskyi
8198e70f24 Changed fileList.pageSize to function call 2014-10-15 19:18:35 +02:00
Nazar Mokrynskyi
63145f5765 Typo 2014-10-15 19:17:21 +02:00
Arthur Schiwon
c714e9bf02 rephrase xp'ed user mode label 2014-10-15 17:44:41 +02:00
Arthur Schiwon
b7db454fff remove debug output 2014-10-15 17:28:18 +02:00
Nazar Mokrynskyi
da27797e8d Even better - usage of this.$container instead of this.$el.parent() 2014-10-15 15:24:03 +02:00
Thomas Müller
b091394a90 introduce new app page layout
filter installed and not-installed apps properly

kill unneeded file

load category 'Installed' on page load

adding documentation links

new apps mgmt: first style adjustment

apps mgmt: only show license and preview if they exist

adding buttons

new apps mgmt: fix for mobile

use app icon if available

new apps mgmt: position enable/disable toggle to the right

new apps mgmt: proper display of icons or previews

new apps mgmt: fix loading spinner

reenable group selection for apps

new apps mgmt: position enable button normally again

new apps mgmt: clarify wording from 'Installed' to 'Enabled'

reintroduce enable/disable

Move rating image path generation to client-side

Move expression outside of l10n

fix group handling

add buttons for 'More apps' and 'Add your app' again

disable changed date of app for now

adding recommended label

style 'Recommended' app tag

fixing php warning

sort by rating

adding meta-category 'Recommended'

 Only show existing documentation links

lacy loading of screenshots

making group based app activation work again

adding support to get the app icon not only by the app name but also simply by the fixed name 'app.svg'

adding app.svg for all core apps

query string '?installed' is not longer needed

update and uninstall is back + error feedback

remove unneeded parameter

fix alignment of 'recommended' label
2014-10-15 15:21:40 +02:00
Nazar Mokrynskyi
5033fc4e52 Stub for pageSize, because now it is dynamically calculated 2014-10-15 15:09:01 +02:00
Nazar Mokrynskyi
9de874f015 this.$el is not the same as $('#app-content')
That is why we use `this.$el.parent()` instead
2014-10-15 15:06:35 +02:00
Nazar Mokrynskyi
33ada11a64 Use function call for FileList.pageSize 2014-10-15 14:55:24 +02:00
Nazar Mokrynskyi
6ec9c99d48 Use this.$el instead of the absolute selector 2014-10-15 14:16:17 +02:00
Vincent Petry
4650101674 Merge pull request #11548 from owncloud/extstorage-ocfields
Allow specifying protocol in ext storage OC config
2014-10-15 13:27:23 +02:00
Arthur Schiwon
ab6890b854 instead of dis/enabling tabs on save, cancel tab change. avoids noisy ui 2014-10-15 12:51:46 +02:00
Arthur Schiwon
4385188920 show busy cursor and lock tabs on save 2014-10-15 12:41:53 +02:00
Vincent Petry
704ffaa6a3 Use body element when animating scroll in public page
In the public page the scroll container is the window instead of a div.
The $(window) object doesn't support animating the scroll property, so
the $('body') element is used instead.
2014-10-15 10:14:20 +02:00
Arthur Schiwon
c26e9c675a show Spinner when stuff is being saved 2014-10-14 17:39:27 +02:00
Jenkins for ownCloud
526abf1ad6 [tx-robot] updated from transifex 2014-10-14 01:54:28 -04:00
Jörn Friedrich Dreyer
7535b09851 cleanup variable names and duplicate jQuery selectors 2014-10-13 18:40:57 +02:00
Jörn Friedrich Dreyer
7f1ba86789 fix flickering users 2014-10-13 17:58:29 +02:00
Vincent Petry
ab5149f5df Allow specifying protocol in ext storage OC config
Allow specifying a protocol in the host field when mounting another
ownCloud instance. Note that this was already possible with the WebDAV
config but this bug made it inconsistent.
2014-10-13 17:15:58 +02:00
Vincent Petry
6cbabdf217 Fixed array detection on public download
When downloading a folder called "0001" PHP should fallback to parsing
it as string and properly detect that it is not a JSON array.
2014-10-13 12:54:21 +02:00
Jenkins for ownCloud
4b9465b937 [tx-robot] updated from transifex 2014-10-13 01:54:35 -04:00
Jenkins for ownCloud
a3635fedbb [tx-robot] updated from transifex 2014-10-12 01:54:39 -04:00
Nazar Mokrynskyi
257cf1fc34 Page size calculation based on real page height
This is fix for https://github.com/owncloud/core/issues/10060
Instead of hard coding page size as 20 items, we check real page height, and divide by 50 (height of one row).
This will allow to load fewer items on small screens and enough items on large screens (4k, portrait orientation, etc.).
Also checking page height on every load to respond on browser window resizing,
2014-10-11 15:10:54 +02:00
Jenkins for ownCloud
a0db01ecd3 [tx-robot] updated from transifex 2014-10-11 01:55:02 -04:00
Björn Schießle
3f9cab00e3 Merge pull request #11507 from owncloud/versioning_expire
make sure that we always delete oldest first
2014-10-10 17:31:26 +02:00
Björn Schießle
87899db204 Merge pull request #11380 from owncloud/fix_performance_issue_sharing
[sharing] fix performance issues
2014-10-10 15:56:30 +02:00
Bjoern Schiessle
527e1d001f try to get path from filesystem 2014-10-10 14:47:41 +02:00
Arthur Schiwon
836f0839e5 show a spinner next to test filter button when the test is running 2014-10-10 13:41:32 +02:00
Arthur Schiwon
ea7975ac8b always abort running ajax request when the method is fired up again 2014-10-10 13:30:03 +02:00
Lukas Reschke
4a4ea1dae9 Merge pull request #11499 from owncloud/ldap-warningwhenuidismissing
Log warning when no uid was found for user
2014-10-10 12:42:31 +02:00
Jan-Christoph Borchardt
4faa424157 Merge pull request #11480 from owncloud/ldap-enterkey-deletefix
Prevent button click when enter key is pressed in LDAP wizard
2014-10-10 12:37:44 +02:00
Bjoern Schiessle
3431d547a9 fix performance issues 2014-10-10 12:16:26 +02:00
Arthur Schiwon
f31d4caf57 coding style, no effective code changes 2014-10-10 11:49:45 +02:00
Jenkins for ownCloud
2cc26c9022 [tx-robot] updated from transifex 2014-10-10 01:55:10 -04:00
Bjoern Schiessle
8e077cf1a4 make sure that we always delete oldest first 2014-10-09 19:15:58 +02:00
Vincent Petry
9dea79e341 Merge pull request #11305 from owncloud/ext-updateetagonmount
Update etag of parent dir when adding/removing ext storage mount points
2014-10-09 18:18:36 +02:00
Arthur Schiwon
6f83b537fe remove debug output 2014-10-09 17:56:27 +02:00
Arthur Schiwon
2cf0102797 fix triggering of group update counts. improves the basic code which is also responsible for user counts. i did not find regressions, please doublecheck 2014-10-09 17:17:50 +02:00
Lukas Reschke
16cd749065 Add support for keys in the info.xml
This allows to have links to different doc base URLs

a.
2014-10-09 15:48:30 +02:00
Vincent Petry
59f9107dd9 Log warning when no uid was found for user
In some incomplete setups (like mine) it can happen that the uid
attribute of users is missing.

To be able to find out that something is wrong, a debug message is now
logged when it has not been found.
2014-10-09 14:58:53 +02:00
blizzz
cc717c27d6 Merge pull request #10527 from owncloud/fix-10526
properly cancel a Paginated Results operation in order to avoid protocol...
2014-10-09 12:40:13 +02:00
Arthur Schiwon
9f036e776e bump version 2014-10-09 11:15:56 +02:00
Vincent Petry
f7fc0067e0 Revert "[WIP] fix retrieval of group members and cache group members" 2014-10-09 11:06:48 +02:00
Vincent Petry
3791de64ed Merge pull request #11161 from owncloud/fix-ldap-ingroup-for-9225
fix retrieval of group members and cache group members
2014-10-09 10:19:58 +02:00
Morris Jobke
b11cf6f838 Merge pull request #11474 from owncloud/fix_trash_permission_check
check if I can create a file at the location
2014-10-09 08:59:48 +02:00
Jenkins for ownCloud
295c46ccb5 [tx-robot] updated from transifex 2014-10-09 01:55:33 -04:00
MTRichards
c7f936cdcb Updated info.xml with
Added description in line with other apps.
2014-10-08 21:27:40 -04:00
MTRichards
f511977832 Updated info.xml app description
Added updates description
2014-10-08 21:24:54 -04:00
MTRichards
511ad6e106 Forgot a '.' 2014-10-08 21:08:20 -04:00
MTRichards
3a2d50b76f Updated info.xml app description
Made app description paralell in structure to other app descriptions
2014-10-08 21:07:12 -04:00
MTRichards
fc0ae29be5 Updated info.xml app description
Added larger app description
2014-10-08 20:49:22 -04:00
MTRichards
d532683e20 Updated info.xml app description
Added new app description
Removed links to CE documentation
2014-10-08 20:48:00 -04:00
MTRichards
48980fbc46 Updated info.xml with description
Updated the description of the app for the app panel.
2014-10-08 20:44:09 -04:00
brumsoel
1e1be409b7 Fix timestamp comparator return value 2014-10-08 22:40:57 +02:00
Morris Jobke
2f1605cfc3 Merge pull request #11471 from brumsoel/master
Fix file size comparator return value
2014-10-08 20:39:13 +02:00
Jörn Friedrich Dreyer
f664a31dec extract batchDelete(), better comments 2014-10-08 18:50:02 +02:00
André Gaul
0d0c9d0bb3 files_extern: remove empty Body and ContentLength in Amazon S3 mount
fixes #10501

Conflicts:
	apps/files_external/lib/amazons3.php
2014-10-08 18:49:59 +02:00
Jörn Friedrich Dreyer
aa3ad898a9 fix amazon s3 issues
folder size and mtime is always unknown in s3

more s3 fixes

make rescanDelay of root dir configurable, add on the fly update of legacy storage ids, !isset -> empty when checking strings

reduce number of http calls on remove and rmdir

fix typo
2014-10-08 18:49:47 +02:00
Jörn Friedrich Dreyer
18e3856092 log exceptions when listing files 2014-10-08 18:49:43 +02:00
Arthur Schiwon
02985c9ec5 smaller corrections to make scruitinizer happier, no effective changes 2014-10-08 16:20:52 +02:00
Vincent Petry
bb424802c8 Prevent button click when enter key is pressed in LDAP wizard
Pressing enter in the LDAP wizard will trigger a click on the first
button. In the main page it would trigger the delete dialog, which is
quite inconvenient.

Added a type attribute to suppress this behavior.
2014-10-08 15:09:02 +02:00
Arthur Schiwon
ab3535855f more beautiful white spaces 2014-10-08 15:04:29 +02:00
Arthur Schiwon
39aa5868ac rename internal var name to avoid collision 2014-10-08 14:55:47 +02:00
Morris Jobke
6d94a88476 Merge pull request #11453 from owncloud/enc_visual_improvements
[encryption] some visual improvements
2014-10-08 14:36:24 +02:00
Vincent Petry
26e242a8a4 Added PHP docs for etag propagator 2014-10-08 14:22:18 +02:00
Robin Appelman
bcf654127f More phpdoc 2014-10-08 14:22:17 +02:00
Robin Appelman
1030f0a763 Hookup the etag propagator 2014-10-08 14:22:17 +02:00
Robin Appelman
5d7bd8be42 Add EtagPropagator to handle etag changes when external storages are changed 2014-10-08 14:22:17 +02:00
Robin Appelman
9a5d0f6084 Fix add/remove mountpoint hooks 2014-10-08 14:22:17 +02:00
Vincent Petry
6585eaa5df Added failing unit tests for mount config hooks 2014-10-08 14:22:17 +02:00
Vincent Petry
0610937ac3 Added filesystem hooks for mount/unmount ext storage 2014-10-08 14:22:17 +02:00
Arthur Schiwon
29b0e9bfbc confirmation before switching to assisted mode when admin is experienced 2014-10-08 13:29:13 +02:00
Arthur Schiwon
7ba787e649 user and group counts are only upated on demand in experienced mode 2014-10-08 13:06:18 +02:00
Arthur Schiwon
b6fc7f5599 Objectlasses, Groups and Attributes are now loaded only in assisted mode and only once 2014-10-08 11:38:39 +02:00
Bjoern Schiessle
5b5e9d148e check if I can create a file at the location 2014-10-08 10:56:06 +02:00
Jenkins for ownCloud
a9c9b5edf4 [tx-robot] updated from transifex 2014-10-08 01:54:49 -04:00
brumsoel
40174b6b10 Fix file size comparator return value 2014-10-08 01:17:45 +02:00
Arthur Schiwon
3ff4c8e3fc sets user filters to raw mode when marking user as experienced 2014-10-07 17:28:09 +02:00
Arthur Schiwon
efd940133b must be empty not auto 2014-10-07 16:45:22 +02:00