Commit Graph

22463 Commits

Author SHA1 Message Date
Morris Jobke 870bc429b2 Merge pull request #13416 from owncloud/reauthenticate-if-session-differs-from-basic-auth
Prioritise Basic Auth header over Cookie
2015-01-19 22:23:02 +01:00
Lukas Reschke cbffaff7a0 Merge pull request #13480 from owncloud/mysql-autocommit
set MySQL autocommit on connection setup
2015-01-19 19:39:26 +01:00
Lukas Reschke 6c1e13a6ed Merge pull request #13478 from owncloud/tags-chunkedquery
Fix chunked query for tags + unit test
2015-01-19 18:15:13 +01:00
Lukas Reschke fcf4e2a44c Merge pull request #13471 from owncloud/fix-blog-typo
fix typo of blog -> changed to block
2015-01-19 17:54:32 +01:00
Thomas Müller baefefbbc8 set MySQL autocommit on connection setup 2015-01-19 17:20:49 +01:00
Vincent Petry ef8d38ca27 Fix chunked query for tags + unit test 2015-01-19 17:05:44 +01:00
Thomas Müller 4894a2c458 Merge pull request #13466 from owncloud/Undefined-index-mimetype-cache
check if mimetype is set - fixes #13452
2015-01-19 16:35:07 +01:00
Lukas Reschke 730460c9fa Close session properly 2015-01-19 16:25:44 +01:00
Morris Jobke 2229290cca fix typo of blog -> changed to block
* fixes #13460
2015-01-19 15:57:53 +01:00
Thomas Müller c9db9523b1 Merge pull request #13419 from owncloud/drop-animation-user-list
Drop the hide and show of new users in user list
2015-01-19 15:08:57 +01:00
Thomas Müller 65041440de check is mimetype is set - fixed #13452 2015-01-19 15:04:53 +01:00
Thomas Müller 1810ea2d33 Merge pull request #13461 from owncloud/remove-strip-slashes
Remove stripslashes() from newfolder.php
2015-01-19 14:47:34 +01:00
Lukas Reschke 003fc183a2 Remove stripslashes() from newfolder.php 2015-01-19 14:12:36 +01:00
Morris Jobke cd4c7fd11f Merge pull request #13377 from owncloud/trashbin_storage_wrapper
[trashbin] replace hook with storage wrapper
2015-01-19 13:17:52 +01:00
Thomas Müller d2d6472e39 Merge pull request #13423 from owncloud/share-fixfindshareforuserwithmultiplegroups
Fix getItemSharedWithUser for groups
2015-01-19 12:34:28 +01:00
Thomas Müller d75af7ddd2 Merge pull request #13362 from owncloud/fix-11442
LDAP Wizared: update user or group count only, when the multiselect is closed
2015-01-19 12:22:24 +01:00
Thomas Müller fa9834372d Merge pull request #13443 from owncloud/fix-filtering-for-users
Fix filtering for users when $gid is empty
2015-01-19 11:39:27 +01:00
Bjoern Schiessle 15ae6b47ed replace hook with storage wrapper 2015-01-19 09:16:15 +01:00
Thomas Müller 4fcfedb03c Merge pull request #13438 from owncloud/cache-the-array
Reuse the array key of mimetypes
2015-01-19 08:40:25 +01:00
Joas Schilling 5b3ff7867f Merge pull request #13447 from owncloud/fix_typo
fix typo - caused by 3d997e8c62
2015-01-19 08:30:43 +01:00
Jenkins for ownCloud 3404bd8cdd [tx-robot] updated from transifex 2015-01-19 01:54:31 -05:00
Georg Ehrke 9cef90da98 Merge pull request #13448 from owncloud/fix-exif-orientation
Fix exif orientation for flipped images
2015-01-19 00:12:55 +01:00
Morris Jobke a28d3b594b Fix exif orientation for flipped images
fixes #13363

Links:
 * http://www.daveperrett.com/articles/2012/07/28/exif-orientation-handling-is-a-ghetto/
 * Example data: https://github.com/recurser/exif-orientation-examples
2015-01-18 23:15:52 +01:00
Morris Jobke 7b9343f385 fix typo - caused by 3d997e8c62 2015-01-18 22:08:11 +01:00
Morris Jobke aff22b3225 Merge pull request #13276 from Sugaroverdose/fix_#11348
fix safari rename button positioning #11348
2015-01-18 21:42:06 +01:00
Lukas Reschke 48126c3f54 Merge pull request #13433 from owncloud/favoritesl10n
fix unlocalized favorites browser title and alttext
2015-01-18 20:36:19 +01:00
Lukas Reschke 2272bcedeb Fix filtering for users when $gid is empty
Previously when $gid was empty the users were not filtered at all. Rendering the search function in the user management pretty useless.

Fixes itself
2015-01-18 18:31:03 +01:00
Frank Karlitschek ca442dfc97 increase version. This time for real 2015-01-18 15:28:48 +01:00
Thomas Müller 3d6f4ac24e Merge pull request #13457 from owncloud/enc-skippartfiles
Skip stray part files during initial encryption
2015-01-19 14:40:21 +01:00
Vincent Petry 7a1ab3bb5e Add class attribute types in encryption Util class 2015-01-19 13:01:52 +01:00
Vincent Petry 7c3c26ab94 Skip stray part files during initial encryption 2015-01-19 13:01:37 +01:00
Lukas Reschke 309cc9a6ca Reuse the array key of mimetypes
This function is called a lot of times and was really slow before due to not reusing the same array.

Previously when it was called 500'000 times it took about 2seconds, now we're down to 0.2 seconds on my local machine.

Ref https://github.com/owncloud/core/issues/13434
2015-01-18 14:50:34 +01:00
Frank Karlitschek 8285744e4a 8.0.0 beta 2 2015-01-18 14:44:28 +01:00
Jenkins for ownCloud 31cd5185f1 [tx-robot] updated from transifex 2015-01-18 01:54:34 -05:00
Volkan Gezer d253ef51a5 fix unlocalized favorites browser title and alttext 2015-01-17 16:52:36 +01:00
Lukas Reschke dfbc405a45 Prioritise Basic Auth header over Cookie
There are a lot of clients that support multiple WebDAV accounts in the same application. However, they resent all the cookies they received from one of the accounts also to the other one. In the case of ownCloud this means that we will always show the user from the session and not the user that is specified in the basic authentication header.

This patch adds a workaround the following way:

1. If the user authenticates via the Sabre Auth Connector add a hint to the session that this was authorized via Basic Auth (this is to prevent logout CSRF)
2. If the request contains this hint and the username specified in the basic auth header differs from the one in the session relogin the user using basic auth

Fixes https://github.com/owncloud/core/issues/11400 and https://github.com/owncloud/core/issues/13245 and probably some other issues as well.

This requires proper testing also considering LDAP / Shibboleth and whatever instances.
2015-01-17 13:29:07 +01:00
Jenkins for ownCloud 60c4cb1dd6 [tx-robot] updated from transifex 2015-01-17 01:54:40 -05:00
Lukas Reschke 744cf713f7 Merge pull request #13319 from owncloud/replace-line-breaks-in-app-description
replace line breaks in the app description by spaces - fixes #13315
2015-01-17 01:03:41 +01:00
Sugaroverdose 141908bd9c Add ie8 text-overflow: ellipsis support
minimum browser window width ≈ 1280px
2015-01-17 01:43:42 +03:00
Sugaroverdose b2879d3a99 use some magic to make 'popular browsers' work
as expected with inline-block span
2015-01-16 23:36:35 +03:00
Robin McCorkell 08d118eab7 Merge pull request #13421 from owncloud/fix-rename
Fixes shifted rename field
2015-01-16 19:15:48 +00:00
Morris Jobke 1b81339dfd Drop the hide and show of new users in user list
* causes the first load after the initial load to hide some users in the viewport
  and showing them again, but with a scrolled up viewport
* causes higher load for nearly never visible effects
* fixes #12962
2015-01-16 18:11:31 +01:00
Vincent Petry 40931a8b0d Fix getItemSharedWithUser for groups
Fixed SQL query for whenever a user has more than one group.
Added missing $owner where clause for group lookup.
Added unit tests for the group cases.
2015-01-16 18:11:13 +01:00
Morris Jobke 48ad4ba9a0 Fixes shifted rename field 2015-01-16 17:32:18 +01:00
Morris Jobke 3465604cf9 Merge pull request #13418 from owncloud/app-icons
add icon for Provisioning API
2015-01-16 15:22:44 +01:00
Jan-Christoph Borchardt b81c89d400 compress icons of LDAP and WebDAV-Auth 2015-01-16 14:43:27 +01:00
Jan-Christoph Borchardt 7624b395f2 add icon for Provisioning API 2015-01-16 14:43:14 +01:00
Morris Jobke 1c4668f808 Merge pull request #13399 from owncloud/trashbin-fixpreviewroute
Fix preview route for trashbin
2015-01-16 13:48:02 +01:00
Morris Jobke 9526acbcc4 Merge pull request #13413 from owncloud/apps-cancelloadonswitch
Cancel app list load when switching categories
2015-01-16 13:42:40 +01:00
Morris Jobke 0f0204ee35 Merge pull request #13160 from owncloud/extstorage-ocbackendnopartfile
Disable part files for OC ext storage backend + s2s backend
2015-01-16 13:38:59 +01:00