wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
24471 commits 157 branches 562 tags 714 MiB
Commit graph

24471 commits

This branch
This branch
All branches
Author SHA1 Message Date
Clark Tomlinson
c81bc152d7 fixing return values and adding tests 2015-04-22 10:46:55 -04:00
Thomas Müller
750f0bc489 Merge pull request #15799 from owncloud/fix-enc-folder-move 
Fix enc folder move
 2015-04-22 16:04:29 +02:00
Morris Jobke
42d9ba0f83 Merge pull request #15787 from owncloud/trash-partfiles 
Do not trash part files, delete directly
 2015-04-22 14:10:26 +02:00
Morris Jobke
a971fa8a90 Merge pull request #15549 from owncloud/jcf-fix-cache-update 
don't update identical values
 2015-04-22 13:34:08 +02:00
Thomas Müller
0042bdd2e7 fix PHPDoc 2015-04-22 13:12:52 +02:00
Thomas Müller
225cde2183 pass KeyStorage via ctor 2015-04-22 13:09:42 +02:00
Thomas Müller
987bc138df calling renameKeys() on directory level as well - fixes #15778 2015-04-22 12:12:27 +02:00
Thomas Müller
fc4127dd62 add $encryptionModuleId to methods of Keys/IStorage 2015-04-22 11:53:05 +02:00
Björn Schießle
570718fb6b Merge pull request #15757 from owncloud/enc-fixfeofforlastblock 
Fix encryption feof to not return too early
 2015-04-22 11:32:21 +02:00
Jenkins for ownCloud
d7bdf60559 [tx-robot] updated from transifex 2015-04-22 01:55:38 -04:00
Thomas Müller
40fcc7480c Merge pull request #15734 from owncloud/add-deprecate-tags 
Add @deprecated to all methods with a proper method in \OCP
 2015-04-21 23:57:49 +02:00
Vincent Petry
ffc796edcb Do not trash part files, delete directly 2015-04-21 18:28:15 +02:00
Morris Jobke
9dc12d40d8 Merge pull request #15782 from owncloud/hide-modified-multiselect 
hide modified header when multiselect is active, fix #15779
 2015-04-21 16:41:41 +02:00
Thomas Müller
438cb27471 Merge pull request #15721 from oparoz/fix-readonly-cache 
Fix read-only cache
 2015-04-21 16:30:56 +02:00
Björn Schießle
1ee2ee8432 Merge pull request #15690 from owncloud/enc_fix_upload 
[encryption] fix upload to sftp
 2015-04-21 15:41:45 +02:00
Jan-Christoph Borchardt
723804ffd7 hide modified header when multiselect is active, fix #15779 2015-04-21 15:38:34 +02:00
Jan-Christoph Borchardt
1d1e188a7a Merge pull request #15769 from owncloud/files-emptycontentreadonly 
Added empty content message for empty read-only folders
 2015-04-21 15:30:57 +02:00
Morris Jobke
503243e191 Merge pull request #15770 from owncloud/fix-15764 
bring back border in host input field for consistency
 2015-04-21 14:59:46 +02:00
Bjoern Schiessle
19e8c4fcb1 get dirname from sharePath 2015-04-21 14:58:01 +02:00
Olivier Paroz
9695e33e34 Renamed class + split methods 2015-04-21 14:40:11 +02:00
Vincent Petry
53a23364ef Added empty content message for empty read-only folders 2015-04-21 14:31:13 +02:00
Morris Jobke
4b968da9e6 Merge pull request #15713 from owncloud/fix-15707-master 
[enc2] Fixing JS errors
 2015-04-21 12:47:43 +02:00
Arthur Schiwon
19a2a22de1 bring back border in host input field for consistency 2015-04-21 12:22:40 +02:00
Thomas Müller
490e779424 doc and indent 2015-04-21 12:19:15 +02:00
Thomas Müller
4a2f8f81ca Don't pollute the global namespace 2015-04-21 12:01:56 +02:00
Björn Schießle
b0fcf0fa0e Merge pull request #15636 from owncloud/enc2_performance_improvement 
[encryption2] set size and unencrypted size to zero at the beginning of a write operation
 2015-04-21 11:01:33 +02:00
Thomas Müller
edbcb834c7 Merge pull request #15753 from owncloud/remove-app-version-from-disabled-list 
Remove the app version from disabled app list
 2015-04-21 10:26:16 +02:00
Jenkins for ownCloud
c548066d2c [tx-robot] updated from transifex 2015-04-21 01:55:37 -04:00
Thomas Müller
55962c5f5a make jshint happy 
This reverts commit ae681f0061.
 2015-04-20 20:51:15 +02:00
Thomas Müller
3bc5c1c3cf use a simple function - OC.Encryption is already defined - fixes #15707 
This reverts commit 0ca6398aa3.
 2015-04-20 20:50:08 +02:00
Thomas Müller
b78e76a1cb Merge pull request #15677 from owncloud/enc_reset_private_key_password 
[encryption] let user update the private key password
 2015-04-20 20:48:12 +02:00
Vincent Petry
a13088818a Merge pull request #15748 from owncloud/fixing-enc-filesize-once-more 
Introduce Storage::getData() to allow storage implementations more contr...
 2015-04-20 18:36:23 +02:00
Vincent Petry
76dad297ff Fix encryption feof to not return too early 
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.
 2015-04-20 18:32:40 +02:00
Joas Schilling
04674c06cc Dont use the old .status way 2015-04-20 18:26:14 +02:00
Joas Schilling
3f96662609 Fix several minor things 2015-04-20 17:44:34 +02:00
Joas Schilling
2c396a7080 Remove the app version from disabled app list 2015-04-20 17:03:19 +02:00
Lukas Reschke
fe2cbc3795 Merge pull request #15744 from owncloud/fix-inverted-path-in-resourcenotfound 
Fix wrong path generation
 2015-04-20 16:55:36 +02:00
Thomas Müller
32995ace1c move permission related code into getMetaData() 2015-04-20 16:50:12 +02:00
Morris Jobke
3e8f6cdba9 Merge pull request #15635 from owncloud/issue/15634-empty-txt-previews 
Scale up the font on larger previews
 2015-04-20 15:55:32 +02:00
Thomas Müller
a637bd7f2b Avoid function name collision in dropbox external storage 2015-04-20 14:56:51 +02:00
Thomas Müller
23f1bdc3d4 Introduce Storage::getMetaData() to allow storage implementations more control over the data array 2015-04-20 14:54:54 +02:00
Morris Jobke
ce2c8533d9 Merge pull request #15735 from owncloud/fix-visibility 
Fix visibility of interfaces in \OCP
 2015-04-20 14:39:15 +02:00
Thomas Müller
92b60e36de Introduce Storage::getData() to allow storage implementations more control over the data array 2015-04-20 14:25:39 +02:00
Lukas Reschke
3959f8ac4e Merge pull request #15637 from owncloud/migrate-certificate-stuff 
Migrate personal certificate handling to AppFramework controllers
 2015-04-20 13:56:35 +02:00
Lukas Reschke
e9d6807c5c Merge pull request #15733 from owncloud/remove-oc_backgroundjob 
Removed OC_BackgroundJob - reduce class overhead
 2015-04-20 13:17:58 +02:00
Morris Jobke
0a594cd3a5 Add @deprecated to all methods with a proper method in \OCP 2015-04-20 13:15:45 +02:00
Joas Schilling
5063c1dfe0 Merge pull request #15747 from owncloud/ldap-remove-deprecated-const-usage-group 
move away from deprecated consts
 2015-04-20 13:12:41 +02:00
Lukas Reschke
9bc48451b9 Adjust tests and statuscode 2015-04-20 13:00:02 +02:00
Morris Jobke
8935369564 fix date variable 2015-04-20 13:00:02 +02:00
Lukas Reschke
21f0476d31 Fix files 2015-04-20 13:00:02 +02:00