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

1866 commits

Author SHA1 Message Date
Thomas Müller
87a754c72e avoid $this->cache being null - fixes #13491 2015-01-20 12:38:54 +01:00
Jenkins for ownCloud
2ac015256f [tx-robot] updated from transifex 2015-01-20 01:54:37 -05:00
Georg Ehrke
374ddbff55 show animated gifs on public sharing page 2015-01-19 16:20:06 +01:00
Bjoern Schiessle
15ae6b47ed replace hook with storage wrapper 2015-01-19 09:16:15 +01:00
Jenkins for ownCloud
3404bd8cdd [tx-robot] updated from transifex 2015-01-19 01:54:31 -05:00
Jenkins for ownCloud
60c4cb1dd6 [tx-robot] updated from transifex 2015-01-17 01:54:40 -05:00
Robin McCorkell
2b99fc76ec Cleanup of PHPDoc return types 2015-01-16 20:30:43 +00:00
Jenkins for ownCloud
a65f666834 [tx-robot] updated from transifex 2015-01-16 01:55:51 -05:00
Morris Jobke
9b7c1a0093 Merge pull request #13347 from owncloud/share-scanpermissionsfromsource 
Use source storage permissions when scanning shared storage
 2015-01-15 11:15:15 +01:00
Jenkins for ownCloud
4c233fef2a [tx-robot] updated from transifex 2015-01-15 01:54:41 -05:00
Robin McCorkell
9d0915013b Merge pull request #13352 from owncloud/hhvm-array-key 
HHVM: Do not use key() on array as the result depends on the internal array pointer.
 2015-01-15 01:06:45 +00:00
Andreas Fischer
b4a52e889a Do not use key() on array as the result depends on the internal array pointer. 2015-01-15 00:48:10 +01:00
Morris Jobke
455ad005a0 Merge pull request #13350 from owncloud/autoload-translations 
Autoload app's js translations
 2015-01-14 18:12:05 +01:00
Vincent Petry
a9f0582e3e Use source storage permissions when scanning shared storage 2015-01-14 18:11:23 +01:00
Vincent Petry
87f81e5926 Remove unneeded addTranslations() calls 2015-01-14 14:36:23 +01:00
Thomas Müller
25806346c2 remove deprecated code - fixes #13119 2015-01-14 13:56:49 +01:00
Thomas Müller
9b7421972b Merge pull request #13332 from oparoz/fix-download-button 
Download the current public folder only
 2015-01-14 12:24:06 +01:00
Björn Schießle
9a487f0445 Merge pull request #13286 from owncloud/sharing_upgrade 
update script for new server-to-server sharing
 2015-01-14 11:57:30 +01:00
Olivier Paroz
356bfb36dc Download the current public folder only 
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.
 2015-01-14 11:28:36 +01:00
Jenkins for ownCloud
f367bbb49d [tx-robot] updated from transifex 2015-01-14 01:55:16 -05:00
Bjoern Schiessle
d50e70ba3a set accept to 1 (=true) for all server-to-server shares on update, at this point in time all shares are created by the first version of server-to-server sharing and are accepted if they were added to the table 2015-01-13 17:24:00 +01:00
Jenkins for ownCloud
3ece0a7767 [tx-robot] updated from transifex 2015-01-13 01:56:58 -05:00
Thomas Müller
ddf81c2ed9 Merge pull request #13254 from owncloud/fixsharel10n 
make Share/Download buttons localized again
 2015-01-12 09:31:35 +01:00
Jenkins for ownCloud
9e550ab844 [tx-robot] updated from transifex 2015-01-12 01:55:52 -05:00
Volkan Gezer
691fab8be3 make Share button localized again 
it seems we have forgotten to use named FileAction
 2015-01-11 15:57:45 +01:00
Jenkins for ownCloud
3425c73815 [tx-robot] updated from transifex 2015-01-11 01:54:32 -05:00
Jenkins for ownCloud
22e5220c1f [tx-robot] updated from transifex 2015-01-10 01:54:35 -05:00
Jenkins for ownCloud
d4fc2f555b [tx-robot] updated from transifex 2015-01-09 01:55:22 -05:00
Thomas Müller
6b0ae34de6 Merge pull request #13170 from owncloud/extstorage-fixsharedmountpointrootleadingslash 
Fix source path when share is a mount point
 2015-01-08 15:02:16 +01:00
Vincent Petry
01c83158bb Fix source path when share is a mount point 
Whenever an external storage mount point is shared directly, its path is
empty which causes a leading slash to appear in the source path.

This fix removes the bogus leading slash in such situation.
 2015-01-08 11:46:11 +01:00
Jenkins for ownCloud
6bda95037f [tx-robot] updated from transifex 2015-01-08 01:56:00 -05:00
Morris Jobke
bfb6e350d5 Merge pull request #13016 from owncloud/sharing_fixes 
don't delete share table entries for the unique name if re-share permission was removed
 2015-01-07 18:14:53 +01:00
Bjoern Schiessle
b6f63e9b3d don't delete share table entries for the unique name if re-share permission was removed 2015-01-07 16:36:13 +01:00
Joas Schilling
70dcebbf92 Correctly return false when translating a foreign activity 2015-01-07 15:02:25 +01:00
Jenkins for ownCloud
2daf90dae6 [tx-robot] updated from transifex 2015-01-07 01:55:42 -05:00
Morris Jobke
fe4592937a Merge pull request #12653 from owncloud/full_content_search_results 
Full content width search results
 2015-01-06 16:44:58 +01:00
Jörn Friedrich Dreyer
357fbd88be use class for no results div instead of id. the elements are not unique. 2015-01-06 14:34:35 +01:00
Jenkins for ownCloud
6a3f69c2d0 [tx-robot] updated from transifex 2015-01-06 01:54:59 -05:00
Jörn Friedrich Dreyer
23900a5a39 filter trashbin and share views 2015-01-05 13:11:50 +01:00
Morris Jobke
28c8f5a0f9 Check for version before mounting a public link 
* ownCloud 7.0.0 is needed - version of merge of server <-> server
  sharing - https://github.com/owncloud/core/pull/8399
* adjust error message
 2015-01-05 11:50:05 +01:00
Jenkins for ownCloud
8776271103 [tx-robot] updated from transifex 2015-01-05 01:54:36 -05:00
Jenkins for ownCloud
84ed1034b4 [tx-robot] updated from transifex 2015-01-04 01:54:53 -05:00
Jenkins for ownCloud
05ffa3ab7a [tx-robot] updated from transifex 2015-01-03 01:54:29 -05:00
Jenkins for ownCloud
4b357274bb [tx-robot] updated from transifex 2015-01-02 01:54:28 -05:00
Jenkins for ownCloud
ec6e70889a [tx-robot] updated from transifex 2015-01-01 01:54:30 -05:00
Jenkins for ownCloud
573be9092d [tx-robot] updated from transifex 2014-12-31 01:54:33 -05:00
Thomas Müller
688a4022df Merge pull request #13012 from owncloud/small_fix 
only send activity if we have a valid path and the file is readable
 2014-12-27 21:38:47 +01:00
Jenkins for ownCloud
d2e53d1022 [tx-robot] updated from transifex 2014-12-27 01:54:33 -05:00
Jenkins for ownCloud
0836ce9cd8 [tx-robot] updated from transifex 2014-12-26 01:54:28 -05:00
Jenkins for ownCloud
e0fc26a5cb [tx-robot] updated from transifex 2014-12-25 01:54:29 -05:00
Jenkins for ownCloud
801b9e0494 [tx-robot] updated from transifex 2014-12-24 01:54:33 -05:00
Bjoern Schiessle
8c48be453e only send activity if we have a valid path and the file is readable 2014-12-23 13:32:54 +01:00
Morris Jobke
5352b4b2b8 Merge pull request #10292 from owncloud/external-share-delete 
Fix trashbin when deleting a file over an external share
 2014-12-23 11:21:06 +01:00
Jenkins for ownCloud
d8f04f5a97 [tx-robot] updated from transifex 2014-12-23 01:55:23 -05:00
Robin Appelman
3afcc71764 Make sure the path passed to the activity manager is normalized 2014-12-22 18:50:00 +01:00
Bjoern Schiessle
393deb5961 add activity if public shared file/folder was downloaded 2014-12-22 18:50:00 +01:00
Jenkins for ownCloud
92c8cd3933 [tx-robot] updated from transifex 2014-12-22 01:54:49 -05:00
Morris Jobke
510488ad3e Merge pull request #12942 from owncloud/favs-missingsharedsubdirs 
Fix issues with searchByTag in shared storage
 2014-12-21 10:38:34 +01:00
Jenkins for ownCloud
312891c603 [tx-robot] updated from transifex 2014-12-21 01:54:36 -05:00
Jenkins for ownCloud
5a54ca380d [tx-robot] updated from transifex 2014-12-20 01:56:24 -05:00
Bjoern Schiessle
24993280ed Next step in server-to-server sharing next generation, see #12285 
Beside some small improvements and bug fixes this will probably the final state for OC8.

To test this you need to set up two ownCloud instances. Let's say:

URL: myPC/firstOwnCloud user: user1
URL: myPC/secondOwnCloud user: user2
Now user1 can share a file with user2 by entering the username and the URL to the second ownCloud to the share-drop-down, in this case "user2@myPC/secondOwnCloud".

The next time user2 login he will get a notification that he received a server-to-server share with the option to accept/decline it. If he accept it the share will be mounted. In both cases a event will be send back to user1 and add a notification to the activity stream that the share was accepted/declined.

If user1 decides to unshare the file again from user2 the share will automatically be removed from the second ownCloud server and user2 will see a notification in his activity stream that user1@myPC/firstOwnCloud has unshared the file/folder from him.
 2014-12-19 15:20:24 +01:00
Jenkins for ownCloud
028b0efd5c [tx-robot] updated from transifex 2014-12-19 01:56:51 -05:00
Morris Jobke
3036a8714d Merge pull request #12941 from owncloud/wave-accessibility-compliance 
Wave accessibility compliance
 2014-12-19 00:30:56 +01:00
Jörn Friedrich Dreyer
49318b4d93 Merge pull request #12896 from owncloud/drop-deprecated 
first step to drop \OCP\Config:: in favour of IConfig
 2014-12-18 23:01:49 +01:00
Vincent Petry
11b3aa2dbe Fix issues with searchByTag in shared storage 2014-12-18 17:27:56 +01:00
Robin Appelman
1ef01de402 Merge pull request #12907 from owncloud/delete-invalid-external-share 
Fix deleting invalid s2s shares
 2014-12-18 16:38:13 +01:00
Jan-Christoph Borchardt
9009f5f727 add empty alt text to decorative preview of public share image 2014-12-18 16:00:55 +01:00
Jan-Christoph Borchardt
ea548cdaaa fix accessibility of logos 2014-12-18 10:51:41 +01:00
Jenkins for ownCloud
5c6e08213e [tx-robot] updated from transifex 2014-12-18 01:56:40 -05:00
Jan-Christoph Borchardt
16c62a346c improve empty states for sharing and shared links as well 2014-12-17 21:22:28 +01:00
Jan-Christoph Borchardt
e3192bfa26 use empty state for 'Shared with you' as well 2014-12-17 21:13:53 +01:00
Robin Appelman
e656af4c83 Root always exists 2014-12-17 16:09:41 +01:00
Morris Jobke
d41082f4d6 first step to drop \OCP\Config:: in favour of IConfig 2014-12-17 11:12:37 +01:00
Jenkins for ownCloud
6d80524e67 [tx-robot] updated from transifex 2014-12-17 01:56:41 -05:00
Jenkins for ownCloud
5b9c453071 [tx-robot] updated from transifex 2014-12-16 01:55:32 -05:00
Jenkins for ownCloud
036456fe16 [tx-robot] updated from transifex 2014-12-15 01:54:30 -05:00
Jenkins for ownCloud
6ae0217326 [tx-robot] updated from transifex 2014-12-14 01:54:56 -05:00
Morris Jobke
29e1c3a898 Merge pull request #12795 from owncloud/files-layoutchanges 
Move file thumbnail element into the label tag
 2014-12-13 09:00:43 +01:00
Jenkins for ownCloud
416e21d902 [tx-robot] updated from transifex 2014-12-13 01:55:24 -05:00
Vincent Petry
4b57892c4e Merge pull request #12778 from owncloud/searchbytags2 
Added searchByTags to view, storage and cache
 2014-12-12 14:27:19 +01:00
Joas Schilling
4f92e4a233 Merge pull request #12808 from owncloud/add-special-parameterlist-to-manager 
Add special parameterlist to manager
 2014-12-12 13:03:26 +01:00
Robin Appelman
3bf0922b13 Merge pull request #12527 from owncloud/js-pluginsystem 
Simple Plugin system for Javascript
 2014-12-12 11:43:31 +01:00
Joas Schilling
46def69574 Specify list of activity parameters for sharing extension 2014-12-12 11:41:01 +01:00
Vincent Petry
15ecb28d50 Make $userId mandatory for searchByTags 
$userId is now a mandatory parameter for searchByTags.

Also fixed some places in the code where the argument was missing (Node
API and View)
 2014-12-12 11:18:35 +01:00
Gadzy
ba3957fb8a Check for share by link enabled 
Display "Shared by link" section only if sharing by link is enabled.
 2014-12-12 10:23:51 +01:00
Jenkins for ownCloud
68932b30fd [tx-robot] updated from transifex 2014-12-12 01:55:24 -05:00
Vincent Petry
81e9d43e23 Move file thumbnail into the label element 2014-12-11 18:21:25 +01:00
Vincent Petry
25dde7e93b Added searchByTags to view, storage and cache 2014-12-11 17:38:50 +01:00
Jenkins for ownCloud
dc506dcfbf [tx-robot] updated from transifex 2014-12-11 01:55:27 -05:00
Morris Jobke
3026cdbc80 Merge pull request #12549 from owncloud/shared-cache-non-existing 
Dont return cached date in shared cache when the file doesn't exist
 2014-12-10 08:49:40 +01:00
Jenkins for ownCloud
ea95bb0189 [tx-robot] updated from transifex 2014-12-10 01:55:34 -05:00
Lukas Reschke
25a87d4058 Merge pull request #12577 from owncloud/public-mount-api 
Add a public api for apps to add mounts
 2014-12-08 22:57:33 +01:00
Morris Jobke
1362c0b67a Merge pull request #12452 from owncloud/server2server-ng-ocs 
OCS API for server-to-server sharing
 2014-12-08 14:12:03 +01:00
Jenkins for ownCloud
8ee9ee29ea [tx-robot] updated from transifex 2014-12-07 01:54:32 -05:00
Vincent Petry
bf887eca8b Remove obsoleted filelist prototype backup in tests 2014-12-04 18:39:20 +01:00
Robin Appelman
f4701d7721 Add public api for mount configurations 2014-12-04 16:47:27 +01:00
Bjoern Schiessle
698ecbf308 OCS API for server-to-server sharing 2014-12-04 13:18:13 +01:00
Jenkins for ownCloud
5aad902507 [tx-robot] updated from transifex 2014-12-04 01:54:42 -05:00
Robin Appelman
ce10b93519 Dont return cached date in shared cache when the file doesn't exist 2014-12-02 15:28:11 +01:00
Vincent Petry
c02ef69521 Simple Plugin system for Javascript 2014-12-01 16:20:44 +01:00
Jenkins for ownCloud
83d097c524 [tx-robot] updated from transifex 2014-11-29 01:54:28 -05:00
Morris Jobke
c5fa8f1bdc Merge pull request #12421 from owncloud/issue/6101-remove-namespace-permission-constants 
Issue/6101 remove namespace permission constants
 2014-11-26 08:31:23 +01:00
Thomas Müller
e6a7022037 Merge pull request #12410 from owncloud/no_session_for_public_share_key 
don't store private public-share-key in session
 2014-11-25 22:26:40 +01:00
Joas Schilling
2c39aec8cb Replace deprecated constant with new class constant 2014-11-25 16:30:21 +01:00
Bjoern Schiessle
1d33503487 we no longer need to keep the session open for encryption 2014-11-25 13:37:11 +01:00
Morris Jobke
6fb2477fb7 Merge pull request #12262 from owncloud/removeAbsoluteDirectoryPathFromTemplate 
Don't disclose relative directory path for single shared files of user
 2014-11-25 10:09:16 +01:00
Lukas Reschke
8589079590 Close session only if encryption app is not enabled 
Fixes https://github.com/owncloud/core/issues/12389
 2014-11-24 15:02:49 +01:00
Morris Jobke
8782b2237c Merge pull request #12084 from owncloud/sharing_fix_shared_with_info 
sharing: make sure that we only find the shares from a given owner
 2014-11-24 11:44:43 +01:00
Jenkins for ownCloud
0edcfc1dc1 [tx-robot] updated from transifex 2014-11-24 01:54:35 -05:00
Bjoern Schiessle
a7ebfe87c9 also check for the correct owner if it was submitted 2014-11-21 16:17:37 +01:00
Jenkins for ownCloud
f8421958b3 [tx-robot] updated from transifex 2014-11-21 02:54:26 -05:00
Lukas Reschke
713c8e0dac Merge pull request #12325 from owncloud/removeunneccessarylang 
cleanup languages. closes #11274
 2014-11-20 16:12:49 +01:00
Thomas Müller
cbb9caf030 Merge pull request #12226 from owncloud/remove-phpass 
Remove phpass and migrate to new Hasher interface
 2014-11-20 14:59:59 +01:00
Morris Jobke
46e6104795 Merge pull request #12297 from owncloud/issue/10991-all-testcase 
Issue/10991 all testcase
 2014-11-20 14:53:18 +01:00
Volkan Gezer
995fe4a176 cleanup languages. closes #11274 2014-11-20 14:46:17 +01:00
Vincent Petry
63fa8ec69a JSHint fixes in sharedfilelistSpec unit test file 2014-11-19 17:44:05 +01:00
Vincent Petry
98ec0451be Remove delete button in shared with others list 
Whenever a file is shared with others or with link, a delete button used
to be visible that triggered a direct deletion.

This button has been removed to avoid accidental deletion from people
who might believe it was an unshare button. Unsharing is still possible
inside the share dropdown.
 2014-11-19 17:42:57 +01:00
Joas Schilling
76ebd3a050 Make apps/ extend the \Test\TestCase and fix overwritten methods 2014-11-19 14:52:09 +01:00
Jenkins for ownCloud
705976ba0a [tx-robot] updated from transifex 2014-11-19 01:54:59 -05:00
Lukas Reschke
a6ebb17610 Remove unused variable and make Scrutinizer happy. 2014-11-18 18:52:00 +01:00
Lukas Reschke
f3ab4f3faf Don't disclose relative directory path for single shared files of user 
The "dir" key is used within the public sharing template to indicate in which directory the user currently is when sharing a directory with subdirectories. This is needed by the JS scripts.

However, when not accessing a directory then "dir" was set to the relative path of the file (from the user's home directory), meaning that for every public shared file the sharee can see the path.
(For example if you share the file "foo.txt" from "finances/topsecret/" the sharee would still see the path "finances/topsecret/" from the shared HTML template)

This is not the excpected behaviour and can be considered a privacy problem, this patch addresses this by setting "dir" to an empty key.
 2014-11-18 18:51:57 +01:00
Lukas Reschke
5f07fb15dc Fix case-sensitivity 2014-11-18 18:50:47 +01:00
Lukas Reschke
1b85f40cbe $file only contains the filename and not the absolute path, that means that files in a subdirectory will not get properly resolved and an empty filesize is returned. 
This feature only exists on master.
 2014-11-18 17:14:26 +01:00
Morris Jobke
230e517f35 Merge pull request #12220 from owncloud/remove-unused-code 
Remove unused code
 2014-11-18 10:36:32 +01:00
Morris Jobke
146cb920c9 Merge pull request #12218 from owncloud/issue/10991-fixes 
Issue/10991 Make unit tests pass on windows
 2014-11-17 16:44:45 +01:00
Lukas Reschke
8dbedbb849 Remove unused code 
We don't support direct updates from older ownCloud versions except the previous one therefore this code is unused and can be removed.
 2014-11-17 14:01:39 +01:00
Lukas Reschke
8595b76df2 Remove phpass and migrate to new Hasher interface 
This PR removes phpass and migrates to the new Hasher interface.

Please notice that due to https://github.com/owncloud/core/issues/10671 old hashes are not updated but the hashes are backwards compatible so this shouldn't hurt.
Once the sharing classes have a possibility to update the passwords of single shares those methods should be used within the newHash if block.
 2014-11-17 13:39:13 +01:00
Joas Schilling
a3a064fe96 Skip some more tests on Windows which just can not work at all 2014-11-17 10:48:06 +01:00
Vincent Cloutier
fad621140b Added download size on public sharing 2014-11-14 16:26:59 +01:00
Lukas Reschke
988c85d292 Refactor file sharing public link handling 
fixes download issue introduced by #10755

Conflicts:
	apps/files_sharing/public.php
 2014-11-14 16:26:59 +01:00
Jenkins for ownCloud
0811b39e5f [tx-robot] updated from transifex 2014-11-14 01:54:47 -05:00
Vincent Petry
5ca869c324 Merge pull request #9177 from owncloud/jsdocexperiment 
Improved JS Docs + added build script for JS Docs
 2014-11-13 11:16:08 +01:00
Jenkins for ownCloud
1846fb0285 [tx-robot] updated from transifex 2014-11-12 01:55:24 -05:00
Morris Jobke
2023878d53 Merge pull request #10966 from owncloud/storage-root-share-permissions 
Dont' use mountpoint permissions as share permissions for external storages
 2014-11-10 13:11:22 +01:00
Jenkins for ownCloud
c3e3432662 [tx-robot] updated from transifex 2014-11-10 01:54:30 -05:00
Jenkins for ownCloud
46010655d2 [tx-robot] updated from transifex 2014-11-09 01:54:30 -05:00
Jenkins for ownCloud
da14a605d5 [tx-robot] updated from transifex 2014-11-08 01:54:35 -05:00
Jenkins for ownCloud
7d47d50724 [tx-robot] updated from transifex 2014-11-07 01:55:10 -05:00
Robin Appelman
0f3fd89f7d Fix sharing tests 2014-11-06 18:31:41 +01:00
Robin Appelman
7ecd220715 Setup shared mounts for the correct user when setting up the filesystem for the non-logged in user 2014-11-06 18:31:40 +01:00
Robin Appelman
9c79c2fa17 Dont make real users in tests 2014-11-06 18:31:40 +01:00
Jenkins for ownCloud
fa4018d36c [tx-robot] updated from transifex 2014-11-06 01:55:04 -05:00
Thomas Müller
8116d903dd adjust strings - fixed #11930 2014-11-05 11:08:17 +01:00
Vincent Petry
ee6d8c9d58 Store curl error message directly 2014-11-04 17:37:15 +01:00
Vincent Petry
768f3979e0 Check for cert bundle existence before using it 2014-11-04 16:44:42 +01:00
Robin Appelman
83126ab675 Add unit tests 2014-10-31 15:22:08 +01:00
Robin Appelman
307071cfec Keep the share permissions from mountpoints 2014-10-31 14:43:32 +01:00
Robin Appelman
2705588073 Dont' use mountpoint permissions as share permissions for external storages 2014-10-31 14:43:32 +01:00
Vincent Petry
0f3e6cb50a Improved Javascript docs for JSDoc 
Added namespaces so that JSDoc can find them.
Fixed a few warnings.
Improved some comments.
 2014-10-31 13:43:30 +01:00
Lukas Reschke
e0528c7598 Merge pull request #11876 from owncloud/remove-pointless-requires 
remove unnecessary require calls - the ownCloud class loader is supposed...
 2014-10-31 13:10:59 +01:00