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

1665 commits

Author SHA1 Message Date
Jenkins for ownCloud
dd6b0b1319 [tx-robot] updated from transifex 2014-09-18 01:54:39 -04:00
Lukas Reschke
7db0d55129 Merge pull request #11105 from owncloud/jsunit-legacyfileactionsfix 
Tentative fix for legacy file actions unit test side effect
 2014-09-17 18:10:49 +02:00
Jenkins for ownCloud
2a89bc7b51 [tx-robot] updated from transifex 2014-09-17 01:55:27 -04:00
Vincent Petry
05cf940983 Tentative fix for legacy file actions unit test side effect 
Sometimes the JS unit test with legacy file actions fail.

This fix runs the legacy file actions tests on a dummy instead of the
real one.
 2014-09-16 15:38:44 +02:00
Morris Jobke
61b040cbe8 Merge pull request #10663 from owncloud/files_trashbin_original_path 
Show original path information in trashbin and for shares
 2014-09-16 12:49:17 +02:00
Jenkins for ownCloud
1e6ac31bde [tx-robot] updated from transifex 2014-09-16 01:54:33 -04:00
Lukas Reschke
627252fe81 Merge pull request #11060 from owncloud/rmobslang 
remove obsolete language files
 2014-09-15 17:31:10 +02:00
Andreas Fischer
31898aa635 Merge pull request #11021 from owncloud/do-not-double-decode 
Do not double decode values

* owncloud/do-not-double-decode:
  Do not double decode values
 2014-09-15 07:58:45 +02:00
Volkan Gezer
5d1fa60e0d remove obsolete language files 2014-09-13 15:29:11 +02:00
Jenkins for ownCloud
d6834b6389 [tx-robot] updated from transifex 2014-09-12 03:28:56 -04:00
Robin McCorkell
99d41bec5d Show original path information in trashbin and sharing views 
Path will only be shown if in subdirectory, not in root.
 2014-09-11 15:45:42 +01:00
Lukas Reschke
99e9e762d1 Do not double decode values 
Fixes https://github.com/owncloud/core/issues/11012
 2014-09-11 15:34:57 +02:00
Jenkins for ownCloud
0dcd8079dc [tx-robot] updated from transifex 2014-09-11 01:54:41 -04:00
kondou
2a4c51389c Use a route instead of s.php and convert tokens asap 2014-09-04 15:23:55 +02:00
Clark Tomlinson
27de0e5621 Hiding add to your own cloud if server2server sharing is not enabled 2014-09-03 10:04:46 -04:00
Jenkins for ownCloud
8787162ec9 [tx-robot] updated from transifex 2014-09-03 01:54:34 -04:00
Lukas Reschke
8009df0b60 Merge pull request #10420 from owncloud/external-share-self-signed 
Make external shares work with imported self signed certificates
 2014-08-31 15:50:30 +02:00
Robin Appelman
2fcedcc503 fix test 2014-08-31 10:47:50 +02:00
Robin Appelman
298011bf29 fix indention 2014-08-31 10:45:11 +02:00
Robin Appelman
c2ebc192a6 Make external shares work with imported self-signed certificates 2014-08-31 10:45:11 +02:00
Robin Appelman
d0266c0bf8 Use public api for getting l10n 2014-08-31 10:08:22 +02:00
Jenkins for ownCloud
23137f4798 [tx-robot] updated from transifex 2014-08-31 01:56:20 -04:00
Jenkins for ownCloud
53f3b7ab52 [tx-robot] updated from transifex 2014-08-30 01:57:04 -04:00
Jörn Friedrich Dreyer
f551917a3c kill OC::$session 
maintain deprecated \OC::$session when getting or setting the session via the server container or UserSession

restore order os OC::$session and OC::$CLI

remove unneded initialization of dummy session

write back session when $useCustomSession is true

log warning when deprecated app is used
 2014-08-29 10:22:21 +02:00
Jenkins for ownCloud
1b342a70d6 [tx-robot] updated from transifex 2014-08-28 01:56:36 -04:00
Jenkins for ownCloud
2740908a5b [tx-robot] updated from transifex 2014-08-27 01:54:40 -04:00
Jenkins for ownCloud
c733842a9a [tx-robot] updated from transifex 2014-08-26 01:56:33 -04:00
Clark Tomlinson
58ab105515 Merge pull request #10421 from owncloud/share-external-delete 
Remove no longer existing files from the cache when scanning external storage
 2014-08-25 11:28:50 -04:00
Jenkins for ownCloud
adca48aa93 [tx-robot] updated from transifex 2014-08-25 01:56:07 -04:00
Jenkins for ownCloud
70db496b58 [tx-robot] updated from transifex 2014-08-24 01:56:10 -04:00
Jenkins for ownCloud
047ec64ac0 [tx-robot] updated from transifex 2014-08-23 01:57:00 -04:00
Jenkins for ownCloud
8c94153d3e [tx-robot] updated from transifex 2014-08-22 01:56:25 -04:00
blizzz
52d5429768 Merge pull request #10522 from owncloud/removeLoadAppScript 
Remove loadAppScriptFile
 2014-08-21 19:59:31 +02:00
Jenkins for ownCloud
952fac8493 [tx-robot] updated from transifex 2014-08-21 01:56:31 -04:00
Lukas Reschke
92c80dd946 Merge pull request #10518 from owncloud/fix_storage_const_autoload 
Fix storage const autoload
 2014-08-20 23:23:42 +02:00
Jenkins for ownCloud
ea8c0bce08 [tx-robot] updated from transifex 2014-08-20 01:56:58 -04:00
Jan-Christoph Borchardt
3d8031564e fix multiselect bar offset on shared page 2014-08-19 15:51:10 +02:00
Lukas Reschke
ad202250a8 Add routing to files_sharing 2014-08-19 15:22:54 +02:00
Morris Jobke
b3b3354809 move to public namespace 2014-08-19 14:05:08 +02:00
Stephan Peijnik
2df52e54d7 Fix STORAGE_* constants usage by moving those constants into \OC\Files\Filesystem. 
As constants not defined within a class cannot be automatically found by the
autoloader moving those constants into a class makes them accessible to
code which uses them.

Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
 2014-08-19 13:55:35 +02:00
Björn Schießle
19610157d3 Merge pull request #10425 from owncloud/set_default_share_folder 
Set default share folder
 2014-08-19 10:21:21 +02:00
Morris Jobke
df963b3ccf Merge pull request #10492 from owncloud/hidesharesectionswhendisabled 
Hide sharing sections in files app when sharing API is disabled
 2014-08-19 08:53:19 +02:00
Jenkins for ownCloud
77cfddff0f [tx-robot] updated from transifex 2014-08-19 01:57:09 -04:00
Lukas Reschke
594078e22f Fix copyright 2014-08-18 16:52:48 +02:00
Bjoern Schiessle
193a0b1a17 fix broken unit tests 2014-08-18 16:52:48 +02:00
Bjoern Schiessle
c25915cde4 update unit tests with configurable share folder 2014-08-18 16:52:48 +02:00
Bjoern Schiessle
c9903f2e68 make share folder configurable 2014-08-18 16:52:48 +02:00
Vincent Petry
1de5ae8845 Hide sharing sections in files app when sharing API is disabled 2014-08-18 16:33:29 +02:00
Jenkins for ownCloud
4dd07f572c [tx-robot] updated from transifex 2014-08-18 01:56:30 -04:00
Lukas Reschke
69e0e23789 Merge pull request #10407 from owncloud/rm-obsolete-japanese 
remove obsolete japanese lang code
 2014-08-17 19:07:14 +02:00
Jenkins for ownCloud
b1415fc4fc [tx-robot] updated from transifex 2014-08-17 01:56:22 -04:00
Lukas Reschke
8d112ff61f Merge pull request #10449 from owncloud/share-clientsidesortnoservercall 
Client side sort for sharing overview
 2014-08-15 21:25:30 +02:00
Volkan Gezer
3da69ed7d0 ssl capital 2014-08-15 20:41:40 +02:00
Vincent Petry
3a99f15af2 Client side sort for sharing overview 
Since the server doesn't support sorting, use client side sort directly
instead of calling reload() first.
 2014-08-15 16:52:41 +02:00
Robin Appelman
a645da3640 Merge pull request #10398 from owncloud/external-share-ssl-warn 
Give a better error message for external shares with self-signed ssl certificates
 2014-08-14 16:10:29 +02:00
Robin Appelman
bbe17f35a1 Remove no longer existing files from the cache when scanning external storage 2014-08-14 14:50:52 +02:00
Volkan Gezer
d1f483c9ed remove obsolete japanese lang code 2014-08-13 22:35:08 +02:00
Robin Appelman
bba59bf815 Cast file id's to int so we can compare them properly 2014-08-13 19:18:34 +02:00
Robin Appelman
9509bc403a Give a better error message for external shares with self-signed ssl certificates 2014-08-13 16:46:04 +02:00
Jenkins for ownCloud
609a52ebe2 [tx-robot] updated from transifex 2014-08-13 01:54:44 -04:00
Robin Appelman
86ae3bd1e7 Merge pull request #10303 from owncloud/sharing-breadcrumb-folder-name 
use OC_Util::basename
 2014-08-11 13:10:45 +02:00
Jenkins for ownCloud
411f6c7704 [tx-robot] updated from transifex 2014-08-11 01:54:32 -04:00
Jenkins for ownCloud
f12f835485 [tx-robot] updated from transifex 2014-08-09 01:55:08 -04:00
Bjoern Schiessle
008498dcad only show "share with others" and "share by link" navigation bar entries if user is allowed to share files 2014-08-08 12:12:24 +02:00
Thomas Müller
6da9c09467 Merge pull request #10238 from owncloud/fix-public-download-with-encryption-master 
we can only close the session if encryption is not used
 2014-08-07 14:29:54 +02:00
Robin Appelman
f1091280de Merge pull request #10184 from owncloud/getbyid-node 
Fix Folder::getById
 2014-08-07 13:40:17 +02:00
Jan-Christoph Borchardt
9e6b65fabe Merge pull request #10223 from dannosaur/patch-1 
fix tiny thumbnails in public preview/share mode
 2014-08-07 12:36:57 +02:00
Thomas Müller
8b2fe69bb2 Merge pull request #10218 from owncloud/pzy-master 
Adding link tag to enable facebook timeline previews
 2014-08-07 12:14:30 +02:00
Thomas Müller
d2365afad6 Merge pull request #8915 from owncloud/MorrisJobke-travis 
Travis support for PRs and master, stable5 and stable6
 2014-08-07 11:33:13 +02:00
Thomas Müller
2fb8fcf6cb we can only close the session if encryption is not used 2014-08-07 11:07:11 +02:00
pzy
dc15633111 Update public.php 
added tag to make facebook load a preview picture

Update public.php

add check ifMimeSupported and put the thumbsize in a variable

generate preview for all supported mimes
 2014-08-07 10:44:07 +02:00
Jenkins for ownCloud
2821f7241b [tx-robot] updated from transifex 2014-08-07 01:55:10 -04:00
Dan Jones
4bbea118c2 fix tiny thumbnails in public preview/share mode 2014-08-06 19:32:21 +01:00
Robin Appelman
eb8683e6ee trim leading slash 2014-08-06 14:57:54 +02:00
Robin Appelman
12207ec0c7 Fix SharedCache::getPathById 2014-08-06 13:38:14 +02:00
Morris Jobke
9fb79c86f0 Merge pull request #10191 from owncloud/sharing_rm_trailing_slash 
[sharing] remove trailing slash
 2014-08-05 23:13:35 +02:00
Bjoern Schiessle
f451173817 remove unused variable 2014-08-05 20:34:18 +02:00
Morris Jobke
676fa459d7 Minor fixes 
* instanceof \OC\Files\View
* fix misplaced paranthesis
* remove misplaced character in comment
 2014-08-05 16:53:28 +02:00
Thomas Müller
b68275baba close session right before the download starts - this enables parallel downloads 2014-08-05 11:21:42 +02:00
Jenkins for ownCloud
d1aaa7a12e [tx-robot] updated from transifex 2014-08-02 01:54:33 -04:00
Morris Jobke
6cbfe8fd98 Merge pull request #10067 from owncloud/fix-#9119 
Quick fix for #9119. Increase preview to keep empty message more centered
 2014-08-01 09:25:15 +02:00
Jenkins for ownCloud
86cdfa3db3 [tx-robot] updated from transifex 2014-08-01 01:54:28 -04:00
Jörn Friedrich Dreyer
dc6180427c Merge pull request #10048 from owncloud/fix_search_in_shared_files 
traverse folders in php to search in shared files
 2014-07-31 18:27:47 +02:00
Jörn Friedrich Dreyer
1af436cb59 add test for search() in shared cache 2014-07-31 15:07:49 +02:00
Jörn Friedrich Dreyer
a7b4cd77b1 traverse folders in php to search in shared files 2014-07-31 12:05:29 +02:00
Remco Brenninkmeijer
a1b5bc8684 Quick fix for #9119. Increase preview to keep empty message more centered and push footer down. 2014-07-30 22:41:17 +02:00
Jan-Christoph Borchardt
8389ff5875 Merge pull request #10054 from owncloud/dont_preload_videos 
don't preload videos on public sharing, fixes #10042
 2014-07-30 21:10:57 +02:00
Georg Ehrke
3d0bcb7c46 don't preload videos on public sharing, fixes #10042 2014-07-30 17:06:41 +02:00
Robin Appelman
c066320208 Also keep maxY into account when scaling a preview while preserving aspect ratio 2014-07-30 13:52:40 +02:00
Björn Schießle
03f7c5c561 Merge pull request #9983 from owncloud/sharing_add_unshare_to_overview 
update attributes for share-with-user view
 2014-07-29 14:00:57 +02:00
Jenkins for ownCloud
29a3f1e2af [tx-robot] updated from transifex 2014-07-29 09:16:02 +02:00
Bjoern Schiessle
aff948925a update attributes for share with user list, file should always have delete permissions, this means unshare in this context, and the overview page is always a root view 2014-07-28 22:04:13 +02:00
Björn Schießle
c53b56e313 Merge pull request #9798 from owncloud/ocs_share_api_add_expire_date 
[share api] add OCS api call to set expire date for link shares
 2014-07-28 17:28:32 +02:00
Jan-Christoph Borchardt
13ca1c6a99 Merge pull request #9585 from owncloud/design-fix-public-footer 
move public page footer rules from sharing app to core so it is used by other apps too
 2014-07-28 12:53:29 +02:00
Bjoern Schiessle
b7958f79c3 adjust error code 2014-07-28 12:39:22 +02:00
Jenkins for ownCloud
a169572223 [tx-robot] updated from transifex 2014-07-28 01:54:30 -04:00
Jenkins for ownCloud
9a4d2871eb [tx-robot] updated from transifex 2014-07-27 01:54:31 -04:00
Jenkins for ownCloud
010732019a [tx-robot] updated from transifex 2014-07-26 01:54:40 -04:00
Bjoern Schiessle
ecc1f92bb6 add OCS api call to set expire date for link shares 2014-07-25 13:38:18 +02:00
Björn Schießle
40f2a34be1 Merge pull request #9867 from owncloud/fix_sharing_update 
fix sharing update, add proper escaping
 2014-07-25 10:16:22 +02:00
Jenkins for ownCloud
3f58d949e0 [tx-robot] updated from transifex 2014-07-25 01:54:32 -04:00
Bjoern Schiessle
c22b5c7884 fix sharing update, add proper escaping 2014-07-24 20:16:40 +02:00
Morris Jobke
fa333c02a0 Merge pull request #9703 from owncloud/files-preview-animate 
[OC 7] Fix preview animation on uploading
 2014-07-24 14:19:00 +02:00
Jenkins for ownCloud
e2327f83ed [tx-robot] updated from transifex 2014-07-24 01:54:37 -04:00
Robin Appelman
97de7bb23e Fix remote share when remote server is installed at the root 2014-07-23 13:45:56 +02:00
Jenkins for ownCloud
5696a88fc3 [tx-robot] updated from transifex 2014-07-22 01:54:29 -04:00
Jenkins for ownCloud
ddd8eae932 [tx-robot] updated from transifex 2014-07-21 01:54:30 -04:00
Jenkins for ownCloud
ddc85a9871 [tx-robot] updated from transifex 2014-07-20 01:54:40 -04:00
Jenkins for ownCloud
d09ec36751 [tx-robot] updated from transifex 2014-07-19 01:54:42 -04:00
Vincent Petry
7a1048956f Fix preview animation on uploading 
When adding/uploading files, the preview is now animated.
When loading a list of files directly the preview is displayed directly.
 2014-07-17 12:42:09 +02:00
Jenkins for ownCloud
b736864e78 [tx-robot] updated from transifex 2014-07-17 01:55:09 -04:00
Vincent Petry
658828867c Correctly return the owner display name for children of shares 2014-07-16 12:07:02 +02:00
Jenkins for ownCloud
0155326227 [tx-robot] updated from transifex 2014-07-16 01:55:55 -04:00
Morris Jobke
4c0ca27909 Merge pull request #9596 from owncloud/fixing-9503-master 
reduce share action text to the user name only
 2014-07-15 09:15:32 +02:00
Jenkins for ownCloud
ff11ef3c5b [tx-robot] updated from transifex 2014-07-15 01:55:20 -04:00
Thomas Müller
7159d6118e reduce share action text to the user name only 2014-07-14 21:11:50 +02:00
Vincent Petry
dd7529da98 Added mountType attribute and adapted Delete action text 
Added mountType attribute for files/folder to indicated whether they are
regular, external or shared.

The client side then adapts the "Delete" action hint text based on this
information.

Only the mount roots must have the delete icon hint adapted.
To make this detectable on the client side, the mountType can now
be null, "shared", "shared-root", "external" or "external-root".

This also gives room to icon customization on the client side.
 2014-07-14 10:36:04 +02:00
Jenkins for ownCloud
5dd76b510f [tx-robot] updated from transifex 2014-07-14 01:54:27 -04:00
Jenkins for ownCloud
d7b8e3209b [tx-robot] updated from transifex 2014-07-13 01:54:35 -04:00
Jenkins for ownCloud
c1e95d62ec [tx-robot] updated from transifex 2014-07-12 01:54:39 -04:00
Vincent Petry
e391108ebc Merge pull request #9538 from owncloud/fileactions-cleanup 
Propagate file action changes to the file lists
 2014-07-10 16:15:23 +02:00
Jenkins for ownCloud
77792b5b7e [tx-robot] updated from transifex 2014-07-10 04:59:40 -04:00
Vincent Petry
22653e21a2 Propagate file action changes to the file lists 
Whenever an app needs to register an event late, it does that on the
original file actions object.

Since the file actions that the file list work on is a merged list, not
the original one, the registration event needs to be propagated there as
well.
 2014-07-09 12:26:33 +02:00
Jenkins for ownCloud
6e2e0108ee [tx-robot] updated from transifex 2014-07-09 01:55:51 -04:00
Vincent Petry
87adbf1c6e Merge pull request #9515 from owncloud/update-sharecleanupfix 
Fix update cleanup to only affect file and folders
 2014-07-08 18:09:26 +02:00
Vincent Petry
f4f52cf242 Fix update cleanup to only affect file and folders 
Fix bug in the SQL query that cleans up stray shares for removed
files/folders, which is now correctly limited to that item type instead
of also removing all other share types.
 2014-07-08 14:53:31 +02:00
Thomas Müller
ea269f0067 Upload abortion is now detected within the OC_Connector_Sabre_File::put() 
OC_Connector_Sabre_AbortedUploadDetectionPlugin is pointless

Adding unit test testUploadAbort()
 2014-07-08 11:09:59 +02:00
Jenkins for ownCloud
20fc4b8b53 [tx-robot] updated from transifex 2014-07-08 01:55:17 -04:00
Morris Jobke
45a4751f0e Merge pull request #9499 from owncloud/shares-hidetokenrecipient 
Do not show recipient for link shares in file list
 2014-07-07 20:02:59 +02:00
Morris Jobke
29bdfc0ce2 Merge pull request #9502 from owncloud/add_ocsids 
Add ocsids for shipped apps in core repo
 2014-07-07 19:58:41 +02:00
Morris Jobke
54a8dce380 Merge pull request #9415 from owncloud/external-sharedialog 
Improved external share dialog
 2014-07-07 19:51:54 +02:00
Georg Ehrke
e5e8e28ae7 add ocsids to info.xml 2014-07-07 17:11:50 +02:00
Vincent Petry
4ba492f28d Fixed shared list sorting 
Use Array.sort instead of underscore's sortBy() as they don't use the
same method/function signature.
 2014-07-07 16:49:32 +02:00
Vincent Petry
8ddff52c51 Do not show recipient for link shares in file list 
In the "Shared with link" section, the share_with field can contain a
value when a password was set.

This fix prevents this value to be shown as it is not intended for the
end user.
 2014-07-07 16:33:23 +02:00
Vincent Petry
130b8018a1 Improved external share dialog 
Changed title, label and buttons.
Removed icon.
 2014-07-07 15:57:26 +02:00
Jan-Christoph Borchardt
498adda0f4 move public page footer rules from sharing app to core so it is used by other apps too 2014-07-07 12:21:48 +02:00
Jenkins for ownCloud
6e9905d7cf [tx-robot] updated from transifex 2014-07-07 01:54:28 -04:00
Jenkins for ownCloud
33492b4448 [tx-robot] updated from transifex 2014-07-06 01:54:33 -04:00
Jenkins for ownCloud
23e0ef6ed0 [tx-robot] updated from transifex 2014-07-05 01:56:33 -04:00
Björn Schießle
a544bd3a0f Merge pull request #9357 from owncloud/sharing_unshare_on_delete 
[sharing] unshare childrens on delete
 2014-07-04 17:42:52 +02:00
Morris Jobke
574cb15c2d Merge pull request #9434 from owncloud/files-reloadpromiseissue 
Fix reload call for all subclasses
 2014-07-04 16:13:33 +02:00
Morris Jobke
3d13e04170 Merge pull request #9426 from owncloud/design-remoteshare-confirm 
use icon-confirm instead of text for accepting remote share, works better with translations
 2014-07-04 14:13:44 +02:00
Vincent Petry
59ca30d462 Fix reload call for all subclasses 
All subclasses must also properly return the ajax call object.
 2014-07-04 11:45:36 +02:00
Vincent Petry
5e8959a5b3 Return and use isPreviewAvailable for share previews 
Since the mime type is known, now isPreviewAvailable is returned as well
and used by the JS side to properly render mime icon and previews.
 2014-07-04 11:16:23 +02:00
Bjoern Schiessle
3b9fa81581 if a folder gets deleted we unshare all shared files/folders below 2014-07-04 10:34:54 +02:00
Morris Jobke
ac00e4b6e6 IE8 fixes 2014-07-04 08:13:05 +02:00
Jenkins for ownCloud
e4a3f8d3c4 [tx-robot] updated from transifex 2014-07-04 01:56:01 -04:00
Jan-Christoph Borchardt
8e617453e5 use icon-confirm instead of text for accepting remote share, works better with translations 2014-07-04 00:07:24 +02:00
Jan-Christoph Borchardt
e5f68bafb9 for shared links, use wide logo on desktop and icon on mobile 2014-07-03 12:20:44 +02:00
Jan-Christoph Borchardt
e9f616b0a0 Merge pull request #9391 from owncloud/design-mobile-share 
Fix mobile share view glitches
 2014-07-03 09:45:19 +02:00