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

10729 commits

Author SHA1 Message Date
Jenkins for ownCloud
83a13c0635 [tx-robot] updated from transifex 2015-07-20 01:54:47 -04:00
Morris Jobke
37d085901b Merge pull request #17706 from rullzer/external_diricon_filelist 
The external directories should get the correct icon in filelist
 2015-07-17 16:39:46 +02:00
Roeland Jago Douma
b0f21c0a43 The external directories should get the correct icon 2015-07-17 14:30:12 +02:00
Jenkins for ownCloud
8723410319 [tx-robot] updated from transifex 2015-07-17 01:54:52 -04:00
Vincent Petry
15877ac7eb Merge pull request #17474 from owncloud/fix_trashbin 
Don't try to move files to the trashbin outside of user/files
 2015-07-16 14:15:45 +02:00
Thomas Müller
d6f02eb703 Merge pull request #17500 from owncloud/encryption_migration_improvements 
Only clean up if migration finished succesfully
 2015-07-16 14:03:21 +02:00
blizzz
bfb90d10ed Merge pull request #17046 from nicolas-grekas/fix-16654 
Do not use OC*::mb_*_replace(), they are useless
 2015-07-16 11:35:25 +02:00
Nicolas Grekas
472d48f6e3 Do not use OC*::mb_*_replace(), they are useless 2015-07-16 11:00:04 +02:00
Robin Appelman
23d1cf26b9 Lock scanner to the given user 2015-07-15 14:08:06 +02:00
Morris Jobke
5cd7f7eccd Merge pull request #17623 from owncloud/fed-throwcorrectexception 
Throw storage not available on guzzle error
 2015-07-14 10:12:32 +02:00
Jenkins for ownCloud
2d5ddb02fa [tx-robot] updated from transifex 2015-07-14 01:54:45 -04:00
Vincent Petry
3d6be69f25 Throw storage not available on guzzle error 
If the remote server is in maintenance mode, we must throw storage not
available exception instead of not found which might auto-remove the
share.
 2015-07-13 18:51:25 +02:00
Vincent Petry
b3b080e1c0 Strip public webdav info about sharing and mount points 
Remove information about whether a file is an incoming share or mount
point when requested over public webdav.
 2015-07-13 14:20:35 +02:00
Jenkins for ownCloud
52e9c94e08 [tx-robot] updated from transifex 2015-07-13 01:54:50 -04:00
Jenkins for ownCloud
7cf6badad5 [tx-robot] updated from transifex 2015-07-12 01:54:49 -04:00
Jenkins for ownCloud
bfd7194cf9 [tx-robot] updated from transifex 2015-07-11 01:54:51 -04:00
Vincent Petry
87f3500fda Merge pull request #17483 from rullzer/migrate-mimetype-js 
Move away from OCA.files.getMimeIcon and use OC.MimeType.getIconUrl
 2015-07-10 10:14:03 +02:00
Jenkins for ownCloud
176dabd976 [tx-robot] updated from transifex 2015-07-10 01:54:55 -04:00
Morris Jobke
42eb18c747 Merge pull request #17473 from owncloud/enc_fix_migration 
more secure way to update the database
 2015-07-09 22:41:56 +02:00
Roeland Jago Douma
eb7a796ad9 Fix unit tests 2015-07-09 18:42:46 +02:00
Roeland Jago Douma
7d943b2ddc Make the filelist get the mimetypeicon from the mimetype 2015-07-09 13:56:43 +02:00
Roeland Jago Douma
a727cbc7a9 Remove ajax/mimeicon.php and its route 2015-07-09 13:40:13 +02:00
Roeland Jago Douma
5c381ea532 Move calls to Files.getMimeIcon to OC.MimeType.getIconUrl 2015-07-09 13:40:13 +02:00
Roeland Jago Douma
1aa2f6638f Make getMimeIcon use OC.MimeType.getIconUrl 2015-07-09 13:40:12 +02:00
Morris Jobke
2b86ba43e3 Merge pull request #14341 from rullzer/public_share_do_not_leak_mounttype 
No more leaking of mounttype via metadata or icon in public shares.
 2015-07-09 09:41:27 +02:00
Jenkins for ownCloud
6d9bb17360 [tx-robot] updated from transifex 2015-07-09 01:54:53 -04:00
Bjoern Schiessle
1e284b15ff only create new key pair if both keys are missing 2015-07-08 19:08:41 +02:00
Bjoern Schiessle
85c3b9d5cf only cleanUp the remaining keys if the migration really finished succesfully 2015-07-08 18:23:18 +02:00
Bjoern Schiessle
876d7c160d more secure way to update the database 2015-07-08 13:26:53 +02:00
Bjoern Schiessle
db65eeb580 only move real files to the trash bin 2015-07-08 11:32:06 +02:00
Morris Jobke
0fe81d2f21 Merge pull request #17330 from owncloud/fix-share-path-for-group-exceptions 
Fix the path for users which have an exception for a group share
 2015-07-08 10:33:42 +02:00
Jenkins for ownCloud
2fd84607ee [tx-robot] updated from transifex 2015-07-08 01:55:28 -04:00
Joas Schilling
594f5b6a29 Add visibility to test methods 2015-07-07 11:07:11 +02:00
Vincent Petry
fb0fef78f4 Add test case when owner renames shared folder 2015-07-07 11:06:21 +02:00
Vincent Petry
547c4b9a9f Add unit test for getUsersSharingFile 
This is to test if the user list and paths are correct, even when a
recipient renamed the received shared folder
 2015-07-07 11:06:11 +02:00
Jenkins for ownCloud
ee5dd25290 [tx-robot] updated from transifex 2015-07-07 01:55:18 -04:00
Roeland Douma
b4f782b568 Merge pull request #16724 from owncloud/mimetype-js 
Javascript to fetch mimetype icons
 2015-07-06 20:59:56 +02:00
Jan-Christoph Borchardt
e84806f017 Merge pull request #17418 from owncloud/fix-public-download-button-regression 
Fix regression of button at public download page
 2015-07-06 17:10:23 +02:00
Roeland Jago Douma
868bc421cb Share app no longer use the OCS API icon 
Switch to new javascript mimetype resolver
 2015-07-06 16:32:15 +02:00
Thomas Müller
14eef434ff Merge pull request #17290 from owncloud/remove-readonly-wrapper 
Replace readonly wrapper with permissions mask
 2015-07-06 15:36:11 +02:00
Thomas Müller
dba6ba2523 Merge pull request #16964 from owncloud/versions_occ 
add occ tool to delete versions
 2015-07-06 15:34:40 +02:00
Morris Jobke
7da5e53741 Fix regression of button at public download page 
* introduced with #17159
 2015-07-06 13:37:14 +02:00
Joas Schilling
4dbc8ab77f Merge pull request #17335 from owncloud/better-federated-cloud-sharing-activities 
Improve federated cloud sharing activities
 2015-07-06 10:23:33 +02:00
Joas Schilling
fca6bcb632 Merge pull request #16733 from owncloud/add-smashbox-tests-remote-shares 
Add OCS API to send, get, accept and decline remote shares
 2015-07-06 10:12:29 +02:00
Jenkins for ownCloud
5734edfe20 [tx-robot] updated from transifex 2015-07-06 01:54:38 -04:00
Jenkins for ownCloud
55f4d0eea1 [tx-robot] updated from transifex 2015-07-05 01:54:50 -04:00
Jenkins for ownCloud
468871818d [tx-robot] updated from transifex 2015-07-04 01:55:24 -04:00
Roeland Jago Douma
cf732c4d27 Do not leak mounttype of a public share 2015-07-04 07:27:56 +02:00
Thomas Müller
d3ac73c0c9 Remove OC_Log 2015-07-03 18:00:16 +02:00
Vincent Petry
cc373ab89a Merge pull request #15470 from rullzer/files_sharing_getUrlContent 
Move away from private static function OC_Util::getUrlContent
 2015-07-03 17:47:46 +02:00