summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add a test case for memcaches to store an arrayJoas Schilling2015-01-201-0/+6
|
* Merge pull request #13454 from owncloud/improve-empty-displaynameJoas Schilling2015-01-201-2/+2
|\ | | | | also show message for empty display name if change of it isn't allowed
| * also show message for empty display name if change of it isn't allowedMorris Jobke2015-01-191-2/+2
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-01-2036-26/+220
| |
* | Merge pull request #13416 from ↵Morris Jobke2015-01-192-13/+44
|\ \ | | | | | | | | | | | | owncloud/reauthenticate-if-session-differs-from-basic-auth Prioritise Basic Auth header over Cookie
| * | Close session properlyLukas Reschke2015-01-191-0/+1
| | |
| * | Prioritise Basic Auth header over CookieLukas Reschke2015-01-172-13/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge pull request #13480 from owncloud/mysql-autocommitLukas Reschke2015-01-191-4/+9
|\ \ \ | | | | | | | | set MySQL autocommit on connection setup
| * | | set MySQL autocommit on connection setupThomas Müller2015-01-191-4/+9
| | | |
* | | | Merge pull request #13478 from owncloud/tags-chunkedqueryLukas Reschke2015-01-192-4/+30
|\ \ \ \ | | | | | | | | | | Fix chunked query for tags + unit test
| * | | | Fix chunked query for tags + unit testVincent Petry2015-01-192-4/+30
| |/ / /
* | | | Merge pull request #13471 from owncloud/fix-blog-typoLukas Reschke2015-01-192-2/+2
|\ \ \ \ | |/ / / |/| | | fix typo of blog -> changed to block
| * | | fix typo of blog -> changed to blockMorris Jobke2015-01-192-2/+2
| | | | | | | | | | | | | | | | * fixes #13460
* | | | Merge pull request #13466 from owncloud/Undefined-index-mimetype-cacheThomas Müller2015-01-191-1/+1
|\ \ \ \ | |/ / / |/| | | check if mimetype is set - fixes #13452
| * | | check is mimetype is set - fixed #13452Thomas Müller2015-01-191-1/+1
| | | |
* | | | Merge pull request #13419 from owncloud/drop-animation-user-listThomas Müller2015-01-191-7/+0
|\ \ \ \ | |/ / / |/| | | Drop the hide and show of new users in user list
| * | | Drop the hide and show of new users in user listMorris Jobke2015-01-161-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | | | Merge pull request #13461 from owncloud/remove-strip-slashesThomas Müller2015-01-191-2/+1
|\ \ \ \ | | | | | | | | | | Remove stripslashes() from newfolder.php
| * | | | Remove stripslashes() from newfolder.phpLukas Reschke2015-01-191-2/+1
| | | | |
* | | | | increase version. This time for realFrank Karlitschek2015-01-181-1/+1
| | | | |
* | | | | Merge pull request #13457 from owncloud/enc-skippartfilesThomas Müller2015-01-191-0/+55
|\ \ \ \ \ | |/ / / / |/| | | | Skip stray part files during initial encryption
| * | | | Add class attribute types in encryption Util classVincent Petry2015-01-191-0/+51
| | | | |
| * | | | Skip stray part files during initial encryptionVincent Petry2015-01-191-0/+4
| | | | |
* | | | | Merge pull request #13377 from owncloud/trashbin_storage_wrapperMorris Jobke2015-01-199-53/+109
|\ \ \ \ \ | | | | | | | | | | | | [trashbin] replace hook with storage wrapper
| * | | | | replace hook with storage wrapperBjoern Schiessle2015-01-199-53/+109
| | |_|_|/ | |/| | |
* | | | | Merge pull request #13423 from ↵Thomas Müller2015-01-192-9/+53
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | owncloud/share-fixfindshareforuserwithmultiplegroups Fix getItemSharedWithUser for groups
| * | | | | Fix getItemSharedWithUser for groupsVincent Petry2015-01-162-9/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Merge pull request #13362 from owncloud/fix-11442Thomas Müller2015-01-193-38/+92
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | LDAP Wizared: update user or group count only, when the multiselect is closed
| * | | | | coding styleArthur Schiwon2015-01-152-5/+8
| | | | | |
| * | | | | update user or group count only, when the multiselect is closedArthur Schiwon2015-01-141-4/+34
| | | | | |
| * | | | | allow to read again objectclasses and groups under certain conditionsArthur Schiwon2015-01-142-2/+31
| | | | | |
| * | | | | JS cleanupArthur Schiwon2015-01-133-34/+26
| | | | | |
* | | | | | Merge pull request #13443 from owncloud/fix-filtering-for-usersThomas Müller2015-01-192-1/+128
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Fix filtering for users when $gid is empty
| * | | | | Fix filtering for users when $gid is emptyLukas Reschke2015-01-182-1/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously when $gid was empty the users were not filtered at all. Rendering the search function in the user management pretty useless. Fixes itself
* | | | | | Merge pull request #13438 from owncloud/cache-the-arrayThomas Müller2015-01-191-70/+71
|\ \ \ \ \ \ | | | | | | | | | | | | | | Reuse the array key of mimetypes
| * | | | | | Reuse the array key of mimetypesLukas Reschke2015-01-181-70/+71
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge pull request #13447 from owncloud/fix_typoJoas Schilling2015-01-191-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | fix typo - caused by 3d997e8c62bd752f38bcc11f02fb2af0e46d9154
| * | | | | | fix typo - caused by 3d997e8c62bd752f38bcc11f02fb2af0e46d9154Morris Jobke2015-01-181-1/+1
| | |/ / / / | |/| | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-1910-14/+20
| | | | | |
* | | | | | Merge pull request #13448 from owncloud/fix-exif-orientationGeorg Ehrke2015-01-191-5/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix exif orientation for flipped images
| * | | | | | Fix exif orientation for flipped imagesMorris Jobke2015-01-181-5/+12
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge pull request #13276 from Sugaroverdose/fix_#11348Morris Jobke2015-01-182-4/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | fix safari rename button positioning #11348
| * | | | | | Add ie8 text-overflow: ellipsis supportSugaroverdose2015-01-171-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | minimum browser window width ≈ 1280px
| * | | | | | use some magic to make 'popular browsers' workSugaroverdose2015-01-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | as expected with inline-block span
| * | | | | | fix_#11348 Safari rename button positioningSergei Shuykov2015-01-162-5/+6
| | | | | | |
* | | | | | | Merge pull request #13433 from owncloud/favoritesl10nLukas Reschke2015-01-182-2/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | fix unlocalized favorites browser title and alttext
| * | | | | | fix unlocalized favorites browser title and alttextVolkan Gezer2015-01-172-2/+2
| | |/ / / / | |/| | | |
* | | | | | 8.0.0 beta 2v8.0.0beta1Frank Karlitschek2015-01-181-2/+2
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-1816-22/+62
|/ / / / /
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-1766-116/+946
| | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-29 18:04:39 +0000