582f07950f
Merge pull request #17075 from owncloud/bootstrap-tooltip
...
Replace jQuery tipsy with bootstrap tooltip
2015-07-23 19:25:09 +02:00
9ccf94ca06
[tx-robot] updated from transifex
2015-07-23 01:55:22 -04:00
296ed4c276
Merge pull request #17413 from owncloud/public-api-querybuilder
...
Add public api for Doctrine QueryBuilder and ExpressionBuilder
2015-07-22 17:29:08 +02:00
145ab3a28d
Merge pull request #17806 from owncloud/enc_improved_app_description
...
improved app description for the default encryption module
2015-07-22 15:06:08 +01:00
e97c1db728
improved app description and adjust it to the way the new encryption module works
2015-07-22 13:43:46 +02:00
009d1f3214
move updateFileActionSpinner to OCA.Files.FileActions
2015-07-22 10:35:15 +02:00
4699a29a70
Fixing line comments and indentation
2015-07-21 22:19:53 +02:00
f77e5f411d
Fix existing usages by removing the quotes
2015-07-21 15:25:47 +02:00
de348180ae
Use the public interface and our method instead of the doctrine thing
2015-07-21 15:25:47 +02:00
2d691c2fb4
Merge pull request #17381 from owncloud/fix_sharing_add_to_group
...
[sharing] fix addToGroup hook
2015-07-21 13:30:41 +02:00
a35193c704
Merge pull request #17750 from owncloud/enc_migration_fix_mountpoint_detection
...
fix system wide mount point detection on migration
2015-07-21 11:06:02 +02:00
24f12e65ec
[tx-robot] updated from transifex
2015-07-21 01:54:52 -04:00
570dd17d4f
fix mount point detection
2015-07-20 16:00:33 +02:00
89d6439445
Merge pull request #17701 from owncloud/fix_repeated_migration
...
don't move keys if the key where already moved in a previous migration run
2015-07-20 15:12:52 +02:00
f573659b3a
Merge pull request #17723 from owncloud/fix-17631
...
fix runtime caching in ldap's user manager, fixes #17631
2015-07-20 09:29:15 +02:00
83a13c0635
[tx-robot] updated from transifex
2015-07-20 01:54:47 -04:00
b961a29b0c
fix indentation. no code changes, whitespace only.
2015-07-20 01:21:52 +02:00
4f910221c4
fix runtime caching in ldap's user manager, fixes #17631
2015-07-17 18:57:56 +02:00
37d085901b
Merge pull request #17706 from rullzer/external_diricon_filelist
...
The external directories should get the correct icon in filelist
2015-07-17 16:39:46 +02:00
4dba920fdd
unit tests
2015-07-17 15:19:10 +02:00
3000f0125f
don't move keys if the key where already moved in a previous migration run
2015-07-17 15:19:10 +02:00
b0f21c0a43
The external directories should get the correct icon
2015-07-17 14:30:12 +02:00
8723410319
[tx-robot] updated from transifex
2015-07-17 01:54:52 -04:00
db89d1cec8
handle rmdir on files for ftp storages
2015-07-16 15:44:10 +02:00
15877ac7eb
Merge pull request #17474 from owncloud/fix_trashbin
...
Don't try to move files to the trashbin outside of user/files
2015-07-16 14:15:45 +02:00
d6f02eb703
Merge pull request #17500 from owncloud/encryption_migration_improvements
...
Only clean up if migration finished succesfully
2015-07-16 14:03:21 +02:00
bfb90d10ed
Merge pull request #17046 from nicolas-grekas/fix-16654
...
Do not use OC*::mb_*_replace(), they are useless
2015-07-16 11:35:25 +02:00
472d48f6e3
Do not use OC*::mb_*_replace(), they are useless
2015-07-16 11:00:04 +02:00
23d1cf26b9
Lock scanner to the given user
2015-07-15 14:08:06 +02:00
43afa4c0e3
refactor this to proper separation of concerns
2015-07-15 11:14:20 +02:00
5cd7f7eccd
Merge pull request #17623 from owncloud/fed-throwcorrectexception
...
Throw storage not available on guzzle error
2015-07-14 10:12:32 +02:00
2d5ddb02fa
[tx-robot] updated from transifex
2015-07-14 01:54:45 -04:00
3d6be69f25
Throw storage not available on guzzle error
...
If the remote server is in maintenance mode, we must throw storage not
available exception instead of not found which might auto-remove the
share.
2015-07-13 18:51:25 +02:00
b3b080e1c0
Strip public webdav info about sharing and mount points
...
Remove information about whether a file is an incoming share or mount
point when requested over public webdav.
2015-07-13 14:20:35 +02:00
52e9c94e08
[tx-robot] updated from transifex
2015-07-13 01:54:50 -04:00
7cf6badad5
[tx-robot] updated from transifex
2015-07-12 01:54:49 -04:00
bfd7194cf9
[tx-robot] updated from transifex
2015-07-11 01:54:51 -04:00
87f3500fda
Merge pull request #17483 from rullzer/migrate-mimetype-js
...
Move away from OCA.files.getMimeIcon and use OC.MimeType.getIconUrl
2015-07-10 10:14:03 +02:00
176dabd976
[tx-robot] updated from transifex
2015-07-10 01:54:55 -04:00
42eb18c747
Merge pull request #17473 from owncloud/enc_fix_migration
...
more secure way to update the database
2015-07-09 22:41:56 +02:00
eb7a796ad9
Fix unit tests
2015-07-09 18:42:46 +02:00
7d943b2ddc
Make the filelist get the mimetypeicon from the mimetype
2015-07-09 13:56:43 +02:00
a727cbc7a9
Remove ajax/mimeicon.php and its route
2015-07-09 13:40:13 +02:00
5c381ea532
Move calls to Files.getMimeIcon to OC.MimeType.getIconUrl
2015-07-09 13:40:13 +02:00
1aa2f6638f
Make getMimeIcon use OC.MimeType.getIconUrl
2015-07-09 13:40:12 +02:00
bfdf39b9bd
LDAP: when checking group for matching filter, also take base DN into consideration. Fixes #17516
2015-07-09 12:19:04 +02:00
2b86ba43e3
Merge pull request #14341 from rullzer/public_share_do_not_leak_mounttype
...
No more leaking of mounttype via metadata or icon in public shares.
2015-07-09 09:41:27 +02:00
6d9bb17360
[tx-robot] updated from transifex
2015-07-09 01:54:53 -04:00
1e284b15ff
only create new key pair if both keys are missing
2015-07-08 19:08:41 +02:00
85c3b9d5cf
only cleanUp the remaining keys if the migration really finished succesfully
2015-07-08 18:23:18 +02:00
876d7c160d
more secure way to update the database
2015-07-08 13:26:53 +02:00
db65eeb580
only move real files to the trash bin
2015-07-08 11:32:06 +02:00
03a6e12bdb
fix tipsy dependency
2015-07-08 10:55:53 +02:00
0fe81d2f21
Merge pull request #17330 from owncloud/fix-share-path-for-group-exceptions
...
Fix the path for users which have an exception for a group share
2015-07-08 10:33:42 +02:00
2fd84607ee
[tx-robot] updated from transifex
2015-07-08 01:55:28 -04:00
3f5aa27d49
refactoring into proper methods
2015-07-07 15:16:37 +02:00
3d8297c254
Fix unit tests and introduce better mocks of the HTML
2015-07-07 13:56:49 +02:00
e557fe0aab
Add proper download started feedback
...
* this code adds a cookie when a special get parameter is set
* the content of this get parameter is used as value for the cookie
* the cookie expires after 20 seconds
* the JS code checks every 500 milliseconds for the cookie
-> if the cookie is set the request returned and the download is started
2015-07-07 13:56:49 +02:00
5a528214b8
Make download status fully visible
2015-07-07 13:56:49 +02:00
28a8697995
Reduce timeout for download spinner to 2 seconds
2015-07-07 13:56:49 +02:00
16c29021e6
Add loading spinner to multi select download button
2015-07-07 13:56:48 +02:00
0cdb46b5c6
Fix layout of disabled links in the file list
...
* also disable download button after click
2015-07-07 13:56:48 +02:00
28a51ef724
Add loading spinner to download icon
...
* vanishes after 7 seconds
2015-07-07 13:56:48 +02:00
594f5b6a29
Add visibility to test methods
2015-07-07 11:07:11 +02:00
fb0fef78f4
Add test case when owner renames shared folder
2015-07-07 11:06:21 +02:00
547c4b9a9f
Add unit test for getUsersSharingFile
...
This is to test if the user list and paths are correct, even when a
recipient renamed the received shared folder
2015-07-07 11:06:11 +02:00
ee5dd25290
[tx-robot] updated from transifex
2015-07-07 01:55:18 -04:00
b4f782b568
Merge pull request #16724 from owncloud/mimetype-js
...
Javascript to fetch mimetype icons
2015-07-06 20:59:56 +02:00
e84806f017
Merge pull request #17418 from owncloud/fix-public-download-button-regression
...
Fix regression of button at public download page
2015-07-06 17:10:23 +02:00
868bc421cb
Share app no longer use the OCS API icon
...
Switch to new javascript mimetype resolver
2015-07-06 16:32:15 +02:00
14eef434ff
Merge pull request #17290 from owncloud/remove-readonly-wrapper
...
Replace readonly wrapper with permissions mask
2015-07-06 15:36:11 +02:00
dba6ba2523
Merge pull request #16964 from owncloud/versions_occ
...
add occ tool to delete versions
2015-07-06 15:34:40 +02:00
7da5e53741
Fix regression of button at public download page
...
* introduced with #17159
2015-07-06 13:37:14 +02:00
4dbc8ab77f
Merge pull request #17335 from owncloud/better-federated-cloud-sharing-activities
...
Improve federated cloud sharing activities
2015-07-06 10:23:33 +02:00
fca6bcb632
Merge pull request #16733 from owncloud/add-smashbox-tests-remote-shares
...
Add OCS API to send, get, accept and decline remote shares
2015-07-06 10:12:29 +02:00
5734edfe20
[tx-robot] updated from transifex
2015-07-06 01:54:38 -04:00
55f4d0eea1
[tx-robot] updated from transifex
2015-07-05 01:54:50 -04:00
468871818d
[tx-robot] updated from transifex
2015-07-04 01:55:24 -04:00
cf732c4d27
Do not leak mounttype of a public share
2015-07-04 07:27:56 +02:00
d3ac73c0c9
Remove OC_Log
2015-07-03 18:00:16 +02:00
cc373ab89a
Merge pull request #15470 from rullzer/files_sharing_getUrlContent
...
Move away from private static function OC_Util::getUrlContent
2015-07-03 17:47:46 +02:00
763b601e4a
use the correct user if we update the share table
2015-07-03 15:58:52 +02:00
525745caf5
Merge pull request #17140 from owncloud/trashbin_occ
...
add occ command to remove deleted files
2015-07-03 15:10:50 +02:00
9da10788bc
Merge pull request #17349 from owncloud/share-onlyshowstaticownerifavailable
...
Do not show static share owner if not available
2015-07-03 09:31:40 +02:00
2118713477
Add OCS api to get, accept and decline remote shares
2015-07-03 09:30:49 +02:00
df303b910a
Allow sharing with type remote share
2015-07-03 09:28:56 +02:00
b8f5b2c47a
[tx-robot] updated from transifex
2015-07-03 01:54:57 -04:00
a3df41ddb6
Merge pull request #17159 from owncloud/fix-duplicate-id
...
remove duplicate ID in HTML template for public shares
2015-07-02 17:50:39 +02:00
71ae96bb56
Do not show static share owner if not available
...
In some corner cases, an outgoing share exists but sharing is not
allowed for the current user. This would cause the file list to break
because the static text could not be rendered as the owner was
undefined.
2015-07-02 16:38:20 +02:00
e65034e4bc
Do not register JS share plugin if core sharing API is disabled
2015-07-02 14:56:33 +02:00
ddb8cc2303
Use federated cloud id as a parameter type
2015-07-02 13:14:02 +02:00
063071b58d
Merge pull request #17328 from owncloud/revert-15363-ext-ocp
...
Revert "Use OCP classes as much as possible in files_external"
2015-07-02 13:02:35 +02:00
f5c57e076e
Merge pull request #17077 from owncloud/files-scan-absolute-path
...
fix getting mount points when passing a path to the files:scan command
2015-07-02 13:02:20 +02:00
aedf4848f7
Merge pull request #17324 from owncloud/fix-duplicated-line-in-doc-block
...
Fix duplicated line in doc block
2015-07-02 13:00:22 +02:00
079e9cecba
Revert "Use OCP classes as much as possible in files_external"
2015-07-02 13:00:21 +02:00
c7968d202f
Merge pull request #17316 from owncloud/master-delete-ocsid-from-db-if-none-specified
...
[Master] Delete OCS ID from DB if none is specified
2015-07-02 12:37:31 +02:00
aa7c8ad191
Add the item name to the federated sahre activity
2015-07-02 12:28:48 +02:00
95faaad5cf
Use the app constant to fix the grouping
2015-07-02 12:27:58 +02:00
7e3f8d3ac1
Use the item name when refering to the unaccepted remote share
2015-07-02 12:26:06 +02:00
bfcb8ffeb3
Merge pull request #17246 from owncloud/share-lock-owner-parent
...
lock parent folders for the owner when locking a shared file as recipient
2015-07-02 10:38:08 +02:00
Bernhard Posselt
Jenkins for ownCloud
Morris Jobke
Robin McCorkell
Bjoern Schiessle
Viktor Szépe
Joas Schilling
Joas Schilling
Björn Schießle
blizzz
Roeland Jago Douma
Robin Appelman
Vincent Petry
Thomas Müller
Nicolas Grekas
Hendrik Leppelsack
Roeland Douma
Jan-Christoph Borchardt