]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
9 years agoCheck new and old ways of required oC version for app compatibility
Joas Schilling [Wed, 14 Jan 2015 11:48:59 +0000 (12:48 +0100)]
Check new and old ways of required oC version for app compatibility

9 years agoMerge pull request #13332 from oparoz/fix-download-button
Thomas Müller [Wed, 14 Jan 2015 11:24:06 +0000 (12:24 +0100)]
Merge pull request #13332 from oparoz/fix-download-button

Download the current public folder only

9 years agoMerge pull request #13286 from owncloud/sharing_upgrade
Björn Schießle [Wed, 14 Jan 2015 10:57:30 +0000 (11:57 +0100)]
Merge pull request #13286 from owncloud/sharing_upgrade

update script for new server-to-server sharing

9 years agoMerge pull request #13288 from owncloud/enc_fix_public_download
Lukas Reschke [Wed, 14 Jan 2015 10:55:13 +0000 (11:55 +0100)]
Merge pull request #13288 from owncloud/enc_fix_public_download

[encryption] fix download of public shared files

9 years agoMerge pull request #13335 from owncloud/disable-rememberme-files-external
Thomas Müller [Wed, 14 Jan 2015 10:51:16 +0000 (11:51 +0100)]
Merge pull request #13335 from owncloud/disable-rememberme-files-external

The files_external app might need the password so autologin must be disabled

9 years agoMerge pull request #13311 from owncloud/fix_restore_keys
Björn Schießle [Wed, 14 Jan 2015 10:40:22 +0000 (11:40 +0100)]
Merge pull request #13311 from owncloud/fix_restore_keys

adapt decrypt all to the new folder structure

9 years agoDownload the current public folder only
Olivier Paroz [Wed, 14 Jan 2015 10:28:36 +0000 (11:28 +0100)]
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.

9 years agoThe files_external app might need the password so autologin must be disabled
Joas Schilling [Wed, 14 Jan 2015 09:19:22 +0000 (10:19 +0100)]
The files_external app might need the password so autologin must be disabled

9 years agoMerge pull request #13325 from owncloud/kill-strip-slashes
Morris Jobke [Wed, 14 Jan 2015 07:27:42 +0000 (08:27 +0100)]
Merge pull request #13325 from owncloud/kill-strip-slashes

Get rid of `stripslashes()`

9 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 14 Jan 2015 06:55:16 +0000 (01:55 -0500)]
[tx-robot] updated from transifex

9 years agoMerge pull request #13320 from owncloud/fix-php-doc-for-files-view
Morris Jobke [Tue, 13 Jan 2015 17:05:00 +0000 (18:05 +0100)]
Merge pull request #13320 from owncloud/fix-php-doc-for-files-view

Fix annotations in file view

9 years agodrop unused parameter
Morris Jobke [Tue, 13 Jan 2015 15:56:15 +0000 (16:56 +0100)]
drop unused parameter

9 years agoGet rid of `stripslashes()`
Lukas Reschke [Tue, 13 Jan 2015 16:40:28 +0000 (17:40 +0100)]
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.

9 years agoset accept to 1 (=true) for all server-to-server shares on update, at this point...
Bjoern Schiessle [Mon, 12 Jan 2015 16:04:19 +0000 (17:04 +0100)]
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

9 years agoMerge pull request #13318 from owncloud/fix-annotation
Morris Jobke [Tue, 13 Jan 2015 14:24:34 +0000 (15:24 +0100)]
Merge pull request #13318 from owncloud/fix-annotation

Fix PHP doc and enforce type

9 years agoFix annotations in file view
Lukas Reschke [Tue, 13 Jan 2015 13:51:37 +0000 (14:51 +0100)]
Fix annotations in file view

9 years agoFix PHP doc and enforce type
Lukas Reschke [Tue, 13 Jan 2015 13:47:54 +0000 (14:47 +0100)]
Fix PHP doc and enforce type

9 years agoMerge pull request #13316 from owncloud/drop-dead-code
Morris Jobke [Tue, 13 Jan 2015 13:33:00 +0000 (14:33 +0100)]
Merge pull request #13316 from owncloud/drop-dead-code

drop dead code - ref #13301

9 years agoif we download a public shared file we need to retrieve the user from the path
Bjoern Schiessle [Mon, 12 Jan 2015 16:51:09 +0000 (17:51 +0100)]
if we download a public shared file we need to retrieve the user from the path

9 years agodrop dead code - ref #13301
Morris Jobke [Tue, 13 Jan 2015 12:52:25 +0000 (13:52 +0100)]
drop dead code - ref #13301

9 years agoMerge pull request #13217 from owncloud/make-basic-auth-work-again
Bernhard Posselt [Tue, 13 Jan 2015 12:35:54 +0000 (13:35 +0100)]
Merge pull request #13217 from owncloud/make-basic-auth-work-again

Fix Basic Auth in master for applications

9 years agoMerge pull request #13291 from owncloud/node-searchcommonbasepathfix
Thomas Müller [Tue, 13 Jan 2015 12:25:51 +0000 (13:25 +0100)]
Merge pull request #13291 from owncloud/node-searchcommonbasepathfix

Fix searchCommon to properly match path name

9 years agoMerge pull request #13277 from owncloud/pasteurl
Joas Schilling [Tue, 13 Jan 2015 11:51:58 +0000 (12:51 +0100)]
Merge pull request #13277 from owncloud/pasteurl

add https:// placeholder for From Link feature. closes #13255

9 years agoadapt decrypt all and restore/delete key backups to the new folder structure for...
Bjoern Schiessle [Tue, 13 Jan 2015 11:45:33 +0000 (12:45 +0100)]
adapt decrypt all and restore/delete key backups to the new folder structure for encryption key introduced with OC8

9 years agoMerge pull request #13301 from owncloud/drop-etag-message
Vincent Petry [Tue, 13 Jan 2015 11:24:24 +0000 (12:24 +0100)]
Merge pull request #13301 from owncloud/drop-etag-message

drop useless "!!! No reuse of etag" - fixes #13187

9 years agoMerge pull request #13305 from owncloud/remove-stray-minus-and-use-json-encode
Robin McCorkell [Tue, 13 Jan 2015 10:39:14 +0000 (10:39 +0000)]
Merge pull request #13305 from owncloud/remove-stray-minus-and-use-json-encode

Use json_encode on string

9 years agoUse json_encode on string
Lukas Reschke [Tue, 13 Jan 2015 10:03:58 +0000 (11:03 +0100)]
Use json_encode on string

It's better to encode the string to prevent possible (yet unknown) bugs in combination with PHP's type juggling.

Previously the boolean statements evaluated to either an empty string (false) or a not empty one (true, then it was 1). Not it always evaluates to false or true.

This also removes a stray - that was not intended there but shouldn't have produced any bugs. Just to increase readability.

Thanks @nickvergessen for spotting.

Addresses https://github.com/owncloud/core/pull/13235/files#r22852319

9 years agoMerge pull request #13271 from owncloud/fix-table-prefix-oracle-master
Morris Jobke [Tue, 13 Jan 2015 09:31:04 +0000 (10:31 +0100)]
Merge pull request #13271 from owncloud/fix-table-prefix-oracle-master

Use a special filter expression for Oracle to filter the prefix - fixes ...

9 years agodrop useless "!!! No reuse of etag" - fixes #13187
Morris Jobke [Tue, 13 Jan 2015 08:54:48 +0000 (09:54 +0100)]
drop useless "!!! No reuse of etag" - fixes #13187

9 years agoMerge pull request #13299 from owncloud/fix-ie8
Thomas Müller [Tue, 13 Jan 2015 08:52:55 +0000 (09:52 +0100)]
Merge pull request #13299 from owncloud/fix-ie8

usage of const in JS is supported in IE11+

9 years agoMerge pull request #13278 from owncloud/repair-step-missing-etags
Morris Jobke [Tue, 13 Jan 2015 07:38:18 +0000 (08:38 +0100)]
Merge pull request #13278 from owncloud/repair-step-missing-etags

Adding repair step to fix missing etags - fixes #12172

9 years agoMerge pull request #13289 from owncloud/fav-keepfavoncancelrename
Morris Jobke [Tue, 13 Jan 2015 07:28:30 +0000 (08:28 +0100)]
Merge pull request #13289 from owncloud/fav-keepfavoncancelrename

Properly update internal file info with updated tags

9 years agousage of const in JS is supported in IE11+
Morris Jobke [Tue, 13 Jan 2015 07:20:37 +0000 (08:20 +0100)]
usage of const in JS is supported in IE11+

9 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 13 Jan 2015 06:56:58 +0000 (01:56 -0500)]
[tx-robot] updated from transifex

9 years agoMerge pull request #13293 from owncloud/occ-required-posix
Lukas Reschke [Mon, 12 Jan 2015 22:01:23 +0000 (23:01 +0100)]
Merge pull request #13293 from owncloud/occ-required-posix

Check for the posix extension

9 years agoMerge pull request #13154 from owncloud/fix13141
Thomas Müller [Mon, 12 Jan 2015 21:48:25 +0000 (22:48 +0100)]
Merge pull request #13154 from owncloud/fix13141

don't show no files yet when mask is in place, fixes #13141

9 years agoAdding repair step to fix missing etags - fixes #12172
Thomas Müller [Mon, 12 Jan 2015 14:22:02 +0000 (15:22 +0100)]
Adding repair step to fix missing etags - fixes #12172

9 years agoCheck for the posix extension - refs https://github.com/owncloud/core/pull/13282...
Thomas Müller [Mon, 12 Jan 2015 19:17:02 +0000 (20:17 +0100)]
Check for the posix extension - refs https://github.com/owncloud/core/pull/13282#issuecomment-69602645

9 years agoadd https:// placeholder for From Link feature. closes #13255
Volkan Gezer [Sun, 11 Jan 2015 15:02:50 +0000 (16:02 +0100)]
add https:// placeholder for From Link feature. closes #13255

9 years agoFix searchCommon to properly match path name
Vincent Petry [Mon, 12 Jan 2015 18:33:00 +0000 (19:33 +0100)]
Fix searchCommon to properly match path name

The internal path was matched without the last "/" which caused
"files_trashbin" to also match when the internal path was "files".

This adds the missing slash for the comparison.

9 years agoMerge pull request #13272 from owncloud/fav-renamekeepfav
Joas Schilling [Mon, 12 Jan 2015 18:12:31 +0000 (19:12 +0100)]
Merge pull request #13272 from owncloud/fav-renamekeepfav

Fixes issues when renaming favorite file

9 years agoReturn path attribute for ajax rename operations
Vincent Petry [Mon, 12 Jan 2015 13:01:40 +0000 (14:01 +0100)]
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.

9 years agoReturn tags after rename
Vincent Petry [Mon, 12 Jan 2015 13:01:04 +0000 (14:01 +0100)]
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

9 years agoProperly update internal file info with updated tags
Vincent Petry [Mon, 12 Jan 2015 16:54:35 +0000 (17:54 +0100)]
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.

9 years agoMerge pull request #13285 from owncloud/fix-encryption-check-number-of-parts
Morris Jobke [Mon, 12 Jan 2015 16:58:36 +0000 (17:58 +0100)]
Merge pull request #13285 from owncloud/fix-encryption-check-number-of-parts

Check array size, before using the 3rd element from it

9 years agoMerge pull request #13282 from owncloud/occ-user-warning
Morris Jobke [Mon, 12 Jan 2015 16:50:12 +0000 (17:50 +0100)]
Merge pull request #13282 from owncloud/occ-user-warning

Check for current user to have the same id then the owner of the config ...

9 years agoMerge pull request #13279 from owncloud/upload-original-name
Morris Jobke [Mon, 12 Jan 2015 16:48:12 +0000 (17:48 +0100)]
Merge pull request #13279 from owncloud/upload-original-name

Send the proper original name for uploaded files

9 years agoMerge pull request #13280 from owncloud/fix-12306
Morris Jobke [Mon, 12 Jan 2015 16:42:37 +0000 (17:42 +0100)]
Merge pull request #13280 from owncloud/fix-12306

fix retrieval of user groups

9 years agoCheck array size, before using the 3rd element from it
Joas Schilling [Mon, 12 Jan 2015 16:05:51 +0000 (17:05 +0100)]
Check array size, before using the 3rd element from it

9 years agoCheck for current user to have the same id then the owner of the config file - fixes...
Thomas Müller [Mon, 12 Jan 2015 15:49:36 +0000 (16:49 +0100)]
Check for current user to have the same id then the owner of the config file - fixes #12307

9 years agoMerge pull request #13210 from owncloud/use-isset
Morris Jobke [Mon, 12 Jan 2015 15:35:31 +0000 (16:35 +0100)]
Merge pull request #13210 from owncloud/use-isset

Check for existence of $_GET keys

9 years agoUse a special filter expression for Oracle to filter the prefix - fixes #13220
Thomas Müller [Mon, 12 Jan 2015 12:57:46 +0000 (13:57 +0100)]
Use a special filter expression for Oracle to filter the prefix - fixes #13220

9 years agofix retrieval of user groups
Arthur Schiwon [Mon, 12 Jan 2015 15:25:11 +0000 (16:25 +0100)]
fix retrieval of user groups

9 years agoSend the proper original name for uploaded files
Robin Appelman [Mon, 12 Jan 2015 13:41:41 +0000 (14:41 +0100)]
Send the proper original name for uploaded files

9 years agoMerge pull request #13268 from owncloud/dnd-files-container
Lukas Reschke [Mon, 12 Jan 2015 12:27:53 +0000 (13:27 +0100)]
Merge pull request #13268 from owncloud/dnd-files-container

Allow dropping files on the table container

9 years agoAllow dropping files on the table container
Vincent Petry [Mon, 12 Jan 2015 11:29:26 +0000 (12:29 +0100)]
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.

9 years agoMerge pull request #13182 from owncloud/download_versions
Björn Schießle [Mon, 12 Jan 2015 11:03:21 +0000 (12:03 +0100)]
Merge pull request #13182 from owncloud/download_versions

make versions of shared files downloadable

9 years agoMerge pull request #13254 from owncloud/fixsharel10n
Thomas Müller [Mon, 12 Jan 2015 08:31:35 +0000 (09:31 +0100)]
Merge pull request #13254 from owncloud/fixsharel10n

make Share/Download buttons localized again

9 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 12 Jan 2015 06:55:52 +0000 (01:55 -0500)]
[tx-robot] updated from transifex

9 years agoMerge pull request #13257 from owncloud/fixrmperm
Thomas Müller [Sun, 11 Jan 2015 18:28:32 +0000 (19:28 +0100)]
Merge pull request #13257 from owncloud/fixrmperm

l10n: delete permanently fix

9 years agol10n: delete permanently fix
Volkan Gezer [Sun, 11 Jan 2015 16:15:58 +0000 (17:15 +0100)]
l10n: delete permanently fix

9 years agoMerge pull request #13256 from owncloud/versionup
Thomas Müller [Sun, 11 Jan 2015 15:29:45 +0000 (16:29 +0100)]
Merge pull request #13256 from owncloud/versionup

version up

9 years agoversion up
Volkan Gezer [Sun, 11 Jan 2015 15:17:57 +0000 (16:17 +0100)]
version up

9 years agomake Share button localized again
Volkan Gezer [Sun, 11 Jan 2015 14:54:03 +0000 (15:54 +0100)]
make Share button localized again

it seems we have forgotten to use named FileAction

9 years agoMerge pull request #13251 from owncloud/spaceoutside
Volkan Gezer [Sun, 11 Jan 2015 14:29:21 +0000 (15:29 +0100)]
Merge pull request #13251 from owncloud/spaceoutside

keep spaces out of translation

9 years agoMerge pull request #13250 from owncloud/bittypo
Volkan Gezer [Sun, 11 Jan 2015 14:29:07 +0000 (15:29 +0100)]
Merge pull request #13250 from owncloud/bittypo

32-bit typo fix

9 years agosuggestion by transifex translator
Volkan Gezer [Sun, 11 Jan 2015 12:47:37 +0000 (13:47 +0100)]
suggestion by transifex translator

9 years agokeep spaces out of translation
Volkan Gezer [Sun, 11 Jan 2015 12:43:43 +0000 (13:43 +0100)]
keep spaces out of translation

otherwise translators cannot notice it on Transifex

9 years ago32-bit typo fix
Volkan Gezer [Sun, 11 Jan 2015 12:36:19 +0000 (13:36 +0100)]
32-bit typo fix

9 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 11 Jan 2015 06:54:32 +0000 (01:54 -0500)]
[tx-robot] updated from transifex

9 years ago8.0.0 alpha 2 v8.0.0alpha2
Frank Karlitschek [Sun, 11 Jan 2015 03:37:15 +0000 (04:37 +0100)]
8.0.0 alpha 2

9 years agoMerge pull request #13226 from owncloud/fix-encoding
Volkan Gezer [Sat, 10 Jan 2015 17:11:36 +0000 (18:11 +0100)]
Merge pull request #13226 from owncloud/fix-encoding

Don't double encode string

9 years agoMerge pull request #13224 from owncloud/simplify-is-valid-path-and-add-unit-tests
Morris Jobke [Sat, 10 Jan 2015 16:35:40 +0000 (17:35 +0100)]
Merge pull request #13224 from owncloud/simplify-is-valid-path-and-add-unit-tests

Simplify isValidPath and add unit tests

9 years agoMerge pull request #13223 from owncloud/optimize-normalize-unicode
Morris Jobke [Sat, 10 Jan 2015 15:33:54 +0000 (16:33 +0100)]
Merge pull request #13223 from owncloud/optimize-normalize-unicode

Verify whether value is already normalized

9 years agoMerge pull request #13236 from owncloud/use-isset-for-performance
Morris Jobke [Sat, 10 Jan 2015 15:32:50 +0000 (16:32 +0100)]
Merge pull request #13236 from owncloud/use-isset-for-performance

Use isset() instead of strlen()

9 years agoMerge pull request #13235 from owncloud/cache-normalize-path
Morris Jobke [Sat, 10 Jan 2015 15:32:09 +0000 (16:32 +0100)]
Merge pull request #13235 from owncloud/cache-normalize-path

Cache results of `normalizePath`

9 years agoMerge pull request #13225 from owncloud/add-csrf-check
Morris Jobke [Sat, 10 Jan 2015 15:31:45 +0000 (16:31 +0100)]
Merge pull request #13225 from owncloud/add-csrf-check

Add CSRF check to search

9 years agoVerify whether value is already normalized
Lukas Reschke [Fri, 9 Jan 2015 22:34:26 +0000 (23:34 +0100)]
Verify whether value is already normalized

Apparently `normalizer_normalize` is not verifying itself whether the string needs to be converted or not. Or does it at least not very performantly.

This simple change leads to a 4% performance gain on the processing of normalizeUnicode. Since this method is called quite often (i.e. for every file path) this has actually a measurable impact. For examples searches are now 200ms faster on my machine. Still not perfect but way to go.

Part of https://github.com/owncloud/core/issues/13221

9 years agoUse isset() instead of strlen()
Lukas Reschke [Sat, 10 Jan 2015 10:50:07 +0000 (11:50 +0100)]
Use isset() instead of strlen()

Isset is a native language construct and thus A LOT faster than using strlen()

On my local machine this leads to a 1s performance gain for about 1 million paths. Considering that this function will be called a lot for every file operation this makes a noticable difference.

9 years agoCache results of `normalizePath`
Lukas Reschke [Sat, 10 Jan 2015 09:48:28 +0000 (10:48 +0100)]
Cache results of `normalizePath`

`normalizePath` is a rather expensive operation and called multiple times for a single path for every file related operation.

In my development installation with about 9GB of data and 60k files this leads to a performance boost of 24% - in seconds that are 1.86s (!) - for simple searches. With more files the impact will be even more noticeable. Obviously this affects every operation that has in any regard something to do with using OC\Files\Filesystem.

Part of https://github.com/owncloud/core/issues/13221

9 years agoMerge pull request #13212 from owncloud/cache-appstore-response
Morris Jobke [Sat, 10 Jan 2015 08:56:00 +0000 (09:56 +0100)]
Merge pull request #13212 from owncloud/cache-appstore-response

Cache responses from the AppStore server

9 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 10 Jan 2015 06:54:35 +0000 (01:54 -0500)]
[tx-robot] updated from transifex

9 years agoDon't double encode string
Lukas Reschke [Sat, 10 Jan 2015 00:19:37 +0000 (01:19 +0100)]
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.

9 years agoFix URL to developer manual
Lukas Reschke [Fri, 9 Jan 2015 23:54:38 +0000 (00:54 +0100)]
Fix URL to developer manual

9 years agoSimplify isValidPath and add unit tests
Lukas Reschke [Fri, 9 Jan 2015 23:06:30 +0000 (00:06 +0100)]
Simplify isValidPath and add unit tests

The check for invalid paths is actually over-complicated and performed twice resulting in a performance penalty. Additionally, I decided to add unit-tests to that function.

Part of https://github.com/owncloud/core/issues/13221

9 years agoAdd CSRF check to search
Lukas Reschke [Fri, 9 Jan 2015 23:30:14 +0000 (00:30 +0100)]
Add CSRF check to search

Doesn't hurt to have a check on this one as well.

9 years agoAdd some more sanity checks for maintenance mode
Lukas Reschke [Fri, 9 Jan 2015 20:52:16 +0000 (21:52 +0100)]
Add some more sanity checks for maintenance mode

9 years agoVerify authentication before initializing apps and routing
Lukas Reschke [Fri, 9 Jan 2015 19:59:23 +0000 (20:59 +0100)]
Verify authentication before initializing apps and routing

The current behaviour of the authenticion logic in base.php prevents REST APIs in ownCloud applications to work.

Because `!self::$CLI` is usually always a true statement the previously above block was entered which returned, thus the authentication logic for this part does not trigger in.

This can be reproduced by installing apps such as the News app and issuing the following command:

`curl -u admin:admin http://localhost/index.php/apps/news/api/v1-2/feeds`

The following parts needs to get throughly tested:

- [ ] OCS
- [ ] remote.php's DAV features
- [ ] Regular login features

This bug affects master and stable7. I'd propose that we merge this for 8.0 since this has the potential to break every component that relies on Basic Auth features. A backport would also be very nice.

Remark to myself: We really need to move out the authentication code for 8.1 out of base.php - I already have a local branch that does that somewhere which I will get in shape for 8.1... - This untested code is a night-mare.

Fixes itself.

9 years agoCache responses from the AppStore server
Lukas Reschke [Fri, 9 Jan 2015 17:31:39 +0000 (18:31 +0100)]
Cache responses from the AppStore server

Otherwise every time the AppStore was opened a lot of connections to the AppStore server were made which resulted in a terrible performance.

This changeset will cache the response for a sensible time so that only the first request will be somewhat slow.

Performance changes:
- Loading a category took previously more than 3 seconds on my machine. Now for every follow-up request it takes less than 200ms, resulting in a performance gain of 1950%
- Loading the category list took previously about 750ms - now it takes 154ms, a total performance gain of 395%

9 years agoMerge pull request #13204 from owncloud/enc_fix_key_lost
Vincent Petry [Fri, 9 Jan 2015 17:40:51 +0000 (18:40 +0100)]
Merge pull request #13204 from owncloud/enc_fix_key_lost

Encryption fix key lost if group share gets renamed

9 years agoMerge pull request #13195 from owncloud/resharepermfix
Morris Jobke [Fri, 9 Jan 2015 17:05:05 +0000 (18:05 +0100)]
Merge pull request #13195 from owncloud/resharepermfix

Fix reshare permission issue

9 years agoMerge pull request #13208 from owncloud/hhvm-streamwrapper-exception
Thomas Müller [Fri, 9 Jan 2015 17:02:28 +0000 (18:02 +0100)]
Merge pull request #13208 from owncloud/hhvm-streamwrapper-exception

HHVM Workaround: Do not use Exception from Stream.

9 years agoMerge pull request #13192 from owncloud/cache_binary_path
Thomas Müller [Fri, 9 Jan 2015 16:46:36 +0000 (17:46 +0100)]
Merge pull request #13192 from owncloud/cache_binary_path

Use memcache for findBinaryPath

9 years agoCheck for existence of $_GET keys
Lukas Reschke [Fri, 9 Jan 2015 16:46:14 +0000 (17:46 +0100)]
Check for existence of $_GET keys

Otherwise PHP errors are thrown in the error log.

9 years agoHHVM Workaround: Do not use Exception from Stream.
Andreas Fischer [Fri, 9 Jan 2015 16:01:17 +0000 (17:01 +0100)]
HHVM Workaround: Do not use Exception from Stream.

Works around https://github.com/facebook/hhvm/issues/2436#issuecomment-69351373

9 years agoMerge pull request #13188 from owncloud/add-check-if-user-is-logged-in
Thomas Müller [Fri, 9 Jan 2015 15:45:53 +0000 (16:45 +0100)]
Merge pull request #13188 from owncloud/add-check-if-user-is-logged-in

Add check if user is logged-in

9 years agoMerge pull request #13196 from owncloud/js-personal-no-password
Robin Appelman [Fri, 9 Jan 2015 15:45:32 +0000 (16:45 +0100)]
Merge pull request #13196 from owncloud/js-personal-no-password

Fix js error in personal settings if there is no password field

9 years agoMerge pull request #13205 from owncloud/remove-shared-icon
Thomas Müller [Fri, 9 Jan 2015 15:40:26 +0000 (16:40 +0100)]
Merge pull request #13205 from owncloud/remove-shared-icon

replace outdated 'shared' people icon with regular share icon as fallback

9 years agoreplace outdated 'shared' people icon with regular share icon as fallback
Jan-Christoph Borchardt [Fri, 9 Jan 2015 15:18:42 +0000 (16:18 +0100)]
replace outdated 'shared' people icon with regular share icon as fallback

9 years agounit tests
Bjoern Schiessle [Fri, 9 Jan 2015 14:39:51 +0000 (15:39 +0100)]
unit tests