summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-01-2020-10/+56
|
* Merge pull request #13416 from ↵Morris Jobke2015-01-191-2/+11
|\ | | | | | | | | owncloud/reauthenticate-if-session-differs-from-basic-auth Prioritise Basic Auth header over Cookie
| * Prioritise Basic Auth header over CookieLukas Reschke2015-01-171-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | fix typo of blog -> changed to blockMorris Jobke2015-01-192-2/+2
| | | | | | | | * fixes #13460
* | 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
| | |
* | | 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 #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
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-196-12/+12
| | |
* | | 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
| | |_|/ | |/| |
* / | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-1810-16/+18
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-1716-26/+320
| | |
* | | Fixes shifted rename fieldMorris Jobke2015-01-161-1/+1
| | |
* | | compress icons of LDAP and WebDAV-AuthJan-Christoph Borchardt2015-01-162-118/+6
| | |
* | | add icon for Provisioning APIJan-Christoph Borchardt2015-01-161-0/+4
| | |
* | | Merge pull request #13399 from owncloud/trashbin-fixpreviewrouteMorris Jobke2015-01-161-5/+2
|\ \ \ | | | | | | | | Fix preview route for trashbin
| * | | Fix preview route for trashbinVincent Petry2015-01-151-5/+2
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-166-4/+102
| | | |
* | | | Disallow ctrl click to select when selection not allowedVincent Petry2015-01-152-1/+31
| | | |
* | | | Auto-blur when clicking on file to downloadVincent Petry2015-01-151-0/+2
| | | |
* | | | Fixed thumbnal z-index for when no checkbox is thereVincent Petry2015-01-151-0/+2
|/ / / | | | | | | | | | | | | | | | In file lists with no selection checkbox, the CSS selector is different. The thumbnail also needs position:absolute and a z-index to be displayed above the row's grey highlight.
* | | Merge pull request #13370 from Sugaroverdose/fix_#13322Thomas Müller2015-01-151-0/+1
|\ \ \ | | | | | | | | Force browser to redraw favorite icon on src change
| * | | Force browser to redraw favorite iconSugaroverdose2015-01-151-0/+1
| |/ / | | | | | | | | | on src change
* | | Merge pull request #13347 from owncloud/share-scanpermissionsfromsourceMorris Jobke2015-01-153-1/+47
|\ \ \ | | | | | | | | Use source storage permissions when scanning shared storage
| * | | Use source storage permissions when scanning shared storageVincent Petry2015-01-143-1/+47
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-1512-8/+76
| | | |
* | | | Merge pull request #13352 from owncloud/hhvm-array-keyRobin McCorkell2015-01-151-5/+6
|\ \ \ \ | | | | | | | | | | HHVM: Do not use key() on array as the result depends on the internal array pointer.
| * | | | Do not use key() on array as the result depends on the internal array pointer.Andreas Fischer2015-01-151-5/+6
| | | | |
* | | | | Merge pull request #13350 from owncloud/autoload-translationsMorris Jobke2015-01-148-11/+0
|\ \ \ \ \ | | | | | | | | | | | | Autoload app's js translations
| * | | | | Remove unneeded addTranslations() callsVincent Petry2015-01-148-11/+0
| | | | | |
* | | | | | Merge pull request #13351 from owncloud/check-for-existenceLukas Reschke2015-01-141-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Check for existence of $_GET keys
| * | | | | | Check for existence of $_GET keysLukas Reschke2015-01-141-2/+2
| | |/ / / / | |/| | | | | | | | | | | | | | | | `$dir` may for example very well not get passed at well.
* / | | | | remove deprecated code - fixes #13119Thomas Müller2015-01-143-50/+51
|/ / / / /
* | | | | Merge pull request #13345 from owncloud/increase-files-external-versionsMorris Jobke2015-01-142-2/+5
|\ \ \ \ \ | |/ / / / |/| | | | Increase files_externals oC required version and its own version
| * | | | Increase files_externals oC required version and its own versionJoas Schilling2015-01-142-2/+5
| |/ / /
* | | | Merge pull request #13332 from oparoz/fix-download-buttonThomas Müller2015-01-141-1/+6
|\ \ \ \ | | | | | | | | | | Download the current public folder only
| * | | | Download the current public folder onlyOlivier Paroz2015-01-141-1/+6
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | 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.