summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #15639 from rullzer/fix_15368Morris Jobke2015-04-232-2/+99
|\ | | | | Reset sharedialog values
| * Added unit testsRoeland Jago Douma2015-04-171-0/+94
| |
| * moved from html to $('html') to fix unit testsRoeland Jago Douma2015-04-171-2/+1
| |
| * Reset sharedialog valuesRoeland Jago Douma2015-04-171-0/+4
| |
* | 8.1.0 alpha 2v8.1.0alpha2Frank Karlitschek2015-04-151-2/+2
| |
* | Merge pull request #15805 from owncloud/fileslist-whitespaceMorris Jobke2015-04-221-3/+4
|\ \ | | | | | | add whitespace to bottom of files list to correctly show dropdowns
| * | add whitespace to bottom of files list to correctly show dropdowns, fix #15801Jan-Christoph Borchardt2015-04-221-3/+4
| | |
* | | Merge pull request #15809 from owncloud/view-null-rootVincent Petry2015-04-222-2/+25
|\ \ \ | | | | | | | | dont allow using null as view root
| * | | typoRobin Appelman2015-04-221-1/+1
| | | |
| * | | add unit tests for null handling in viewRobin Appelman2015-04-221-2/+19
| | | |
| * | | dont allow using null as view rootRobin Appelman2015-04-221-0/+6
| | | |
* | | | Merge pull request #15799 from owncloud/fix-enc-folder-moveThomas Müller2015-04-2214-267/+168
|\ \ \ \ | |/ / / |/| | | Fix enc folder move
| * | | fix PHPDocThomas Müller2015-04-221-7/+8
| | | |
| * | | pass KeyStorage via ctorThomas Müller2015-04-223-43/+12
| | | |
| * | | calling renameKeys() on directory level as well - fixes #15778Thomas Müller2015-04-222-9/+18
| | | |
| * | | add $encryptionModuleId to methods of Keys/IStorageThomas Müller2015-04-2213-218/+140
| | | |
* | | | Merge pull request #15787 from owncloud/trash-partfilesMorris Jobke2015-04-222-3/+6
|\ \ \ \ | |_|/ / |/| | | Do not trash part files, delete directly
| * | | Do not trash part files, delete directlyVincent Petry2015-04-212-3/+6
| | | |
* | | | Merge pull request #15549 from owncloud/jcf-fix-cache-updateMorris Jobke2015-04-221-1/+8
|\ \ \ \ | |_|/ / |/| | | don't update identical values
| * | | clarify the duplication of the $params arrayJens-Christian Fischer2015-04-121-1/+2
| | | |
| * | | don't update identical valuesJens-Christian Fischer2015-04-111-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The UPDATE oc_filecache statement blindly overwrites identical data. Databases like Postgres that create a new row on an update and mark the old one as dead will suffer from the previous behaviour, as millions of "new" rows are created in the database. This patch changes the WHERE clause to test for identical values and not updating if the values in the DB are identical to the ones being passed.
* | | | Merge pull request #15757 from owncloud/enc-fixfeofforlastblockBjörn Schießle2015-04-224-6/+94
|\ \ \ \ | | | | | | | | | | Fix encryption feof to not return too early
| * | | | Fix encryption feof to not return too earlyVincent Petry2015-04-204-6/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is because stream_read will pre-cache the next block which causes feof($this->source) to return true prematurely. So we cannot rely on it. Fixed encryption stream wrapper unit tests to actually simulate 6k/8k blocks to make sure we cover the matching logic. Added two data files with 8192 and 8193 bytes.
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-04-22102-14/+314
| | | | |
* | | | | Merge pull request #15734 from owncloud/add-deprecate-tagsThomas Müller2015-04-216-1/+27
|\ \ \ \ \ | |_|_|/ / |/| | | | Add @deprecated to all methods with a proper method in \OCP
| * | | | Add @deprecated to all methods with a proper method in \OCPMorris Jobke2015-04-206-1/+27
| | | | |
* | | | | Merge pull request #15782 from owncloud/hide-modified-multiselectMorris Jobke2015-04-211-1/+10
|\ \ \ \ \ | | | | | | | | | | | | hide modified header when multiselect is active, fix #15779
| * | | | | hide modified header when multiselect is active, fix #15779Jan-Christoph Borchardt2015-04-211-1/+10
| | | | | |
* | | | | | Merge pull request #15721 from oparoz/fix-readonly-cacheThomas Müller2015-04-212-1/+96
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix read-only cache
| * | | | | | Renamed class + split methodsOlivier Paroz2015-04-211-25/+13
| | | | | | |
| * | | | | | Tests for read-only cacheOlivier Paroz2015-04-181-0/+105
| | | | | | |
| * | | | | | Thou shalt not corrupt the answer of a cache requestOlivier Paroz2015-04-181-1/+3
| | | | | | |
* | | | | | | Merge pull request #15690 from owncloud/enc_fix_uploadBjörn Schießle2015-04-212-2/+96
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [encryption] fix upload to sftp
| * | | | | | | get dirname from sharePathBjoern Schiessle2015-04-212-2/+96
| | | | | | | |
* | | | | | | | Merge pull request #15769 from owncloud/files-emptycontentreadonlyJan-Christoph Borchardt2015-04-214-5/+16
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Added empty content message for empty read-only folders
| * | | | | | | | Added empty content message for empty read-only foldersVincent Petry2015-04-214-5/+16
| |/ / / / / / /
* | | | | | | | Merge pull request #15770 from owncloud/fix-15764Morris Jobke2015-04-211-1/+0
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | bring back border in host input field for consistency
| * | | | | | | bring back border in host input field for consistencyArthur Schiwon2015-04-211-1/+0
| |/ / / / / /
* | | | | | | Merge pull request #15713 from owncloud/fix-15707-masterMorris Jobke2015-04-214-39/+47
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | [enc2] Fixing JS errors
| * | | | | | doc and indentThomas Müller2015-04-212-4/+8
| | | | | | |
| * | | | | | Don't pollute the global namespaceThomas Müller2015-04-213-33/+44
| | | | | | |
| * | | | | | make jshint happyThomas Müller2015-04-202-14/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ae681f0061f534b48b45cf9a41f6110c0ff20b1d.
| * | | | | | use a simple function - OC.Encryption is already defined - fixes #15707Thomas Müller2015-04-201-23/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0ca6398aa34e0a3698f3aed0305f0e9299578bbc.
* | | | | | | Merge pull request #15636 from owncloud/enc2_performance_improvementBjörn Schießle2015-04-211-3/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [encryption2] set size and unencrypted size to zero at the beginning of a write operation
| * | | | | | | set size and unencrypted size to zero on fopenBjoern Schiessle2015-04-201-3/+2
| | | | | | | |
* | | | | | | | Merge pull request #15753 from owncloud/remove-app-version-from-disabled-listThomas Müller2015-04-213-4/+25
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Remove the app version from disabled app list
| * | | | | | | | Remove the app version from disabled app listJoas Schilling2015-04-203-4/+25
| | | | | | | | |
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-04-2110-8/+44
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #15677 from owncloud/enc_reset_private_key_passwordThomas Müller2015-04-205-10/+379
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [encryption] let user update the private key password
| * | | | | | | | Dont use the old .status wayJoas Schilling2015-04-203-24/+12
| | | | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-11 11:18:53 +0000