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
Jenkins for ownCloud
e00f25e5b0
[tx-robot] updated from transifex
2014-10-31 01:55:39 -04:00
Thomas Müller
f776bcd4a0
remove unnecessary require calls - the ownCloud class loader is supposed to take care of this
2014-10-30 17:20:40 +01:00
Jenkins for ownCloud
ea55848fa1
[tx-robot] updated from transifex
2014-10-30 01:55:14 -04:00
Vincent Petry
106b9eb55c
Merge pull request #11409 from owncloud/watcher-reuse
...
Pass the cached data to the filesystem watcher
2014-10-29 16:38:16 +01:00
Morris Jobke
7d10ec41e6
Merge pull request #11835 from owncloud/enc-fixmovingsharekeystofolder
...
Fix moving share keys as non-owner to subdir
2014-10-29 15:59:42 +01:00
Vincent Petry
f44e617dfd
Fix warning with unset extension check
2014-10-29 12:56:49 +01:00
Thomas Müller
9f7c571e40
update all translation files to js and json
2014-10-29 10:13:50 +01:00
Vincent Petry
ec1a73fab9
Added OC.L10N namespace with translation functions
...
Added addTranslations and fixed de.js file
Fixed de.js to use OC.L10N.register() and use to correct expected
format.
Added JS unit tests for OC.L10N class
Include translations JS script for all apps
2014-10-29 10:09:12 +01:00
Jenkins for ownCloud
cb944814d9
[tx-robot] updated from transifex
2014-10-29 01:54:45 -04:00
Jenkins for ownCloud
5d391910c5
[tx-robot] updated from transifex
2014-10-27 01:54:28 -04:00
Robin Appelman
4438c7de1d
Fix shared cache getFolderContents
2014-10-24 12:32:55 +02:00
Robin Appelman
6ed9f53fcd
also update shared watcher
2014-10-24 12:32:55 +02:00
Jenkins for ownCloud
e75c2edba6
[tx-robot] updated from transifex
2014-10-23 01:55:51 -04:00
Lukas Reschke
cb36666600
Merge pull request #11630 from owncloud/kill-some-legacy
...
remove legacy class OC_Updater
2014-10-21 14:01:49 +02:00
Jenkins for ownCloud
8485743e33
[tx-robot] updated from transifex
2014-10-21 01:55:45 -04:00
Thomas Müller
d9907b6fa3
move some deprecated usage of OC_Config and OC_AppConfig to \OC::server
2014-10-20 14:44:44 +02:00
Jörn Friedrich Dreyer
cb3a4d22b1
make tests compatible with hook based skeleton generation
2014-10-20 11:29:20 +02:00
Jörn Friedrich Dreyer
9b0f0df7f5
make skeleton compatible with objectstore
...
suspend encryption proxy when copying skeleton
2014-10-20 11:28:36 +02:00
Jenkins for ownCloud
87da62072b
[tx-robot] updated from transifex
2014-10-20 01:54:34 -04:00
Morris Jobke
f1a5ebd59d
Merge pull request #11611 from owncloud/fix-svg-master
...
Fix SVG icons
2014-10-17 12:01:27 +02:00
Jenkins for ownCloud
92f2914335
[tx-robot] updated from transifex
2014-10-17 01:58:25 -04:00
Lukas Reschke
9cfbf7ed1c
Fix SVG icons
...
FIXME: Ugly hack to prevent SVG of being returned if the SVG
provider is not enabled.
This is required because the preview system is designed in a
bad way and relies on opt-in with asterisks (i.e. image/*)
which will lead to the fact that a SVG will also match the image
provider.
Conflicts:
lib/private/preview.php
2014-10-16 12:35:51 +02:00
Thomas Müller
b091394a90
introduce new app page layout
...
filter installed and not-installed apps properly
kill unneeded file
load category 'Installed' on page load
adding documentation links
new apps mgmt: first style adjustment
apps mgmt: only show license and preview if they exist
adding buttons
new apps mgmt: fix for mobile
use app icon if available
new apps mgmt: position enable/disable toggle to the right
new apps mgmt: proper display of icons or previews
new apps mgmt: fix loading spinner
reenable group selection for apps
new apps mgmt: position enable button normally again
new apps mgmt: clarify wording from 'Installed' to 'Enabled'
reintroduce enable/disable
Move rating image path generation to client-side
Move expression outside of l10n
fix group handling
add buttons for 'More apps' and 'Add your app' again
disable changed date of app for now
adding recommended label
style 'Recommended' app tag
fixing php warning
sort by rating
adding meta-category 'Recommended'
Only show existing documentation links
lacy loading of screenshots
making group based app activation work again
adding support to get the app icon not only by the app name but also simply by the fixed name 'app.svg'
adding app.svg for all core apps
query string '?installed' is not longer needed
update and uninstall is back + error feedback
remove unneeded parameter
fix alignment of 'recommended' label
2014-10-15 15:21:40 +02:00
Vincent Petry
6cbabdf217
Fixed array detection on public download
...
When downloading a folder called "0001" PHP should fallback to parsing
it as string and properly detect that it is not a JSON array.
2014-10-13 12:54:21 +02:00
Björn Schießle
87899db204
Merge pull request #11380 from owncloud/fix_performance_issue_sharing
...
[sharing] fix performance issues
2014-10-10 15:56:30 +02:00
Bjoern Schiessle
527e1d001f
try to get path from filesystem
2014-10-10 14:47:41 +02:00
Bjoern Schiessle
3431d547a9
fix performance issues
2014-10-10 12:16:26 +02:00
Jenkins for ownCloud
2cc26c9022
[tx-robot] updated from transifex
2014-10-10 01:55:10 -04:00
MTRichards
f511977832
Updated info.xml app description
...
Added updates description
2014-10-08 21:24:54 -04:00
Jenkins for ownCloud
01be0af209
[tx-robot] updated from transifex
2014-10-07 01:54:46 -04:00
Jenkins for ownCloud
f191e5b088
[tx-robot] updated from transifex
2014-10-05 01:54:50 -04:00
Lukas Reschke
306bf71c62
Use SVG previews for public sharing
...
Fixes https://github.com/owncloud/core/pull/11367#issuecomment-57306037 and https://github.com/owncloud/core/issues/9218
2014-09-30 15:49:49 +02:00
Lukas Reschke
8c8e5c168e
Merge pull request #10107 from owncloud/sharing_group_shares
...
[sharing] group shares
2014-09-29 20:26:41 +02:00
Bjoern Schiessle
6e7acb8ae0
some small fixed, suggested by scrutinizer
2014-09-29 11:23:18 +02:00
Bjoern Schiessle
e5f0dded84
throw a exception if we can't handle the provided path
2014-09-29 11:13:06 +02:00
Jenkins for ownCloud
63726ea9e2
[tx-robot] updated from transifex
2014-09-29 01:54:33 -04:00
Jenkins for ownCloud
84923475c0
[tx-robot] updated from transifex
2014-09-28 01:55:09 -04:00
Jenkins for ownCloud
3a16b1bb68
[tx-robot] updated from transifex
2014-09-27 01:54:48 -04:00
Jenkins for ownCloud
1631937990
[tx-robot] updated from transifex
2014-09-26 01:54:59 -04:00
Bjoern Schiessle
52b6469b0c
call \OCP\Share::getItemsSharedWithUser() to get exclude list, this way all checks are executed, e.g. to check if the share is really visible
2014-09-25 14:26:31 +02:00
Bjoern Schiessle
d5fc011c90
some small fixes
2014-09-25 11:29:57 +02:00
Jenkins for ownCloud
f46e49529f
[tx-robot] updated from transifex
2014-09-25 01:55:32 -04:00
Bjoern Schiessle
5c7fe91041
clear share table after each test run
2014-09-24 14:02:02 +02:00
Lukas Reschke
aeb516c3c9
Check for blacklisted characters
...
Fixes https://github.com/owncloud/core/issues/11264
(This should in future get moved to the mountpoint class - but that is something for @icewind1991 ;-))
2014-09-23 19:30:32 +02:00
Jenkins for ownCloud
479e4410c5
[tx-robot] updated from transifex
2014-09-23 02:05:45 -04:00
Bjoern Schiessle
9105e17307
unit tests for grouping of shares pointing to the same source
2014-09-22 17:54:47 +02:00
Bjoern Schiessle
89c3b650e6
group shares and combine permissions
2014-09-22 17:25:15 +02:00
Volkan Gezer
d16b8c03e9
fix button text l10n
2014-09-22 09:32:03 +02:00
Georg Ehrke
9fd23d2edf
files_sharing: add route for ajax/publicpreview
2014-09-21 18:21:42 +02:00
Jenkins for ownCloud
786312d0e8
[tx-robot] updated from transifex
2014-09-19 01:55:44 -04:00
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
Robin Appelman
07d5725de2
Fix trashbin when deleting a file over an external share
2014-08-08 15:48:59 +02: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
Jenkins for ownCloud
1a1c5aa3c0
[tx-robot] updated from transifex
2014-07-03 01:56:24 -04:00
Volkan Gezer
bf08e3a85e
Merge pull request #9382 from owncloud/server2server-css
...
fix lineheight of server2server share
2014-07-03 00:39:37 +02:00
Jan-Christoph Borchardt
0df04975b0
use same logo for mobile as for when logged in, fix #9360
2014-07-02 23:33:20 +02:00
Jan-Christoph Borchardt
560c530875
hide text of download button, only show icon
2014-07-02 23:21:06 +02:00
Volkan Gezer
586c4236fd
fix lineheight of server2server share
2014-07-02 21:46:52 +02:00
Vincent Petry
ed29e7d160
Merge pull request #9329 from owncloud/sharing_check_target
...
don't move a share mount point into a different mount point
2014-07-02 21:01:03 +02:00
Vincent Petry
615d037d3e
Merge pull request #9364 from owncloud/sharing_rename_mount_points
...
[sharing] rename mount point of children if parent was renamed
2014-07-02 18:48:07 +02:00
Vincent Petry
f4eb90e229
Merge pull request #9311 from owncloud/storage-not-available
...
Handle storages not being available in webui and webdav
2014-07-02 18:15:58 +02:00
Bjoern Schiessle
ea31ab7b5c
rename mount point of children if parent was renamed
2014-07-02 15:39:38 +02:00
Morris Jobke
d2f3ff5c34
Merge pull request #9245 from owncloud/server2server-sharing-design-fixes
...
drop unneeded code
2014-07-02 15:34:57 +02:00
Robin Appelman
edb67f9f4d
Remove invalid mounts from the active fs
2014-07-02 15:00:12 +02:00
Robin Appelman
0008db9995
Fix unit test
2014-07-02 14:39:45 +02:00
Morris Jobke
59629e688c
Merge pull request #9341 from owncloud/sharing-fileactions-fix
...
Fix fileActionsReady event after deferred file actions update
2014-07-02 14:36:59 +02:00
Jenkins for ownCloud
9933b33166
[tx-robot] updated from transifex
2014-07-02 01:55:17 -04:00
Vincent Petry
025b71d068
Use fileActionsReady to re-render sharing icons
...
Whenever file actions are modified, either by registering new actions or
when appending a new page of entries, the sharing app is now notified so
it can correctly refresh the sharing icon status.
Additionally, the core's loadIcons() method is also used to load the
existing shares and also refresh the sharing icons afterwards.
2014-07-01 21:32:04 +02:00
Bjoern Schiessle
bb935978fa
don't move a share mount point into a different mount point
2014-07-01 19:38:55 +02:00
Vincent Petry
fd68034357
Fixed remote share password param detection
2014-07-01 17:34:01 +02:00
Robin Appelman
8061a4ccc0
Remove external shares if the share is invalid
2014-07-01 14:58:07 +02:00
Robin Appelman
1c43081d38
Detect removed public shares
2014-07-01 14:36:06 +02:00
Jörn Friedrich Dreyer
abc521dbf7
add missing backticks
2014-07-01 12:29:30 +02:00
Jenkins for ownCloud
a878b42b42
[tx-robot] updated from transifex
2014-07-01 01:54:43 -04:00
Jörn Friedrich Dreyer
f35f14aa37
Merge pull request #9303 from owncloud/issue/8841
...
Do not strict compare item source id so the dropdown is closed correctly
2014-06-30 14:46:46 +02:00
Joas Schilling
5e4ac548bb
Use attr() instead of data() so the item ids work as intended
...
Fix #8841
2014-06-30 14:21:27 +02:00
Bjoern Schiessle
372d58544f
no longer check if the external storage app is enabled, we use no the webdav implementation from core
2014-06-30 12:34:49 +02:00
Jenkins for ownCloud
589f68ebf6
[tx-robot] updated from transifex
2014-06-30 01:54:47 -04:00
Jenkins for ownCloud
ebf93448f2
[tx-robot] updated from transifex
2014-06-29 01:56:00 -04:00
Volkan Gezer
d918e5a68c
Merge pull request #9278 from owncloud/l10n-servershare-dialog
...
fix server share dialog title
2014-06-28 14:44:37 +02:00
Morris Jobke
d5462fdb50
Merge pull request #9265 from owncloud/fix-whitespace
...
fix trailing whitespace noted by Scrutinizer
2014-06-28 12:26:09 +02:00
Jenkins for ownCloud
26d0978993
[tx-robot] updated from transifex
2014-06-28 01:54:54 -04:00
Volkan Gezer
11788c9579
fix server share dialog title
2014-06-28 01:54:51 +02:00
icewind1991
1a3e698294
Merge pull request #9263 from owncloud/remote-share-update
...
Better detecting of remote changes for external shares
2014-06-27 19:31:18 +02:00
Jan-Christoph Borchardt
b7cb4f5a63
fix trailing whitespace noted by Scrutinizer
2014-06-27 18:25:56 +02:00
Robin Appelman
1bb1504d24
Improve comment
2014-06-27 17:31:51 +02:00
Robin Appelman
6f5d5b9a30
Also check for updated permissions for webdav storages
2014-06-27 17:27:47 +02:00
Vincent Petry
13b7937381
Allow late registration of file actions in public page
2014-06-27 16:10:20 +02:00
Vincent Petry
586b3a9683
Sync file list with file actions
...
Whenever file actions are registered later, now the file lists are
automatically notified.
Added FileActions.addUpdateListener() to be able to receive such
notifications.
This removes the need for apps to manually call FileActions.display()
after registering new actions.
This fixes issues with race conditions when file actions are
registered after the file list was already rendered.
2014-06-27 13:41:01 +02:00
Thomas Müller
ef4057d382
remove pointless require - we should kill all require_once like that in our tests
2014-06-27 09:30:42 +02:00
Jenkins for ownCloud
36f771e9f0
[tx-robot] updated from transifex
2014-06-27 01:55:44 -04:00
Morris Jobke
d9aa8c9f0e
drop unneeded code
2014-06-27 00:30:14 +02:00
Vincent Petry
c6b89cc55a
Fix wording for remote shares in settings page
2014-06-26 19:35:57 +02:00
Björn Schießle
1822bba5e9
Merge pull request #9193 from owncloud/sharing_etag_propagation
...
make sure that the etags get propagated correctly
2014-06-26 10:26:24 +02:00
Jenkins for ownCloud
a5154450cf
[tx-robot] updated from transifex
2014-06-26 01:54:40 -04:00
Vincent Petry
93a6792da7
Merge pull request #9205 from owncloud/remoteshare-fixurlpath
...
Fix parsing of remote URL when mounting remote shares
2014-06-25 19:59:39 +02:00
Morris Jobke
a9d0e9a5d5
Merge pull request #9202 from owncloud/urlhashfix
...
Do not clear URL hash when no external mount params given
2014-06-25 16:28:52 +02:00
Bjoern Schiessle
38ff8173ab
make sure that hooks are registered for the tests
2014-06-25 15:20:52 +02:00
Vincent Petry
d22559200c
Fix parsing of remote URL when mounting remote shares
...
This fix allows for having the remote ownCloud instance live in a
subpath like "http://example.com/basedir/subdir/owncloud ".
Such URLs are now parsed correctly.
Added unit test for URL parsing.
2014-06-25 15:11:43 +02:00
icewind1991
c94c69aea1
Merge pull request #9189 from owncloud/sharing_fix_permissions
...
Sharing fix permissions
2014-06-25 15:01:34 +02:00
Jenkins for ownCloud
b1116880f8
[tx-robot] updated from transifex
2014-06-25 06:33:53 -04:00
Vincent Petry
363f8f3205
Do not clear URL hash when no external mount params given
...
Whenever external share parameters were passed through the URL hash, the
URL hash will now be cleared.
In other cases, the hash needs to be left alone because it is used as
workaround for the lack of history API in IE8 / IE9
Removed getParamterByName() and use OC.Util.History.parseUrlQuery() that
does the same, including replacing the "+" with spaces.
2014-06-25 12:24:46 +02:00
Bjoern Schiessle
a0b85fc5e4
make sure that during share and unshare the etags get propagated correctly
2014-06-25 12:11:56 +02:00
Bjoern Schiessle
3fc7357ade
add/update unit tests
2014-06-24 14:00:15 +02:00
Bjoern Schiessle
84d36df70b
make sure that we always return the correct permissions
2014-06-24 13:39:37 +02:00
Jenkins for ownCloud
6a4a474aa9
[tx-robot] updated from transifex
2014-06-24 01:54:39 -04:00
Vincent Petry
9b001ed903
Setup the external share manager in a hook
...
To make sure the external shares are initialized in the right order and
make sure the session is correctly initialized before, the external
share manager is now set up in a filesystem setup hook.
2014-06-23 11:57:43 +02:00
Jenkins for ownCloud
2b4c2a7b14
[tx-robot] updated from transifex
2014-06-22 01:54:36 -04:00
Jenkins for ownCloud
da0e4b0af0
[tx-robot] updated from transifex
2014-06-21 01:54:37 -04:00
Morris Jobke
d5819a5ecd
Merge pull request #9108 from owncloud/uploadintofolderfix
...
Fix many issues with drag and drop upload
2014-06-20 19:01:05 +02:00
Jenkins for ownCloud
ca96b9d3d5
[tx-robot] updated from transifex
2014-06-20 01:54:32 -04:00
Vincent Petry
9ef7410abe
Fixed uploading by drag and drop into folder
2014-06-19 16:14:10 +02:00
Jenkins for ownCloud
e1fd10f226
[tx-robot] updated from transifex
2014-06-19 01:55:38 -04:00
icewind1991
8d1cf79152
Merge pull request #8399 from owncloud/server-server-sharing
...
Add server<->server sharing
2014-06-17 17:40:05 +02:00
Robin Appelman
07fdeba50b
Fix moving movablemount over webdav
2014-06-17 14:10:11 +02:00
Robin Appelman
2219087df6
organize js a bit better
2014-06-17 13:47:36 +02:00
Robin Appelman
f2ebac5c76
Better error handeling in testremote
2014-06-17 13:15:34 +02:00
Robin Appelman
361607c72d
testremote is for public access
2014-06-17 13:08:24 +02:00
Morris Jobke
e7365c9507
fix broken buttons for IE8-11
2014-06-17 11:45:55 +02:00
Morris Jobke
17685adb87
fixing layout issue - mostly alignment
2014-06-17 11:24:39 +02:00
Jenkins for ownCloud
ce179dcdcb
[tx-robot] updated from transifex
2014-06-17 01:55:43 -04:00
Robin Appelman
3ed4e5b26b
Prevent warning
2014-06-16 16:12:32 +02:00
Robin Appelman
9c2918a626
Fix setupFromToken when a password is set
2014-06-16 16:09:56 +02:00
Robin Appelman
0616eb4007
Fix multiple users having the same external share mountpoint
2014-06-16 15:57:01 +02:00
Robin Appelman
5b1b6572f7
Make testremote more robust
2014-06-16 13:21:00 +02:00
Robin Appelman
6e06e1da0e
Add route which went missing during rebase
2014-06-16 13:20:39 +02:00
Morris Jobke
4fbab3c12d
Merge pull request #9040 from owncloud/fix-xss
...
Sanitize name of sharee
2014-06-16 13:13:28 +02:00
Robin Appelman
a469efb1f1
Add some safety checks
2014-06-16 12:42:28 +02:00
Vincent Petry
d21845557e
Merge pull request #9027 from owncloud/fix-password-saved-share-layout
...
fix layout of password protected shares
2014-06-16 11:11:03 +02:00
Jenkins for ownCloud
ec5448bf7d
[tx-robot] updated from transifex
2014-06-16 01:54:35 -04:00
Lukas Reschke
1066f4ec9a
Sanitize name of sharee
...
Fixes a XSS introduced with 271684dcfe
2014-06-14 20:45:10 +02:00
Morris Jobke
06ec82fd68
Fix path
2014-06-14 15:26:27 +02:00
Robin Appelman
9670d3e98b
Always send a POST body
2014-06-14 10:22:38 +02:00
Robin Appelman
4bc8a2550d
Fix public share webdav permissions
2014-06-14 10:22:38 +02:00
Robin Appelman
49f9b7ea8e
fix modified date for external shares
2014-06-14 10:22:38 +02:00
Robin Appelman
455fbafb48
Fix undefined index error
2014-06-14 10:22:38 +02:00
Bjoern Schiessle
3bf7b54cd5
block server-to-server share if files_external is not activates, can be reverted once we moved to the webdav implementation in core
2014-06-14 10:22:38 +02:00
Bjoern Schiessle
84a651e46d
add settings to disable server to server sharing
2014-06-14 10:22:38 +02:00
Robin Appelman
e7b58ed2bd
Properly expose read only public shares as read only
2014-06-14 10:14:08 +02:00
Robin Appelman
87e311b996
Fix storage being passed to cache/watcher and scanner when using storage wrappers
2014-06-14 10:14:08 +02:00
Robin Appelman
decb51aee6
Fix deleting of external shares
2014-06-14 10:14:08 +02:00
Robin Appelman
c8c8106168
generate better storage ids
2014-06-14 10:14:08 +02:00
Robin Appelman
ce0aa7d4a8
Use the movable mount system for external shares
2014-06-14 10:14:08 +02:00
Robin Appelman
c61f759a8b
Fix check for shared files inside shares
2014-06-14 10:14:08 +02:00
Robin Appelman
2005c162bd
Fix prompting for password
2014-06-14 10:14:07 +02:00
Robin Appelman
64ced76beb
Save mountpoints relative to the user
2014-06-14 10:14:07 +02:00
Robin Appelman
43c56fcd07
Generate a unique name
2014-06-14 10:14:07 +02:00
Robin Appelman
e6f3850890
Update for changes in master
2014-06-14 10:14:07 +02:00
Bjoern Schiessle
961317d911
make sure to enable incognito mode when mounting a public link and update init status of the encryption app
2014-06-14 10:14:07 +02:00
Robin Appelman
87b0021e56
Scan the entire remote share at once by requesting the full file tree from the remote server
2014-06-14 10:14:07 +02:00
Robin Appelman
30f5b2bd7c
Improve detection of whether we're in the files app
2014-06-14 10:13:24 +02:00
Robin Appelman
a900c7aa94
Fix removing remote shares
2014-06-14 10:13:24 +02:00
Robin Appelman
1c149da52f
Support path lengths up to 4000 chars
2014-06-14 10:13:24 +02:00
Robin Appelman
c6a83b2f17
Fix exposing single files over webdav
2014-06-14 10:13:24 +02:00
Robin Appelman
cf5a72c103
Add interface for adding a public share to a different ownCloud instance
2014-06-14 10:13:24 +02:00
Robin Appelman
d7de35376d
Add interface for accpeting external shares
2014-06-14 10:13:23 +02:00
Robin Appelman
0156ef8166
Add coments to database and dont use sql keywords as table names
2014-06-14 10:10:38 +02:00
Robin Appelman
a44baaf8eb
add remote/add external shares to manager
2014-06-14 10:10:37 +02:00
Robin Appelman
65f3b2fad2
Add server<->server sharing backend
2014-06-14 10:10:37 +02:00
Jenkins for ownCloud
4a26219ecf
[tx-robot] updated from transifex
2014-06-14 01:55:24 -04:00
Morris Jobke
fc9787ed64
fix layout of password protected shares
...
* add password icon
* fix upshifted arrow button - fixes #9024
2014-06-13 16:38:42 +02:00
Jörn Friedrich Dreyer
42bf466fa1
move mail template editor from core to standalone templateeditor repo
2014-06-13 12:00:23 +02:00
Jörn Friedrich Dreyer
7e8784c075
access admin settings result message correctly
2014-06-13 11:59:14 +02:00
Jörn Friedrich Dreyer
72436b68bf
fix liskov substitution principle in admin mail template settings, fixes #8997
2014-06-12 12:38:34 +02:00
Vincent Petry
75a53b3c49
Merge pull request #8901 from owncloud/permissions-update-cache
...
Save the permissions in the filecache if it's not saved yet
2014-06-11 18:28:55 +02:00
Vincent Petry
491c96eaa9
Merge pull request #8966 from owncloud/fix_failing_tests_on_master
...
Fix failing tests on master
2014-06-11 10:05:38 +02:00
Jenkins for ownCloud
f769c52522
[tx-robot] updated from transifex
2014-06-11 01:55:07 -04:00
Bjoern Schiessle
1d9b4aadbf
no need to prepare a statement twice
2014-06-10 14:46:47 +02:00
Jenkins for ownCloud
6546b589ce
[tx-robot] updated from transifex
2014-06-10 01:54:54 -04:00
Robin Appelman
a978607011
Use &=
2014-06-09 12:47:00 +02:00
Thomas Müller
961e4e5c7c
adjust unit test assert values
2014-06-09 12:44:40 +02:00
Thomas Müller
aa38bd2b31
adding PHPDoc
2014-06-09 12:34:35 +02:00
Jenkins for ownCloud
e5c47a5e30
[tx-robot] updated from transifex
2014-06-09 01:54:32 -04:00
Jenkins for ownCloud
1f2722053f
[tx-robot] updated from transifex
2014-06-08 01:56:13 -04:00
Jenkins for ownCloud
e0446a1df5
[tx-robot] updated from transifex
2014-06-07 01:56:13 -04:00
Bjoern Schiessle
0b2ae314c7
check if permissions exists
2014-06-06 09:56:02 +02:00
Robin Appelman
60ea4388ed
Limit permissions to share permissions
2014-06-06 09:56:02 +02:00
Bjoern Schiessle
86d7371d0c
fix unshareFromSelf()
2014-06-06 09:56:02 +02:00
Bjoern Schiessle
09970e1816
update unit tests and make sure that we return the right permissions for files within a shared folder and for the shared folder itself
2014-06-06 09:56:02 +02:00
Bjoern Schiessle
574de2d91b
the mount point always have delete permissions to allow unmount
2014-06-06 09:56:01 +02:00
Bjoern Schiessle
ca6631a710
add some tests
2014-06-06 09:56:01 +02:00
Bjoern Schiessle
ad5d8d7980
nake sure ti create new db entry when user renames a group share
2014-06-06 09:56:01 +02:00
Bjoern Schiessle
a5752a8463
fix db query
2014-06-06 09:56:01 +02:00
Robin Appelman
42a362f249
Fix phpdoc and comments
2014-06-06 09:56:01 +02:00
Bjoern Schiessle
501f98f084
update share API tests, file shares never have delete permissions
2014-06-06 09:56:00 +02:00
Bjoern Schiessle
9a48e87253
make sure that we have a path relative to data/user/files to work with
2014-06-06 09:56:00 +02:00
Bjoern Schiessle
0ce07bb6c4
update mount point if file_target changed
2014-06-06 09:56:00 +02:00
Bjoern Schiessle
844b1e3fc6
add additional unit tests
2014-06-06 09:56:00 +02:00
Bjoern Schiessle
24f3f6823e
get unique_name value directly from the share array
2014-06-06 09:56:00 +02:00
Bjoern Schiessle
5132ae5e69
fix mount point move up if the parent no longer exists
2014-06-06 09:56:00 +02:00
Bjoern Schiessle
884b9a0ecf
bring back updateFileTarget() got lost during last rebase
2014-06-06 09:56:00 +02:00
Bjoern Schiessle
1b0b977678
remove share mount
2014-06-06 09:55:59 +02:00
Bjoern Schiessle
bf5e9357fc
don't allow to share single files with delete permissions, user should only be possible to unshare a single file but never to delete it
2014-06-06 09:55:59 +02:00
Robin Appelman
14ce44acc8
Move shared mount moving from the storage to the mount
2014-06-06 09:55:59 +02:00
Jenkins for ownCloud
ca739a59f0
[tx-robot] updated from transifex
2014-06-06 01:57:10 -04:00
Robin Appelman
690e0b5070
Dont overwrite OCA.Sharing
2014-06-05 12:52:08 +02:00
Vincent Petry
e0c4e960d9
Merge pull request #8861 from owncloud/share-overview-linklist
...
Added Shared with link sidebar section in files app
2014-06-05 10:59:54 +02:00
icewind1991
09cc7c2d44
Merge pull request #8862 from owncloud/share-overview-fixmimetype
...
Fix mime type returning for shared with others files
2014-06-05 10:29:03 +02:00
Thomas Müller
ff3ded6cb2
Merge pull request #8852 from owncloud/kill-permissions-master
...
Kill permissions table
2014-06-05 10:05:05 +02:00
Thomas Müller
da3974bcb2
- drop permissions table and related code
...
- the file/folder's permission is now stored in the file cache
- BackGroundWatcher has been removed - this has meanwhile be replaced by occ files:scan which can be executed in a cron jobs
- increase version to trigger database migration
2014-06-05 08:22:01 +02:00
Jenkins for ownCloud
cb61d8a226
[tx-robot] updated from transifex
2014-06-05 01:57:20 -04:00
Thomas Müller
c044ff99ce
Merge pull request #8724 from owncloud/update-sabre-2.0
...
Update SabreDAV to 1.8.10
2014-06-04 23:05:34 +02:00
Morris Jobke
7a20d22daa
Merge pull request #8824 from owncloud/mail_template_editing_in_webui
...
minimal mail template editor for administrators
2014-06-04 18:44:44 +02:00
Morris Jobke
ca43fba513
Merge pull request #8791 from owncloud/share-overview-sharewithstatus
...
Update share action text to display owner/recipients
2014-06-04 17:04:30 +02:00
Thomas Müller
fc1d6f4c3c
fixes during test
2014-06-04 15:01:36 +02:00
Thomas Müller
76e04027bc
Upgrade SabreDAV to 1.8.10
...
Updating SabreDAV namespaces
2014-06-04 12:22:23 +02:00
Vincent Petry
816db7aef1
Fixed wording to "Shared by link"
2014-06-04 11:32:30 +02:00
Vincent Petry
c88509902e
Fix mime type returning for "shared with others" files
...
Use "path" instead of "file_target", as the latter is not always set /
reliable.
2014-06-04 11:26:03 +02:00
Vincent Petry
b3fdda1751
Added "Shared with link" sidebar section in files app
...
Added section to only show link shares.
Please note that the filtering is currently done on the client side
which might not be the most efficient way of doing it.
2014-06-04 11:10:11 +02:00
Vincent Petry
af6a65cbf3
Do not update action icon recipients for file list
...
Since the files app doesn't have the recipient information on load it
cannot initially render the recipients in the action icons.
For this reason the action icon will not be updated with the recipients
after changing the shares, for consistency.
2014-06-04 10:48:01 +02:00
Vincent Petry
07f1b263c9
Use recipient display names when updating shares in the UI
...
Since OC.Share didn't have any array containing the list of shares for
the current file, OC.Share.currentShares has been introduced to contain
the full share item structure instead of the reduced one
OC.Share.itemShares.
The event "sharesChanged" is now passing OC.Share.currentShares, which
itself includes the display name to be displayed for the recipients in
the action icon.
2014-06-04 10:37:04 +02:00
Jan-Christoph Borchardt
6b2b903ea6
Merge pull request #8468 from owncloud/remove-infieldlabels
...
Remove infieldlabels
2014-06-04 09:28:20 +02:00
Jenkins for ownCloud
f5c4754c2b
[tx-robot] updated from transifex
2014-06-04 01:57:48 -04:00
Thomas Müller
6764d5b122
Merge pull request #8698 from owncloud/sharing_improve_permissions
...
get permissions directly from share storage to avoid additional db calls
2014-06-03 19:13:51 +02:00
Jörn Friedrich Dreyer
b5a145b297
convert mail template editor to app framework for a restful api
2014-06-03 16:53:03 +02:00
Jan-Christoph Borchardt
4ef94ddd2e
infield label removal: remove last occurences of infield labels
2014-06-03 15:30:09 +02:00
Vincent Petry
1297b2b883
Multiple fixes to sharing overview
...
- scrolling to next page now correctly renders share icons
- reshareing/unsharing a reshare will now still keep "Shared by" label
2014-06-03 11:04:57 +02:00
Bjoern Schiessle
916f859377
check if it is a share storage
2014-06-02 20:39:20 +02:00
Thomas Müller
2a10e78c58
no need to empty array in a special way
2014-06-02 20:17:40 +02:00
Bjoern Schiessle
e0a5f3b570
get permissions directly from share storage to avoid additional db calls
2014-06-02 20:17:40 +02:00
Jörn Friedrich Dreyer
37afab87b5
minimal mail template editor for administrators, refs #7177
2014-06-02 19:22:58 +02:00
Vincent Petry
640fbc016d
Now using shareOwner for the share owner
...
Makes it consistent with the regular file list fileData
2014-06-02 18:52:31 +02:00
Morris Jobke
da090099f4
fix unit tests
2014-06-02 18:39:52 +02:00
Vincent Petry
0944565f60
More unit tests and fixes for share
2014-06-02 18:08:56 +02:00
Morris Jobke
57ef089aac
drop allowZIPdownload and maxZIPSize as options
2014-06-02 16:29:03 +02:00
Vincent Petry
d677e3860d
Added unit tests for share.js and share icon
2014-06-02 15:59:06 +02:00
Vincent Petry
7961d4a87e
Update share action text to display owner/recipients
...
- when a share was changed, update the share action text
- added file data attribute "data-share-recipients"
2014-06-02 12:12:57 +02:00
Jenkins for ownCloud
d39216c5e7
[tx-robot] updated from transifex
2014-06-02 01:54:37 -04:00
Jenkins for ownCloud
36b0c599f5
[tx-robot] updated from transifex
2014-06-01 01:55:19 -04:00
Jenkins for ownCloud
cff9440a37
[tx-robot] updated from transifex
2014-05-31 01:55:46 -04:00
Thomas Müller
5dd3e34f57
Merge pull request #8444 from owncloud/cleanup-list-code
...
Cleanup code of files_sharing/ajax/ a little bit
2014-05-30 22:40:28 +02:00
icewind1991
2ba5701b1a
Merge pull request #8778 from owncloud/storage-instanceof
...
Add storage->instanceOfStorage() to handle instanceof with storage wrappers
2014-05-30 14:58:59 +02:00
Vincent Petry
7fac2b62e9
Fixed warning when file_target is not set
...
In some cases (like in the unit tests) "file_target" is not set yet
whenever the target file system hasn't been mounted yet.
2014-05-30 12:35:04 +02:00
Vincent Petry
5e4e773446
Removed "Share with" column
2014-05-30 10:06:30 +02:00
Vincent Petry
e084183d1e
Added owner display name in action
2014-05-30 10:06:29 +02:00
Vincent Petry
1d9129eac3
Sharing overview fixes and unit tests
...
- Fixed renaming and fileActionsReady event
- Added unit tests for shares list
- Fixed public page with defer
- Fixed file actions in sharing overview
- Fixed sharing counterpart list (10 entries max)
- Fixed file path attribute to be used in download action
- Fix sharing list headers
- OC.Share icons now operate on fileList instance
- Fix OC.Share.updateIcon when more than one list in DOM
2014-05-30 10:06:29 +02:00
Vincent Petry
0879a63320
Mimetype for sharing overview
2014-05-30 10:06:29 +02:00
Vincent Petry
ef59c69dc8
Distinguish legacy file actions from regular file actions
...
Legacy file actions are registered by legacy apps through
window.FileActions.register(). These actions can only be used by the
main file list ("all files") because legacy apps can only deal with a
single list / container.
New file actions of compatible apps must be registered through
OCA.Files.fileActions. These will be used for other lists like the
sharing overview.
Fixed versions and sharing actions to use OCA.Files.fileActions, which
makes them available in the sharing overview list.
2014-05-30 10:06:29 +02:00
Vincent Petry
fa32243d84
Small fixes to sharing overview
...
- Removed file size from file summary in sharing overview
- Fixed document title
- Fixed empty content text for shared overview
2014-05-30 10:06:29 +02:00
Vincent Petry
d21b8108c8
Fixed navigation order
2014-05-30 10:06:29 +02:00
Vincent Petry
0f105ec747
Removed selection checkboxes
2014-05-30 10:06:29 +02:00
Vincent Petry
85648def56
Fixed sharing permissions
2014-05-30 10:06:29 +02:00
Vincent Petry
60bcdc550e
Fixed file actions for sharing views
...
FileActions can now be clone to be use for separate file list views
without having the side-effect of affecting the main file list view.
Added "Open" action in sharing overview file lists to redirect to the
regular file list when clicking on a folder.
2014-05-30 10:06:29 +02:00
Vincent Petry
9baf47c2b4
Group shares by type
2014-05-30 10:06:29 +02:00
Vincent Petry
6ebc436505
Added sharing overview page (WIP)
...
- added sharing overview entries in the sidebar
- use OCS Share API to get the list of files
2014-05-30 10:06:29 +02:00
Bjoern Schiessle
dbbb6c5945
extend OCS Share API to allow the user to ask for files shared with him
2014-05-30 10:06:28 +02:00
Robin Appelman
99d46af0b4
Use instanceOfStorage instead of instanceof
2014-05-29 13:52:58 +02:00
Vincent Petry
a9661962fe
Merge pull request #8736 from owncloud/appinfo-newrequirefields
...
App info new fields "requiremin" and "requiremax"
2014-05-27 14:28:47 +02:00
Vincent Petry
d38f867055
Merge pull request #8721 from owncloud/sharing_don_lose_filesize
...
don't lose file size during rename
2014-05-27 12:25:55 +02:00
Vincent Petry
c64e920b4d
Adjust core apps to use "requiremin" instead of "require"
...
Also added a few missing authors.
2014-05-27 11:54:44 +02:00
Bjoern Schiessle
36f63ea990
allow resharing of files with only share permissions
2014-05-26 20:32:24 +02:00
Bjoern Schiessle
95bd7fee9c
don't lose file size during rename
2014-05-26 14:11:33 +02:00
Lukas Reschke
1b215b0131
Merge pull request #8688 from owncloud/public-image-positioning
...
Show less whitespace above publicly shared images
2014-05-24 12:49:12 +02:00
Björn Schießle
864cd2455c
Merge pull request #8699 from owncloud/sharing_improvements
...
fix share label creation
2014-05-23 20:53:32 +02:00
Bjoern Schiessle
ff4bb3a9e6
fix share label creation
2014-05-23 16:21:15 +02:00
Jan-Christoph Borchardt
7be0ce6ada
remove noise texture from interface (not necessary, and blurry on high-res)
2014-05-23 14:15:36 +02:00
Robin Appelman
10c1fc8d24
Show less whitespace above publicly shared images
2014-05-23 13:36:16 +02:00
Björn Schießle
71e1d919de
Merge pull request #8675 from owncloud/sharing-improvements
...
Sharing improvements
2014-05-23 06:41:34 -04:00
Bjoern Schiessle
3b279c9056
prevent default action when clicking on the share notification
2014-05-23 11:17:13 +02:00
Robin Appelman
157b139b57
Dont scale up the preview for publicly shared images
2014-05-22 16:45:51 +02:00
Bjoern Schiessle
11aa2cf74b
always check for unique filename, if a file gets added from outside the mount
...
point should be adjusted to ne unique again
2014-05-22 14:31:22 +02:00
Bjoern Schiessle
1166d62d9b
fileList needs be be declared before the if-statement
2014-05-22 14:31:16 +02:00
Bjoern Schiessle
12338e0ef0
allow admin to disable sharing for specific groups of users
2014-05-22 10:43:44 +02:00
Bjoern Schiessle
5f403f3e92
move the mount point up if a share is mounted to a subfolder and the subfolder no longer exists
2014-05-21 13:19:17 +02:00
Vincent Petry
7d98bcf9a2
Fixed JS issues in public page
...
- fixed subdir detection when uploading into subdir
- add class detection before overriding to avoid JS errors
2014-05-20 13:37:58 +02:00
Thomas Müller
51a6764f31
Merge branch 'master' into cleanup-list-code
...
Conflicts:
apps/files_sharing/ajax/list.php
2014-05-19 20:52:25 +02:00
Morris Jobke
dc36d30953
Remove all occurences of @brief and @returns from PHPDoc
...
* test case added to avoid adding them later
2014-05-19 17:50:53 +02:00
Robin McCorkell
e7aebc5c32
Fix whitespace issues
2014-05-16 22:23:36 +01:00
Robin McCorkell
6930ae22e4
Fix more missing or broken PHPDoc
2014-05-16 22:21:57 +01:00
Robin McCorkell
c4f1de63a8
Fix PHPDoc in /apps
2014-05-16 22:21:57 +01:00
Björn Schießle
42b99b6d0f
Merge pull request #8555 from owncloud/sharing_default_expire_only_public_links
...
use default expire date only for link shares
2014-05-16 14:57:11 -04:00
Björn Schießle
b52cb8f557
Merge pull request #8604 from owncloud/sharing_encforce_password
...
allow admin to enforce passwords for public link shares
2014-05-16 12:23:01 -04:00
Bjoern Schiessle
7a48f24459
use default expire date only for link shares
2014-05-16 18:12:13 +02:00
Bjoern Schiessle
b6e14af861
allow admin to enforce passwords for public link shares
2014-05-16 17:41:09 +02:00
Vincent Petry
1fb0d5412c
Merge pull request #6260 from owncloud/jan-navigation-filesidebar
...
Files app navigation sidebar
2014-05-16 13:00:35 +02:00