summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix warning box in IE8Morris Jobke2013-10-161-0/+5
| | | | * simulates a black transparent background on a blue pane
* Merge pull request #5157 from owncloud/fixing-appframework-masterThomas Müller2013-10-1624-466/+216
|\ | | | | Fixing appframework for OC6
| * re-enable test in SecurityMiddlewareTestThomas Müller2013-10-161-5/+0
| |
| * Merge branch 'master' into fixing-appframework-masterThomas Müller2013-10-161013-21948/+20262
| |\ | |/ |/| | | | | | | Conflicts: lib/private/appframework/middleware/security/securitymiddleware.php tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
* | Merge pull request #5067 from owncloud/urlParams_fixThomas Müller2013-10-166-19/+27
|\ \ | | | | | | Get urlParams registered before Request is instantiated
| * | Get urlParams registered before Request is instantiatedThomas Tanghus2013-10-016-19/+27
| | |
* | | Merge pull request #5353 from owncloud/files-dndtodirbrokenMorris Jobke2013-10-161-14/+22
|\ \ \ | | | | | | | | Fixed drag and drop to subfolder and breadcrumb
| * | | Fixed drag and drop upload to breadcrumbVincent Petry2013-10-151-26/+22
| | | |
| * | | Fixed drag and drop onto foldersVincent Petry2013-10-151-5/+17
| | | | | | | | | | | | | | | | Fixes #5351
* | | | Merge pull request #5325 from owncloud/setup-fs-on-apache-auth-backendThomas Müller2013-10-161-5/+1
|\ \ \ \ | | | | | | | | | | file system is now initialized with apache authentication as well
| * | | | there shall be tabsThomas Müller2013-10-141-1/+1
| | | | |
| * | | | file system is now initialized with apache authentication as wellThomas Müller2013-10-141-6/+2
| | | | |
* | | | | Merge pull request #5329 from owncloud/enc_fix_unencrypted_sizeBjörn Schießle2013-10-161-2/+19
|\ \ \ \ \ | | | | | | | | | | | | try to fix unencrypted file size if it doesn't look plausible
| * | | | | revert last changesBjoern Schiessle2013-10-161-3/+1
| | | | | |
| * | | | | added another test, if unencrypted size and encrypted size are equal we can ↵Bjoern Schiessle2013-10-151-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | also assume that something is wrong
| * | | | | fix array keyBjoern Schiessle2013-10-141-1/+1
| | | | | |
| * | | | | try to fix unencrypted file size if it doesn't look plausibleBjoern Schiessle2013-10-141-2/+19
| |/ / / /
* | | | | Merge pull request #5354 from owncloud/enc_testsMorris Jobke2013-10-161-216/+106
|\ \ \ \ \ | | | | | | | | | | | | added simple test for getFileSize proxy
| * | | | | fix commentBjoern Schiessle2013-10-151-1/+1
| | | | | |
| * | | | | added simple test for getFileSize proxyBjoern Schiessle2013-10-151-216/+106
| | | | | |
* | | | | | 6.0 alpha 2v6.0.0alpha2Frank Karlitschek2013-10-161-2/+2
| | | | | |
* | | | | | Merge pull request #5333 from owncloud/avater_with_encryptionBjörn Schießle2013-10-162-6/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | avatars should also work with encryption after pr #5332 was merged
| * | | | | | Fix avatar unittestkondou2013-10-151-1/+1
| | | | | | |
| * | | | | | Merge branch 'master' into avater_with_encryptionBjoern Schiessle2013-10-1512-40/+135
| |\| | | | |
| * | | | | | test should work nowBjoern Schiessle2013-10-151-1/+0
| | | | | | |
| * | | | | | avatars should also work with encryption after pr #5332 was mergedBjoern Schiessle2013-10-141-4/+0
| | |/ / / / | |/| | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-16387-3453/+3676
| | | | | |
* | | | | | Merge pull request #5334 from owncloud/files-sharing-actionsafteruploadMorris Jobke2013-10-153-23/+29
|\ \ \ \ \ \ | | | | | | | | | | | | | | Files sharing actions + navigation fixes
| * | | | | | Disabled ajax mode for public files viewVincent Petry2013-10-142-21/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ajax loading is not supported yet for public files view. This fix disabled the history API, ajax loading and ajax directory switch in public mode until it is implemented properly.
| * | | | | | Fixed file permissions after public uploadVincent Petry2013-10-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #5328
* | | | | | | Merge pull request #5350 from owncloud/files-preventdeletemountpointVincent Petry2013-10-151-1/+2
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Prevent renaming/deleting mount points
| * | | | | | Prevent renaming/deleting mount pointsVincent Petry2013-10-151-1/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed permissions returned for mount points to not include update and delete permissions. Fixes #5291
* | | | | | Merge pull request #5295 from owncloud/show-eye-in-personalRaghu Nayyar2013-10-152-10/+6
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Shows The Eye permanently in the Confirm Password field in Personal Settings
| * | | | | Removes Bogus showpassword js. thx @PVince81raghunayyar2013-10-151-3/+1
| | | | | |
| * | | | | Should Display PasswordToggle Eye Everywhere.raghunayyar2013-10-152-8/+1
| | | | | |
| * | | | | Shows The Eye permanently in the Confirm Password field in Personal Settings ↵raghunayyar2013-10-122-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | - fix #5167
* | | | | | Merge pull request #5332 from owncloud/enc_run_proxy_only_for_filesMorris Jobke2013-10-151-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | check if we are writing to user/files, otherwise skip encryption
| * | | | | | check if we are writing to user/files, otherwise skip encryptionBjoern Schiessle2013-10-141-1/+2
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #5269 from owncloud/ocs_share_api_add_received_fromBjörn Schießle2013-10-152-8/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | ocs share api: add "received_from" and "received_from_displayname" field
| * | | | | | fix api testsBjoern Schiessle2013-10-111-1/+2
| | | | | | |
| * | | | | | add "received_from" and "received_from_displayname" field in case of a ↵Bjoern Schiessle2013-10-101-7/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | reshared file to the output
* | | | | | | Merge pull request #5341 from owncloud/fix-logout-link-htmlVincent Petry2013-10-151-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix logout link HTML.
| * | | | | | | Fix logout link HTML.Andreas Fischer2013-10-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | <a id="logout" href=/projects/owncloud/core/index.php?logout=true>
* | | | | | | | Merge pull request #5340 from owncloud/fixing-5251-mastericewind19912013-10-142-2/+36
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | streamCopy() should return proper structure.
| * | | | | | | streamCopy() should return proper structure.Thomas Müller2013-10-142-2/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Callers of streamCopy() expect an array to be returned containing count and result.
* | | | | | | | Merge pull request #5330 from owncloud/files-removedfileactionsbkgVincent Petry2013-10-141-8/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Removed extra bkg color on file actions when row is selected/hovered on
| * | | | | | | Removed extra bkg color on file actions when row is selected/hovered onVincent Petry2013-10-141-8/+0
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #4867 from owncloud/fixing-4546-masterThomas Müller2013-10-144-19/+75
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Adding detection of aborted uploads for chunked uploads
| * \ \ \ \ \ \ Merge branch 'master' into fixing-4546-masterThomas Müller2013-10-14876-19982/+21779
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/private/connector/sabre/file.php
| * | | | | | | | moving createFileChunked() to OC_Connector_Sabre_FileThomas Müller2013-10-071-15/+34
| | | | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-05 00:51:06 +0000