Morris Jobke
b1d8d88df8
Merge pull request #13760 from owncloud/create_enc_key_for_remote_shares
...
make sure that we always create a public share key for remote shares
2015-01-29 17:54:04 +01:00
Joas Schilling
333f4e7913
Fix intendation
2015-01-29 16:57:46 +01:00
Joas Schilling
4a5f626979
Fix more assertions
2015-01-29 16:54:27 +01:00
Joas Schilling
9a7dd57bc8
Fix 2 assertions
2015-01-29 16:09:35 +01:00
Thomas Müller
5c8e5e223d
Merge pull request #13728 from owncloud/federated_cloud
...
rename 'server-to-server sharing' to 'federated cloud'
2015-01-29 15:54:19 +01:00
Robin Appelman
ce0aa02aac
Dont do a cache rename if we cant delete the source file
2015-01-29 15:52:40 +01:00
Robin Appelman
215388f4e0
Make sure we delete the file when doing a cross storage trashbin move
2015-01-29 15:40:01 +01:00
Robin Appelman
d4c4e2a322
Detect failed deletes in the trashbin
2015-01-29 15:39:58 +01:00
Bjoern Schiessle
8a091629dc
rename 'server-to-server sharing' to 'federated cloud'
2015-01-29 15:05:39 +01:00
Bjoern Schiessle
c78e3c4a7f
make sure that we always create a public share key for remote shares
2015-01-29 14:23:14 +01:00
Thomas Müller
a25063a8ed
Merge pull request #13746 from owncloud/no-groups-provisioning-api
...
disallow provisioning api to be enabled for groups only
2015-01-29 12:47:54 +01:00
Thomas Müller
099d43b1f9
Merge pull request #13604 from owncloud/encryption-key-migration-as-repair-step
...
adding console command to migrate encryption keys - refs #13450
2015-01-29 10:30:12 +01:00
Thomas Müller
f60406102f
disallow provisioning api to be enabled for groups only
2015-01-29 10:00:54 +01:00
Jenkins for ownCloud
65871ffea3
[tx-robot] updated from transifex
2015-01-29 01:54:35 -05:00
Arthur Schiwon
73600cfdd8
and escape the search term
2015-01-29 00:27:05 +01:00
Arthur Schiwon
953a88785b
💄
2015-01-28 23:57:04 +01:00
Sugaroverdose
e57e273a40
Prevent 1px padding between button and dropdown in ie11 when zooming
2015-01-28 22:44:12 +03:00
Thomas Müller
659f958d01
Merge pull request #13401 from is-apps/amazon_s3_checkboxes
...
Tidy formatting of Amazon S3 checkboxes
2015-01-28 18:50:14 +01:00
Sugaroverdose
0418c9da3d
Play with z-index to make proper dropdown overlap
2015-01-28 20:24:12 +03:00
Arthur Schiwon
31de757514
fix counting of users in primary group
2015-01-28 15:52:59 +01:00
Robin Appelman
a59612752e
Fix trash error when deleting files with the same name at the same time (happens in unit tests)
2015-01-28 15:16:55 +01:00
Arthur Schiwon
323af55b50
inlcude AD primary group in user filter, if a group is selected. fixes #12190
2015-01-28 14:12:12 +01:00
Jenkins for ownCloud
55142186de
[tx-robot] updated from transifex
2015-01-28 01:55:53 -05:00
Morris Jobke
87b39e8f03
Merge pull request #13525 from owncloud/s2s-fixscanfileforbrokenstorage
...
Catch storage exception in scanner for remote shares
2015-01-28 00:31:37 +01:00
Vincent Petry
acec40fe5a
Merge pull request #13561 from owncloud/trash-finaldeletewhencrossstoragefix
...
Call final unlink in trash wrapper's storage
2015-01-27 17:05:38 +01:00
Vincent Petry
3764515365
Allow saving incomplete external storage config
...
This is needed for Dropbox and others that need a token.
2015-01-27 13:44:05 +01:00
Vincent Petry
c4b02176dc
Fix mount config unit test failures
...
Because setStorageId now instantiates storages, they might throw
exceptions if arguments are missing.
This fixes the unit test to not throw exceptions and have their default
config arguments set.
2015-01-27 13:44:05 +01:00
Thomas Müller
1add2f3f58
Merge pull request #13679 from owncloud/public-disablesharejsplugin
...
Disable JS plugin for sharing in public mode
2015-01-27 09:33:38 +01:00
Thomas Müller
29f49ddc3d
Merge pull request #13691 from owncloud/s2s-acceptsinglefile
...
Only reload file list after remote share accept request returns
2015-01-27 09:32:33 +01:00
Jenkins for ownCloud
c8f58054b0
[tx-robot] updated from transifex
2015-01-27 01:54:34 -05:00
Vincent Petry
182b1937bb
Only reload file list after remote share accept request returns
...
When accepting a remote share, an ajax request is sent to the server.
Only once this request returns should the file list be reloaded.
2015-01-26 21:22:22 +01:00
Vincent Petry
efcd89cb18
Do not disclose share owner in public file list
2015-01-26 19:55:48 +01:00
Vincent Petry
86689ef400
Disable JS plugin for sharing in public mode
...
This removes the logic that registers the share action and modifies the
rows. Share actions aren't needed in the public file list.
2015-01-26 19:55:48 +01:00
Vincent Petry
bd888748bd
Merge pull request #13490 from owncloud/fix_reshare_s2s_share
...
use uid provided by setupfs hook to mount server2server shares
2015-01-26 19:54:14 +01:00
Bjoern Schiessle
5ba19ba7fc
certificate manager should always use a \OC\Files\View otherwise we will get problems for different primary storages
2015-01-26 16:58:52 +01:00
Bjoern Schiessle
67da1f7e5a
certificate manager only needs the user-id, no need to pass on the complete user object
2015-01-26 16:58:52 +01:00
Bjoern Schiessle
66f0db30b2
use uid provided by setupfs hook to mount server2server shares, otherwise mount will fail for public link shares
2015-01-26 16:54:50 +01:00
Vincent Petry
d5b61f9afe
Prevent double slash in shareinfo request URL
2015-01-26 16:19:38 +01:00
Vincent Petry
5376b0b123
Add back exit()
2015-01-26 16:07:28 +01:00
Vincent Petry
f6e644b43f
Catch storage exception in scanner for remote shares
...
Whenever an exception occurs during scan of a remote share, the share is
checked for availability. If the storage is gone, it will be removed
automatically.
Also, getDirectoryContent() will now skip unavailable storages.
2015-01-26 13:59:49 +01:00
Vincent Petry
02b9bad81b
Fix bogus deletion on copy + unlink through rename
...
Cross-storage rename would cause copy + unlink. That unlink operation
must not trigger the trashbin.
2015-01-26 12:22:22 +01:00
Joas Schilling
d6939d67da
Remove duplicated definition of APIController
2015-01-26 10:20:01 +01:00
Sugaroverdose
8605e84547
Fix #13632 and make new file menu more consistent with button
2015-01-25 20:15:08 +03:00
Jenkins for ownCloud
a698637e91
[tx-robot] updated from transifex
2015-01-25 01:54:38 -05:00
Lukas Reschke
b848062d88
Parse backslash as directory separator in breadcrumb
...
This will parse backslashes as directory separators in breadcrumbs. Thus when accessing something like `/index.php/apps/files?dir=foo\foo` the breadcrumb will properly resolve this instead of showing `foo\foo`
Fixes https://github.com/owncloud/core/issues/13643
2015-01-24 09:56:00 +01:00
Jenkins for ownCloud
b8e1dd9c87
[tx-robot] updated from transifex
2015-01-24 01:54:51 -05:00
Bjoern Schiessle
73a058e301
by default send mail for new server-to-server share
2015-01-23 21:59:07 +01:00
Vincent Petry
a1cc9eea56
Add trashbin storage wrapper unit test for versions
2015-01-23 18:39:21 +01:00
Vincent Petry
1f39a7aabe
Simplify trash storage unit tests
...
Needed to make it properly init the mount points
2015-01-23 18:08:59 +01:00
Vincent Petry
1a06edd712
Unregister trashbin storage wrapper at the end of tests
...
Some more tests that uses the storage wrapper now remove it afterwards
2015-01-23 15:36:09 +01:00
Robin Appelman
87a1b2bdc4
Preserve mtime when doing cross storage move
2015-01-23 15:11:27 +01:00
Vincent Petry
2e8c70327a
Remove storage wrapper for oc_trashbin in unit test
2015-01-23 14:55:38 +01:00
Robin Appelman
91f3952ac1
Only move files from the current user to the trashbin
2015-01-23 14:19:36 +01:00
Vincent Petry
67f1534e0f
Call final unlink in trash wrapper's storage
...
In the case of cross-storage delete, the files are copied to the trash,
then deleted. The final delete on the source storage would still reach
the trash wrapper.
This fix makes forwards that second call to the wrapped storage to make
the final delete work.
It fixes the issue with remote shares, local shares and external
storage.
Also, it uses a new function "renameRecursive" that renames the files
and preserves the mtimes (like "copy_recursive" did in the past))
2015-01-23 12:20:54 +01:00
Joas Schilling
7e6d2c73d2
Ignore favorites that are not available when creating the favorites list
...
Also correctly return the exception for all cases when adding/removing favos
2015-01-23 10:11:14 +01:00
Jenkins for ownCloud
bc93a8f140
[tx-robot] updated from transifex
2015-01-23 01:55:06 -05:00
Arthur Schiwon
9c7cd702c3
user fs must be setup up, so that the real user folder is mounted on the username based path
2015-01-22 19:16:28 +01:00
Thomas Müller
fc1865449d
adding console command to migrate encryption keys - refs #13450
2015-01-22 16:10:45 +01:00
Jenkins for ownCloud
5f3c6a97b2
[tx-robot] updated from transifex
2015-01-22 01:55:09 -05:00
Morris Jobke
c931eafc1f
Merge pull request #13517 from owncloud/keymanager-storage
...
Bypass the view when storing encryption keys
2015-01-22 00:41:48 +01:00
Morris Jobke
4dac664002
Merge pull request #13568 from owncloud/s2s_delete_shares_jenkins
...
[ignore] delete all server-to-server shares if a user gets deleted
2015-01-22 00:37:39 +01:00
Lukas Reschke
762949afd9
Make naming of encryption app consistent
...
Fixes https://github.com/owncloud/core/issues/13580
2015-01-21 23:29:09 +01:00
Bjoern Schiessle
7216983a08
delete all server-to-server shares if a user gets deleted
2015-01-21 17:11:34 +01:00
Thomas Müller
8ba42abbe4
Merge pull request #13432 from owncloud/animate_gifs_public_sharing
...
show animated gifs on public sharing page
2015-01-21 17:09:46 +01:00
Thomas Müller
9921308c62
Merge pull request #13540 from owncloud/s2s-fixpasswordfromdialog
...
External share dialog must properly read entered password
2015-01-21 16:51:56 +01:00
Vincent Petry
c48307027c
Fixed external cache test namespace
2015-01-21 15:52:56 +01:00
Vincent Petry
9fbdd1072e
Fix webdav mkdir for remote shares
2015-01-21 15:14:57 +01:00
Vincent Petry
f3d696599a
Add unit test for external share JS dialog
...
Moved external share JS code into a small plugin to make it testable.
Added unit test for the external share dialog logic + ajax calls.
2015-01-21 11:26:54 +01:00
Vincent Petry
23ea45760f
External share dialog must properly read entered password
2015-01-21 11:26:36 +01:00
Jenkins for ownCloud
b8ab21d3ad
[tx-robot] updated from transifex
2015-01-21 01:55:15 -05:00
Lukas Reschke
2ed2a7c7a8
Merge pull request #13520 from owncloud/fix-comparison-op
...
this must be larger then (>), since buggy behaviour occurs when the para...
2015-01-20 20:15:04 +01:00
Arthur Schiwon
9cb1ef5675
this must be larger then (>), since buggy behaviour occurs when the parameter is a small number
2015-01-20 17:50:53 +01:00
Robin Appelman
750cff0e3e
Bypass the view when storing encryption keys
2015-01-20 16:20:49 +01:00
Thomas Müller
87a754c72e
avoid $this->cache being null - fixes #13491
2015-01-20 12:38:54 +01:00
Lukas Reschke
3f5d4d82e4
Streamline auth and CSRF check in scan.php
...
Furthermore a not logged-in user was able to access this page before which resulted in a Fatal PHP error since the filesystem could not get setup properly.
2015-01-20 12:30:16 +01:00
Lukas Reschke
e25a0303f4
Streamline CSRF and login check
...
Let's make this consistent with other pieces of the code to make it easier to auditable.
2015-01-20 12:24:13 +01:00
Jenkins for ownCloud
2ac015256f
[tx-robot] updated from transifex
2015-01-20 01:54:37 -05:00
Morris Jobke
870bc429b2
Merge pull request #13416 from owncloud/reauthenticate-if-session-differs-from-basic-auth
...
Prioritise Basic Auth header over Cookie
2015-01-19 22:23:02 +01:00
Ross Nicoll
1c2cbf6fc6
Align checkbox configuration in external files
...
Modified CSS for files_external application to render labels around checkboxes at the same
width as other input elements, aligning them with other elements on the same page.
2015-01-19 17:01:25 +00:00
Georg Ehrke
374ddbff55
show animated gifs on public sharing page
2015-01-19 16:20:06 +01:00
Morris Jobke
2229290cca
fix typo of blog -> changed to block
...
* fixes #13460
2015-01-19 15:57:53 +01:00
Thomas Müller
1810ea2d33
Merge pull request #13461 from owncloud/remove-strip-slashes
...
Remove stripslashes() from newfolder.php
2015-01-19 14:47:34 +01:00
Lukas Reschke
003fc183a2
Remove stripslashes() from newfolder.php
2015-01-19 14:12:36 +01:00
Morris Jobke
cd4c7fd11f
Merge pull request #13377 from owncloud/trashbin_storage_wrapper
...
[trashbin] replace hook with storage wrapper
2015-01-19 13:17:52 +01:00
Thomas Müller
d75af7ddd2
Merge pull request #13362 from owncloud/fix-11442
...
LDAP Wizared: update user or group count only, when the multiselect is closed
2015-01-19 12:22:24 +01:00
Bjoern Schiessle
15ae6b47ed
replace hook with storage wrapper
2015-01-19 09:16:15 +01:00
Jenkins for ownCloud
3404bd8cdd
[tx-robot] updated from transifex
2015-01-19 01:54:31 -05:00
Morris Jobke
aff22b3225
Merge pull request #13276 from Sugaroverdose/fix_#11348
...
fix safari rename button positioning #11348
2015-01-18 21:42:06 +01:00
Lukas Reschke
48126c3f54
Merge pull request #13433 from owncloud/favoritesl10n
...
fix unlocalized favorites browser title and alttext
2015-01-18 20:36:19 +01:00
Thomas Müller
3d6f4ac24e
Merge pull request #13457 from owncloud/enc-skippartfiles
...
Skip stray part files during initial encryption
2015-01-19 14:40:21 +01:00
Vincent Petry
7a1ab3bb5e
Add class attribute types in encryption Util class
2015-01-19 13:01:52 +01:00
Vincent Petry
7c3c26ab94
Skip stray part files during initial encryption
2015-01-19 13:01:37 +01:00
Jenkins for ownCloud
31cd5185f1
[tx-robot] updated from transifex
2015-01-18 01:54:34 -05:00
Volkan Gezer
d253ef51a5
fix unlocalized favorites browser title and alttext
2015-01-17 16:52:36 +01:00
Lukas Reschke
dfbc405a45
Prioritise Basic Auth header over Cookie
...
There are a lot of clients that support multiple WebDAV accounts in the same application. However, they resent all the cookies they received from one of the accounts also to the other one. In the case of ownCloud this means that we will always show the user from the session and not the user that is specified in the basic authentication header.
This patch adds a workaround the following way:
1. If the user authenticates via the Sabre Auth Connector add a hint to the session that this was authorized via Basic Auth (this is to prevent logout CSRF)
2. If the request contains this hint and the username specified in the basic auth header differs from the one in the session relogin the user using basic auth
Fixes https://github.com/owncloud/core/issues/11400 and https://github.com/owncloud/core/issues/13245 and probably some other issues as well.
This requires proper testing also considering LDAP / Shibboleth and whatever instances.
2015-01-17 13:29:07 +01:00
Jenkins for ownCloud
60c4cb1dd6
[tx-robot] updated from transifex
2015-01-17 01:54:40 -05:00
Sugaroverdose
141908bd9c
Add ie8 text-overflow: ellipsis support
...
minimum browser window width ≈ 1280px
2015-01-17 01:43:42 +03:00
Sugaroverdose
b2879d3a99
use some magic to make 'popular browsers' work
...
as expected with inline-block span
2015-01-16 23:36:35 +03:00
Robin McCorkell
2b99fc76ec
Cleanup of PHPDoc return types
2015-01-16 20:30:43 +00:00
Morris Jobke
48ad4ba9a0
Fixes shifted rename field
2015-01-16 17:32:18 +01:00
Jan-Christoph Borchardt
b81c89d400
compress icons of LDAP and WebDAV-Auth
2015-01-16 14:43:27 +01:00
Jan-Christoph Borchardt
7624b395f2
add icon for Provisioning API
2015-01-16 14:43:14 +01:00
Morris Jobke
1c4668f808
Merge pull request #13399 from owncloud/trashbin-fixpreviewroute
...
Fix preview route for trashbin
2015-01-16 13:48:02 +01:00
Sergei Shuykov
4d2ae71bf2
fix_#11348 Safari rename button positioning
2015-01-16 14:43:34 +03:00
Jenkins for ownCloud
a65f666834
[tx-robot] updated from transifex
2015-01-16 01:55:51 -05:00
Vincent Petry
a76f0a0ba7
Fix preview route for trashbin
2015-01-15 18:45:24 +01:00
Vincent Petry
7f24e77cfc
Disallow ctrl click to select when selection not allowed
2015-01-15 18:16:27 +01:00
Vincent Petry
d40301492d
Auto-blur when clicking on file to download
2015-01-15 18:08:36 +01:00
Vincent Petry
7d81299014
Fixed thumbnal z-index for when no checkbox is there
...
In file lists with no selection checkbox, the CSS selector is different.
The thumbnail also needs position:absolute and a z-index to be displayed
above the row's grey highlight.
2015-01-15 17:53:23 +01:00
Arthur Schiwon
56ba07aa5c
coding style
2015-01-15 12:25:36 +01:00
Thomas Müller
2fbe8bbcba
Merge pull request #13370 from Sugaroverdose/fix_#13322
...
Force browser to redraw favorite icon on src change
2015-01-15 11:20:22 +01:00
Morris Jobke
9b7c1a0093
Merge pull request #13347 from owncloud/share-scanpermissionsfromsource
...
Use source storage permissions when scanning shared storage
2015-01-15 11:15:15 +01:00
Sugaroverdose
b2de3b3d8d
Force browser to redraw favorite icon
...
on src change
2015-01-15 12:26:55 +03:00
Jenkins for ownCloud
4c233fef2a
[tx-robot] updated from transifex
2015-01-15 01:54:41 -05:00
Robin McCorkell
9d0915013b
Merge pull request #13352 from owncloud/hhvm-array-key
...
HHVM: Do not use key() on array as the result depends on the internal array pointer.
2015-01-15 01:06:45 +00:00
Andreas Fischer
b4a52e889a
Do not use key() on array as the result depends on the internal array pointer.
2015-01-15 00:48:10 +01:00
Ross Nicoll
7620af7550
Updated Dropbox and Google UI Javascript to create input elements instead of anchor.
2015-01-14 17:21:39 +00:00
Ross Nicoll
02c6b72e25
Change from array() to [] style in files_external application info.
2015-01-14 17:16:12 +00:00
Morris Jobke
455ad005a0
Merge pull request #13350 from owncloud/autoload-translations
...
Autoload app's js translations
2015-01-14 18:12:05 +01:00
Vincent Petry
a9f0582e3e
Use source storage permissions when scanning shared storage
2015-01-14 18:11:23 +01:00
Ross Nicoll
64f4f8fc84
Add support for SFTP key authentication
...
Add support for external files accessed via SFTP using public key exchange authentication.
Keys are generated automatically when the configuration is added, or can be regenerated on demand if a key is compromised.
Creation of a new configuration row now triggers focus on that row. This is used to trigger auto-configuration for SFTP keys.
Generated public keys are saved in user's data directory for easy retrieval by an external application.
Add controller for SFTP key generation AJAX
SFTP class initialisation no longer produces a warning if the password field is missing.
Add unit tests for SFTP with key authentication backend
2015-01-14 17:00:34 +00:00
Arthur Schiwon
3d94aa8953
update user or group count only, when the multiselect is closed
2015-01-14 17:31:20 +01:00
Arthur Schiwon
672bc28715
allow to read again objectclasses and groups under certain conditions
2015-01-14 15:15:55 +01:00
Lukas Reschke
01304aa27e
Merge pull request #13351 from owncloud/check-for-existence
...
Check for existence of $_GET keys
2015-01-14 15:00:25 +01:00
Vincent Petry
87f81e5926
Remove unneeded addTranslations() calls
2015-01-14 14:36:23 +01:00
Lukas Reschke
96cd7c017a
Check for existence of $_GET keys
...
`$dir` may for example very well not get passed at well.
2015-01-14 14:16:18 +01:00
Thomas Müller
25806346c2
remove deprecated code - fixes #13119
2015-01-14 13:56:49 +01:00
Morris Jobke
3a6d2fcc10
Merge pull request #13345 from owncloud/increase-files-external-versions
...
Increase files_externals oC required version and its own version
2015-01-14 13:24:08 +01:00
Thomas Müller
9b7421972b
Merge pull request #13332 from oparoz/fix-download-button
...
Download the current public folder only
2015-01-14 12:24:06 +01:00
Joas Schilling
f031a479ad
Increase files_externals oC required version and its own version
2015-01-14 12:21:47 +01:00
Björn Schießle
9a487f0445
Merge pull request #13286 from owncloud/sharing_upgrade
...
update script for new server-to-server sharing
2015-01-14 11:57:30 +01:00
Lukas Reschke
64ee942e7d
Merge pull request #13288 from owncloud/enc_fix_public_download
...
[encryption] fix download of public shared files
2015-01-14 11:55:13 +01:00
Thomas Müller
e2a3547127
Merge pull request #13335 from owncloud/disable-rememberme-files-external
...
The files_external app might need the password so autologin must be disabled
2015-01-14 11:51:16 +01:00
Björn Schießle
5745b68fa9
Merge pull request #13311 from owncloud/fix_restore_keys
...
adapt decrypt all to the new folder structure
2015-01-14 11:40:22 +01:00
Olivier Paroz
356bfb36dc
Download the current public folder only
...
From within a shared/public directory, when drilling down folders, some
users want to be able to download what they're currently looking at, not
the whole shared folder. The whole archive is always a click away anyway
since a user can click on the home button.
2015-01-14 11:28:36 +01:00
Joas Schilling
caaae1094f
The files_external app might need the password so autologin must be disabled
2015-01-14 10:19:22 +01:00
Morris Jobke
65ee2b1de8
Merge pull request #13325 from owncloud/kill-strip-slashes
...
Get rid of `stripslashes()`
2015-01-14 08:27:42 +01:00
Jenkins for ownCloud
f367bbb49d
[tx-robot] updated from transifex
2015-01-14 01:55:16 -05:00
Arthur Schiwon
51d783ca6e
JS cleanup
2015-01-13 18:39:37 +01:00
Lukas Reschke
3ff3f641d6
Get rid of `stripslashes()`
...
This conversions are actually totally unneeded and probably left-overs from ages where the safe_mode was still a valid thing.
2015-01-13 17:43:36 +01:00
Bjoern Schiessle
d50e70ba3a
set accept to 1 (=true) for all server-to-server shares on update, at this point in time all shares are created by the first version of server-to-server sharing and are accepted if they were added to the table
2015-01-13 17:24:00 +01:00
Lukas Reschke
4766dac6f4
Fix PHP doc and enforce type
2015-01-13 14:47:54 +01:00
Bjoern Schiessle
83574053a3
if we download a public shared file we need to retrieve the user from the path
2015-01-13 14:22:54 +01:00
Joas Schilling
6d73aff9ad
Merge pull request #13277 from owncloud/pasteurl
...
add https:// placeholder for From Link feature. closes #13255
2015-01-13 12:51:58 +01:00
Bjoern Schiessle
89f17ef6fe
adapt decrypt all and restore/delete key backups to the new folder structure for encryption key introduced with OC8
2015-01-13 12:45:33 +01:00
Morris Jobke
c4aeb0b5b5
Merge pull request #13289 from owncloud/fav-keepfavoncancelrename
...
Properly update internal file info with updated tags
2015-01-13 08:28:30 +01:00
Jenkins for ownCloud
3ece0a7767
[tx-robot] updated from transifex
2015-01-13 01:56:58 -05:00
Thomas Müller
d20a1bbdbf
Merge pull request #13154 from owncloud/fix13141
...
don't show no files yet when mask is in place, fixes #13141
2015-01-12 22:48:25 +01:00
Volkan Gezer
18b5966f3a
add https:// placeholder for From Link feature. closes #13255
2015-01-12 20:11:45 +01:00
Joas Schilling
ec70246be2
Merge pull request #13272 from owncloud/fav-renamekeepfav
...
Fixes issues when renaming favorite file
2015-01-12 19:12:31 +01:00
Vincent Petry
8cc13031e9
Return path attribute for ajax rename operations
...
This fixes an issue when renaming files from a flat list view like
"Favorites" or "Shared with you", in which case the path needs to be
present in the response to make sure the data-path attribute is properly
set in the JS side.
2015-01-12 18:15:31 +01:00
Vincent Petry
dac7828480
Return tags after rename
...
To make it possible for the web UI to correctly display the tag/favorite
information after a rename, this information is now returned in the
rename response
2015-01-12 18:14:17 +01:00
Vincent Petry
ef1dd3ea0a
Properly update internal file info with updated tags
...
Whenever tags are updated, they need to be updated in the file list's
file info array as well.
This commit also adds unit tests and makes sure that whichever tags are
sent back by the server after update are used when updating
attributes/fileinfo.
2015-01-12 17:58:57 +01:00
Morris Jobke
d36a2c8b04
Merge pull request #13285 from owncloud/fix-encryption-check-number-of-parts
...
Check array size, before using the 3rd element from it
2015-01-12 17:58:36 +01:00
Morris Jobke
2a03568623
Merge pull request #13279 from owncloud/upload-original-name
...
Send the proper original name for uploaded files
2015-01-12 17:48:12 +01:00
Morris Jobke
af4d60adb0
Merge pull request #13280 from owncloud/fix-12306
...
fix retrieval of user groups
2015-01-12 17:42:37 +01:00
Joas Schilling
5c03e2207b
Check array size, before using the 3rd element from it
2015-01-12 17:05:51 +01:00
Morris Jobke
7a393abdbd
Merge pull request #13210 from owncloud/use-isset
...
Check for existence of $_GET keys
2015-01-12 16:35:31 +01:00
Arthur Schiwon
f28235a7ef
fix retrieval of user groups
2015-01-12 16:25:11 +01:00
Robin Appelman
6daedaf344
Send the proper original name for uploaded files
2015-01-12 15:30:47 +01:00
Lukas Reschke
5f7c115dfe
Merge pull request #13268 from owncloud/dnd-files-container
...
Allow dropping files on the table container
2015-01-12 13:27:53 +01:00
Vincent Petry
512ba327f7
Allow dropping files on the table container
...
Make it possible to drop files below the table even if the table is
smaller than the window height.
Added a check to make sure upload is not triggered on invisible lists.
2015-01-12 12:29:26 +01:00
Björn Schießle
331d73c3a3
Merge pull request #13182 from owncloud/download_versions
...
make versions of shared files downloadable
2015-01-12 12:03:21 +01:00
Thomas Müller
ddf81c2ed9
Merge pull request #13254 from owncloud/fixsharel10n
...
make Share/Download buttons localized again
2015-01-12 09:31:35 +01:00
Jenkins for ownCloud
9e550ab844
[tx-robot] updated from transifex
2015-01-12 01:55:52 -05:00
Volkan Gezer
d8adc76125
l10n: delete permanently fix
2015-01-11 17:15:58 +01:00
Volkan Gezer
691fab8be3
make Share button localized again
...
it seems we have forgotten to use named FileAction
2015-01-11 15:57:45 +01:00
Volkan Gezer
f1aa8377fe
Merge pull request #13251 from owncloud/spaceoutside
...
keep spaces out of translation
2015-01-11 15:29:21 +01:00
Volkan Gezer
8cd0962c6a
suggestion by transifex translator
2015-01-11 13:47:37 +01:00
Volkan Gezer
2df331b6ed
keep spaces out of translation
...
otherwise translators cannot notice it on Transifex
2015-01-11 13:43:43 +01:00
Jenkins for ownCloud
3425c73815
[tx-robot] updated from transifex
2015-01-11 01:54:32 -05:00
Volkan Gezer
33bb69e3e6
Merge pull request #13226 from owncloud/fix-encoding
...
Don't double encode string
2015-01-10 18:11:36 +01:00
Jenkins for ownCloud
22e5220c1f
[tx-robot] updated from transifex
2015-01-10 01:54:35 -05:00
Lukas Reschke
e4840b5250
Don't double encode string
...
We already use `.text()` here which automatically properly encodes the string. Thus the string will be double-encoded and look ugly. (i.e. when you search for ">" you will see "No results found for >")
Fixes itself.
2015-01-10 01:19:37 +01:00
Vincent Petry
59a1d16d0f
Merge pull request #13204 from owncloud/enc_fix_key_lost
...
Encryption fix key lost if group share gets renamed
2015-01-09 18:40:51 +01:00
Lukas Reschke
f65cf498f4
Check for existence of $_GET keys
...
Otherwise PHP errors are thrown in the error log.
2015-01-09 17:46:14 +01:00
Thomas Müller
b1031c6355
Merge pull request #13188 from owncloud/add-check-if-user-is-logged-in
...
Add check if user is logged-in
2015-01-09 16:45:53 +01:00
Bjoern Schiessle
0500d3a506
unit tests
2015-01-09 15:49:44 +01:00
Bjoern Schiessle
6cc40552b1
don't move encryption keys if a mount point was renamed
2015-01-09 15:39:36 +01:00
Jan-Christoph Borchardt
720fe858a3
fix rename field position, fix #12927
2015-01-09 13:05:22 +01:00
Bjoern Schiessle
d699d31518
make versions of shared files downloadable
2015-01-09 12:46:24 +01:00
Lukas Reschke
1cfcec8684
Add check if user is logged-in
...
Otherwise a fatal PHP error is thrown since the filesystem is not setup:
```
( ! ) Fatal error: Call to a member function getOwner() on null in /Users/lreschke/Programming/core/lib/private/files/filesystem.php on line 817
Call Stack
1 0.0004 247792 {main}( ) ../index.php:0
2 0.0946 5088776 OC::handleRequest( ) ../index.php:28
3 0.1423 7491280 OC\Route\Router->match( ) ../base.php:748
4 0.1664 8592152 call_user_func:{/Users/lreschke/Programming/core/lib/private/route/router.php:250} ( ) ../router.php:250
5 0.1664 8592216 __lambda_func( ) ../router.php:250
6 0.1665 8599064 require_once( '/Users/lreschke/Programming/core/apps/files_versions/ajax/getVersions.php' ) ../route.php(135) : runtime-created function:1
7 0.1801 9061096 OCA\Files_Versions\Storage::getUidAndFilename( ) ../getVersions.php:7
8 0.1801 9061144 OC\Files\Filesystem::getOwner( ) ../storage.php:45
```
Furthermore this adds the CSRF check as a nice-to-have addition, the requests accessing this are done via the jQuery AJAX methods and thus the header is automatically added to all requests already.
2015-01-09 11:55:18 +01:00
Jörn Friedrich Dreyer
45a20744fc
add js tests for filelist filtering
2015-01-09 10:49:22 +01:00
Lukas Reschke
a5099b01f9
Merge pull request #12984 from owncloud/ldap-user-cleanup-master
...
Ldap user cleanup master
2015-01-09 10:47:02 +01:00
Lukas Reschke
b4606ec24f
Merge pull request #13184 from owncloud/fix-key
...
Verify existence of $_GET key
2015-01-09 10:39:22 +01:00
Jenkins for ownCloud
d4fc2f555b
[tx-robot] updated from transifex
2015-01-09 01:55:22 -05:00
Lukas Reschke
199276bcbb
Verify existence of $_GET key
...
Otherwise when the file without any specified mimetype was accessed the error log was flooded with entries such as "Undefined index: mime", there can be multiple issues found about this in the forum and our bugtracker.
To test this access `/index.php/apps/files/ajax/mimeicon.php` with and without `$_GET['mime']`.
Fixes itself.
2015-01-09 02:31:59 +01:00
Arthur Schiwon
c1a79d24c5
fix order of initalizing instance properties, and paremeter order in a method call
2015-01-08 17:45:07 +01:00
Thomas Müller
6b0ae34de6
Merge pull request #13170 from owncloud/extstorage-fixsharedmountpointrootleadingslash
...
Fix source path when share is a mount point
2015-01-08 15:02:16 +01:00
Arthur Schiwon
c7f273040e
fix table name for getList
2015-01-08 14:21:40 +01:00
Lukas Reschke
bdfb039e05
Merge pull request #13165 from mypetyak/typos-in-external-storage-xml
...
Minor typo updates to External Storage description
2015-01-08 14:00:00 +01:00
Vincent Petry
01c83158bb
Fix source path when share is a mount point
...
Whenever an external storage mount point is shared directly, its path is
empty which causes a leading slash to appear in the source path.
This fix removes the bogus leading slash in such situation.
2015-01-08 11:46:11 +01:00
Jenkins for ownCloud
6bda95037f
[tx-robot] updated from transifex
2015-01-08 01:56:00 -05:00
Christopher Bunn
0f715708dc
Minor typo updates to External Storage description
...
This text is visible to admin users when they read the description of
the External Storage app.
2015-01-07 22:37:20 -06:00
Martin
edcba11a91
smb: rename textfield from root to subfolder
...
"root" or "subfolder" -> "Remote subfolder" on selected storages
missed ftp...
2015-01-07 20:54:05 +01:00
Morris Jobke
bfb6e350d5
Merge pull request #13016 from owncloud/sharing_fixes
...
don't delete share table entries for the unique name if re-share permission was removed
2015-01-07 18:14:53 +01:00
Bjoern Schiessle
b6f63e9b3d
don't delete share table entries for the unique name if re-share permission was removed
2015-01-07 16:36:13 +01:00
Jörn Friedrich Dreyer
0bb91cfcf3
don't show no files yet when mask is in place, fixes #13141
2015-01-07 15:59:39 +01:00
Joas Schilling
70dcebbf92
Correctly return false when translating a foreign activity
2015-01-07 15:02:25 +01:00
Arthur Schiwon
9668405ec7
doc fixes and removal of unnecessary use statements
2015-01-07 13:28:56 +01:00
Morris Jobke
5ce295907f
Merge pull request #12687 from owncloud/auto-escape-t-placeholders
...
Auto escape t placeholders
2015-01-07 12:57:33 +01:00
Morris Jobke
bfdf0db7c0
Autoescape of placeholders in t() and p() - for JS
...
* add disableEscape parameter to disable this functionality
* drop usage of escapeHTML() that is now done inside t()
* add unit test for escaped and not escaped placeholder
* proper JSDoc
2015-01-07 12:56:32 +01:00
Arthur Schiwon
6c335ee6fc
add test for mapping's getList method
2015-01-07 12:39:29 +01:00
Joas Schilling
fb37b3c687
Extend Test\TestCase and do not use uniqid()
2015-01-07 10:34:42 +01:00
Jenkins for ownCloud
2daf90dae6
[tx-robot] updated from transifex
2015-01-07 01:55:42 -05:00
Arthur Schiwon
b9235e2a24
inject DB Connection to user manager
2015-01-07 00:52:18 +01:00
Arthur Schiwon
64f0b055e6
inject IDateTimeFormatter to show-remnants command
2015-01-06 23:40:00 +01:00
Arthur Schiwon
40ecd30fba
inject oc config to User_LDAP
2015-01-06 23:28:49 +01:00
Lukas Reschke
7528a1a475
Merge pull request #13130 from owncloud/getstoragestats-error-handling
...
Add error handling to getstoragestats.php
2015-01-06 18:35:09 +01:00
Thomas Müller
47eb0c59e6
Merge pull request #13128 from owncloud/files-scan-path
...
Fix check if a path argument is passed to occ files:scan
2015-01-06 18:17:19 +01:00
Arthur Schiwon
e724b78694
smaller fixes: coding style, PHPdoc, typos and few for DI
2015-01-06 17:50:06 +01:00
Morris Jobke
fe4592937a
Merge pull request #12653 from owncloud/full_content_search_results
...
Full content width search results
2015-01-06 16:44:58 +01:00
Robin Appelman
64e3ebae74
Add error handling to getstoragestats.php
2015-01-06 15:56:06 +01:00
Robin Appelman
5f6da758b7
Fix check if a path argument is passed to occ files:scan
2015-01-06 15:27:03 +01:00
Jörn Friedrich Dreyer
357fbd88be
use class for no results div instead of id. the elements are not unique.
2015-01-06 14:34:35 +01:00
Jörn Friedrich Dreyer
926737fdb7
clear search when navigating via breadcrumbs
2015-01-06 13:55:51 +01:00
Jenkins for ownCloud
6a3f69c2d0
[tx-robot] updated from transifex
2015-01-06 01:54:59 -05:00
Jörn Friedrich Dreyer
7a812801db
correctly clear searchbox when switching filelists
2015-01-05 17:53:14 +01:00
Jörn Friedrich Dreyer
10038640ae
fix onScroll breaking search, fix keyboard navigation, fix filter for files in other dirs
2015-01-05 14:28:09 +01:00
Jörn Friedrich Dreyer
23900a5a39
filter trashbin and share views
2015-01-05 13:11:50 +01:00
Morris Jobke
28c8f5a0f9
Check for version before mounting a public link
...
* ownCloud 7.0.0 is needed - version of merge of server <-> server
sharing - https://github.com/owncloud/core/pull/8399
* adjust error message
2015-01-05 11:50:05 +01:00
Lukas Reschke
a0023974e3
Merge pull request #13099 from owncloud/fix-provisioning-api
...
Remove unnecessary setUp method from provisioning_api
2015-01-05 10:35:24 +01:00
Jenkins for ownCloud
8776271103
[tx-robot] updated from transifex
2015-01-05 01:54:36 -05:00
Tom Needham
f17f0ade7f
Remove unnecessary setUp method
2015-01-04 23:10:44 +00:00
Jenkins for ownCloud
84ed1034b4
[tx-robot] updated from transifex
2015-01-04 01:54:53 -05:00
Morris Jobke
fcae87170d
Merge pull request #13091 from owncloud/fix-provisioning-api
...
Fix remaining unit tests for provisioning_api
2015-01-03 22:41:44 +01:00
Tom Needham
a20de1548d
Add proper group setup and teardown to all provisioning_api tests
2015-01-03 15:58:36 +00:00
Tom Needham
5c0d7f2ee5
Create admin group before running provisioning_api tests
2015-01-03 15:39:42 +00:00
Tom Needham
97d31946c3
Ensure admin group is present before running tests
2015-01-03 13:25:48 +00:00
Morris Jobke
92f062baac
Merge pull request #13082 from mmattel/rename_text_no_external_storages
...
adopt text "no external storage configured"
2015-01-03 11:59:22 +01:00
Jenkins for ownCloud
05ffa3ab7a
[tx-robot] updated from transifex
2015-01-03 01:54:29 -05:00
root
c44d41178a
adopt text "no ecternal storage configured"
...
storage -> storages
2015-01-02 21:00:02 +01:00
Tom Needham
32d9563359
Change array element order to fix failing test
2015-01-02 19:07:31 +00:00
Tom Needham
a4f270a9ce
Add placeholder app.php for provisioning_api so app is detected
2015-01-02 18:52:11 +00:00
Jörn Friedrich Dreyer
ba235eb51d
delay hiding no results message until search is triggered
2015-01-02 16:13:15 +01:00
Jörn Friedrich Dreyer
6f820b0209
use " to avoid escaping '
2015-01-02 14:59:55 +01:00
Jörn Friedrich Dreyer
152c8b3969
text and icon fixes
2015-01-02 14:58:39 +01:00
Jörn Friedrich Dreyer
2eec8dc156
correctly update search results when query is changed, show spinner when searching
2015-01-02 14:22:48 +01:00
Jörn Friedrich Dreyer
0cca9e26c4
show no files found message
2015-01-02 12:50:21 +01:00
Jörn Friedrich Dreyer
9e3f4e043f
make OCA.Search.Files available in tests and for other apps
2015-01-02 10:57:25 +01:00
Jörn Friedrich Dreyer
6ba8881343
add file summary filter spec tests
2015-01-02 10:28:42 +01:00
Robin Appelman
f8700ec649
Fix rendering search results
2015-01-02 10:28:42 +01:00
Jörn Friedrich Dreyer
457f5abf6c
fix count
2015-01-02 10:28:42 +01:00
Jörn Friedrich Dreyer
4fdd626f0a
use correct visibilities
2015-01-02 10:28:42 +01:00
Jörn Friedrich Dreyer
b45d0f03fc
fix js tests
2015-01-02 10:28:42 +01:00
Jörn Friedrich Dreyer
8abd954d9a
instantiate file search
2015-01-02 10:28:42 +01:00
Jörn Friedrich Dreyer
66cf17b32b
don't use full class name to register plugin
2015-01-02 10:28:42 +01:00
Jörn Friedrich Dreyer
8bf048376c
allow getting the last query
2015-01-02 10:28:41 +01:00
Jörn Friedrich Dreyer
80ded08ec4
hide irrelevant stuff in empty filelist
2015-01-02 10:28:41 +01:00
Jörn Friedrich Dreyer
a6204efa0d
show audio icon & image previews
2015-01-02 10:28:41 +01:00
Jörn Friedrich Dreyer
b93f2ddcb5
hide header when no files in list match
2015-01-02 10:28:41 +01:00
Jörn Friedrich Dreyer
7e6c660b00
filter new rows
2015-01-02 10:28:41 +01:00
Jörn Friedrich Dreyer
606f802b7b
move search results below filelist, show hint when results are off screen, use js plugin mechanism
2015-01-02 10:28:41 +01:00
Jenkins for ownCloud
4b357274bb
[tx-robot] updated from transifex
2015-01-02 01:54:28 -05:00
Jenkins for ownCloud
ec6e70889a
[tx-robot] updated from transifex
2015-01-01 01:54:30 -05:00
Jenkins for ownCloud
573be9092d
[tx-robot] updated from transifex
2014-12-31 01:54:33 -05:00
Jenkins for ownCloud
c8e946f633
[tx-robot] updated from transifex
2014-12-29 01:54:27 -05:00
Thomas Müller
9f327457dc
Merge pull request #13023 from owncloud/provisioning_api-2
...
[jenkins] Add provisioning_api app
2014-12-28 14:29:49 +01:00
Thomas Müller
85e02460c8
Merge pull request #13025 from lyonel/master
...
user_ldap is too verbose by default
2014-12-27 21:39:23 +01:00
Thomas Müller
688a4022df
Merge pull request #13012 from owncloud/small_fix
...
only send activity if we have a valid path and the file is readable
2014-12-27 21:38:47 +01:00
Jenkins for ownCloud
d2e53d1022
[tx-robot] updated from transifex
2014-12-27 01:54:33 -05:00
Jenkins for ownCloud
0836ce9cd8
[tx-robot] updated from transifex
2014-12-26 01:54:28 -05:00
Jenkins for ownCloud
e0fc26a5cb
[tx-robot] updated from transifex
2014-12-25 01:54:29 -05:00
Tom Needham
dc85c20b18
Add provisioning_api app
...
enable unit tests for provisioning api
fix admin docu key
2014-12-24 22:15:20 +01:00
Lyonel Vincent
f94b300602
Be less verbose when using a paged search
...
Lower the priority from INFO to DEBUG
2014-12-24 16:35:36 +01:00
Lyonel Vincent
5a00b33a90
Be less verbose when disabling SSL cert validation
...
change log level from WARN to DEBUG
2014-12-24 16:32:27 +01:00
Jenkins for ownCloud
801b9e0494
[tx-robot] updated from transifex
2014-12-24 01:54:33 -05:00
Bjoern Schiessle
8c48be453e
only send activity if we have a valid path and the file is readable
2014-12-23 13:32:54 +01:00
Morris Jobke
5352b4b2b8
Merge pull request #10292 from owncloud/external-share-delete
...
Fix trashbin when deleting a file over an external share
2014-12-23 11:21:06 +01:00
Jenkins for ownCloud
d8f04f5a97
[tx-robot] updated from transifex
2014-12-23 01:55:23 -05:00
Björn Schießle
711220e82d
Merge pull request #12997 from owncloud/sharing_activities
...
add activity if public shared file/folder was downloaded
2014-12-22 23:31:07 +01:00
Robin Appelman
3afcc71764
Make sure the path passed to the activity manager is normalized
2014-12-22 18:50:00 +01:00
Bjoern Schiessle
393deb5961
add activity if public shared file/folder was downloaded
2014-12-22 18:50:00 +01:00
Thomas Müller
cf595ecc67
Merge pull request #12860 from owncloud/remove-apparently-unused-file
...
Remove unused file
2014-12-22 14:47:14 +01:00
Morris Jobke
eab4c029c2
Merge pull request #12961 from owncloud/try_to_cache_keys
...
cache keys to read them only once from the hard disc
2014-12-22 09:50:29 +01:00
Jenkins for ownCloud
92c8cd3933
[tx-robot] updated from transifex
2014-12-22 01:54:49 -05:00
Morris Jobke
510488ad3e
Merge pull request #12942 from owncloud/favs-missingsharedsubdirs
...
Fix issues with searchByTag in shared storage
2014-12-21 10:38:34 +01:00
Jenkins for ownCloud
312891c603
[tx-robot] updated from transifex
2014-12-21 01:54:36 -05:00
Arthur Schiwon
61ed363f82
planned refactorings for OC 8
2014-12-20 18:28:29 +01:00
Arthur Schiwon
3ca70d647a
move from \OC\Preferences to \OCP\IConfig
2014-12-20 16:33:37 +01:00
Arthur Schiwon
144d95de7d
basic adjustments for OC 8. I.e. no visible issues, LDAP tests pass.
2014-12-20 16:09:04 +01:00
Jenkins for ownCloud
5a54ca380d
[tx-robot] updated from transifex
2014-12-20 01:56:24 -05:00
Arthur Schiwon
4fa39250e7
LDAP User Cleanup: Port from stable7 without further adjustements
...
LDAP User Cleanup
background job for user clean up
adjust user backend for clean up
register background job
remove dead code
dependency injection
make Helper non-static for proper testing
check whether it is OK to run clean up job. Do not forget to pass arguments.
use correct method to get the config from server
methods can be private, proper indirect testing is given
no automatic user deletion
make limit readable for test purposes
make method less complex
add first tests
let preferences accept limit and offset for getUsersForValue
DI via constructor does not work for background jobs
after detecting, now we have retrieving deleted users and their details
we need this method to be public for now
finalize export method, add missing getter
clean up namespaces and get rid of unnecessary files
helper is not static anymore
cleanup according to scrutinizer
add cli tool to show deleted users
uses are necessary after recent namespace change
also remove user from mappings table on deletion
add occ command to delete users
fix use statement
improve output
big fixes / improvements
PHP doc
return true in userExists early for cleaning up deleted users
bump version
control state and interval with one config.php setting, now ldapUserCleanupInterval. 0 will disable it. enabled by default.
improve doc
rename cli method to be consistent with others
introduce ldapUserCleanupInterval in sample config
don't show last login as unix epoche start when no login happend
less log output
consistent namespace for OfflineUser
rename GarbageCollector to DeletedUsersIndex and move it to user subdir
fix unit tests
add tests for deleteUser
more test adjustements
Conflicts:
apps/user_ldap/ajax/clearMappings.php
apps/user_ldap/appinfo/app.php
apps/user_ldap/lib/access.php
apps/user_ldap/lib/helper.php
apps/user_ldap/tests/helper.php
core/register_command.php
lib/private/preferences.php
lib/private/user.php
add ldap:check-user to check user existance on the fly
Conflicts:
apps/user_ldap/lib/helper.php
forgotten file
PHPdoc fixes, no code change
and don't forget to adjust tests
2014-12-19 19:47:54 +01:00
Björn Schießle
8164415b45
Merge pull request #12749 from owncloud/server2server-sharing-ng
...
server to server sharing next generation
2014-12-19 19:04:44 +01:00
blizzz
ad6814f920
Merge pull request #12101 from owncloud/ldap_split_mapping
...
Ldap split mapping from Access superclass
2014-12-19 18:52:30 +01:00
Arthur Schiwon
ec0f80fee9
Split mapping from Access and Helper classes into it's own. Fully test them, too.
...
remove unused methods
split mapping methods off from Access class
fix DB query handling
move 'clear mapping' methods from static helper to new mapping class
add tests
test directly with DB
finishing tests and fix return value from setDNbyUUID
add corresponding class for groups and make abstract test class neutral. helper tests is now obsolete as the tested functions were moved to the new mapper class.
add missing info to PHPDoc
add unmap method
fix namespaces
fix test inheritance
PHPDoc and a small code restructure for scrutinizer, no effective changes
PostgreSQL does not accept LIMIT in DELETE queries
phpdoc fixes, no code changes
2014-12-19 18:26:12 +01:00
Bjoern Schiessle
aea991c22e
cache keys to read them only once from the hard disc
2014-12-19 16:04:13 +01:00
Bjoern Schiessle
24993280ed
Next step in server-to-server sharing next generation, see #12285
...
Beside some small improvements and bug fixes this will probably the final state for OC8.
To test this you need to set up two ownCloud instances. Let's say:
URL: myPC/firstOwnCloud user: user1
URL: myPC/secondOwnCloud user: user2
Now user1 can share a file with user2 by entering the username and the URL to the second ownCloud to the share-drop-down, in this case "user2@myPC/secondOwnCloud".
The next time user2 login he will get a notification that he received a server-to-server share with the option to accept/decline it. If he accept it the share will be mounted. In both cases a event will be send back to user1 and add a notification to the activity stream that the share was accepted/declined.
If user1 decides to unshare the file again from user2 the share will automatically be removed from the second ownCloud server and user2 will see a notification in his activity stream that user1@myPC/firstOwnCloud has unshared the file/folder from him.
2014-12-19 15:20:24 +01:00
Thomas Müller
2d64797320
Merge pull request #12956 from owncloud/jenkins-user-backend-names
...
[jenkins only] introduce names for user backends - IUserBackend
2014-12-19 13:15:50 +01:00
Morris Jobke
678642a6a2
Merge pull request #12935 from owncloud/public-tagsmanagerissue
...
Only populate tags in main file list
2014-12-19 12:48:20 +01:00
Morris Jobke
6da33e1ea7
introduce names for user backends - IUserBackend
...
* LDAP with multiple servers also proved backendName
2014-12-19 10:17:17 +01:00
Thomas Müller
b32dc3f2a4
Merge pull request #12906 from owncloud/keyboardnav-feedback
...
Accessibility: Keyboard navigation feedback
2014-12-19 09:54:28 +01:00
Morris Jobke
39d6ddd38a
Merge pull request #12865 from owncloud/files-tags-webdav
...
Returns tags through WebDAV
2014-12-19 09:33:28 +01:00
Jenkins for ownCloud
028b0efd5c
[tx-robot] updated from transifex
2014-12-19 01:56:51 -05:00
Jan-Christoph Borchardt
7b2ae46762
first part of fixing feedback for file list when using keyboard
2014-12-19 00:34:06 +01:00
Morris Jobke
3036a8714d
Merge pull request #12941 from owncloud/wave-accessibility-compliance
...
Wave accessibility compliance
2014-12-19 00:30:56 +01:00
Morris Jobke
75e8b39826
Merge pull request #12879 from owncloud/mountconfig
...
Add mount specific options
2014-12-18 23:38:14 +01:00
Jörn Friedrich Dreyer
891474b0d6
Merge pull request #12759 from owncloud/core-reduce-js-and-css
...
make sure styles and scripts are only loaded once
2014-12-18 23:18:37 +01:00
Jörn Friedrich Dreyer
49318b4d93
Merge pull request #12896 from owncloud/drop-deprecated
...
first step to drop \OCP\Config:: in favour of IConfig
2014-12-18 23:01:49 +01:00
Morris Jobke
7798ea0cd7
show spinner on file upload in IE8, 9
2014-12-18 22:24:07 +01:00
Vincent Petry
11b3aa2dbe
Fix issues with searchByTag in shared storage
2014-12-18 17:27:56 +01:00
Jan-Christoph Borchardt
cd81687a38
properly escape variable
2014-12-18 17:19:23 +01:00
Jan-Christoph Borchardt
96ae18db59
get rid of unnecessary alt and title attributes
2014-12-18 17:05:27 +01:00
Jan-Christoph Borchardt
7faf3d17e5
fix accessibility for deleted files
2014-12-18 16:54:39 +01:00
Robin Appelman
1ef01de402
Merge pull request #12907 from owncloud/delete-invalid-external-share
...
Fix deleting invalid s2s shares
2014-12-18 16:38:13 +01:00
Jan-Christoph Borchardt
9009f5f727
add empty alt text to decorative preview of public share image
2014-12-18 16:00:55 +01:00
Jan-Christoph Borchardt
137d19f6b1
fix accessibility for 'New' file inputs
2014-12-18 15:52:42 +01:00
Vincent Petry
4b1b93507d
Only populate tags in main file list
...
Moved populateTags to be done on the main file list.
This prevents the public file list to go through the same code and cause
an error when there is no user.
2014-12-18 15:36:18 +01:00
Jan-Christoph Borchardt
0e78415cb1
fix accessibility of file upload
2014-12-18 14:12:34 +01:00
Vincent Petry
10a0fc2856
Merge pull request #12925 from owncloud/fix-js-unit-tests
...
be more explicit in JS unit tests - caused by accessibility issues
2014-12-18 12:10:11 +01:00
Jan-Christoph Borchardt
ea548cdaaa
fix accessibility of logos
2014-12-18 10:51:41 +01:00
Jenkins for ownCloud
5c6e08213e
[tx-robot] updated from transifex
2014-12-18 01:56:40 -05:00
Morris Jobke
ec0401f97b
be more explicit in JS unit tests - caused by accessibility issues
2014-12-18 01:27:58 +01:00
Thomas Müller
82f8726903
Merge pull request #12900 from owncloud/more-accessibility
...
More accessibility fixes for Files
2014-12-18 01:21:01 +01:00
Thomas Müller
a581dcaadb
Merge pull request #12924 from owncloud/improve-emptystates
...
Improve empty states
2014-12-18 01:10:13 +01:00
Jan-Christoph Borchardt
0bda42b8e3
add empty state for external storages
2014-12-17 21:57:31 +01:00
Morris Jobke
7c1b9aedd5
Setup a docker container that holds a webdav instance to test files_external
...
document docker parameter and use random host port
fix typo
copy autotest.sh to autotest-external.sh
adds ability to add start* and stop* scripts in env in external tests
run files_external WebDAV tests against ownCloud instance
introduce executor number to be able to shut down the correct docker container
fetch docker images in advance - this also fetches latest versions of the docker images
add second argument to autotest-external.sh which can specify a single test to run
print out the explicit test run
change naming schema of files_external setup scripts
2014-12-17 21:50:35 +01:00
Jan-Christoph Borchardt
59dec3834f
wording fix for Files app empty state
2014-12-17 21:45:51 +01:00
Jan-Christoph Borchardt
38931176df
apply empty state for 'Deleted files'
2014-12-17 21:45:34 +01:00
Jan-Christoph Borchardt
ab2ae91b11
improve empty state of 'All files'
2014-12-17 21:27:14 +01:00
Jan-Christoph Borchardt
16c62a346c
improve empty states for sharing and shared links as well
2014-12-17 21:22:28 +01:00
Jan-Christoph Borchardt
e3192bfa26
use empty state for 'Shared with you' as well
2014-12-17 21:13:53 +01:00
Jan-Christoph Borchardt
2be66044cc
even better empty state for Favorites, and general Empty State style
2014-12-17 20:59:26 +01:00
Robin McCorkell
c20be24559
Merge pull request #12793 from owncloud/mountconfig-store-id
...
Add the storage id to the mount config
2014-12-17 17:53:11 +00:00
Morris Jobke
a641bb7592
Merge pull request #12902 from owncloud/fix-filelist-thumbnails
...
Propertly restore thumbnail on cancel/rename/move
2014-12-17 17:13:21 +01:00
Vincent Petry
0b3f0716fc
Returns and update tags through WebDAV PROPFIND and PROPPATCH
...
Added oc:tags and oc:favorites in PROPFIND response.
It is possible to update them with PROPPATCH.
These properties are optional which means they need to be requested
explicitly
2014-12-17 16:50:35 +01:00
Robin Appelman
e656af4c83
Root always exists
2014-12-17 16:09:41 +01:00
jknockaert
e426375114
update enc stream
2014-12-17 15:48:05 +01:00
Robin Appelman
d075b1d743
Add the storage id to the mount config
2014-12-17 14:22:03 +01:00
Jan-Christoph Borchardt
6f4ed59883
use method to only visually hide elements, show only for screen reader
2014-12-17 14:12:13 +01:00
Robin Appelman
fd85424742
Add getMountPoint to FileInfo
2014-12-17 14:03:50 +01:00
Robin Appelman
95a145f67f
Load mount specific options from the mount config
2014-12-17 14:03:50 +01:00
Jan-Christoph Borchardt
532ba99f1c
Merge pull request #12895 from owncloud/favorites-polish
...
polish the Favorites design
2014-12-17 13:42:20 +01:00
Jan-Christoph Borchardt
e2977ff4c1
fix favorite star flickering on empty state page
2014-12-17 13:40:57 +01:00
Vincent Petry
ab35459cac
Propertly restore thumbnail on cancel/rename/move
...
Since the thumbnail is now in a div, the code that tries to change the
thumbnail have been adapted here as well.
2014-12-17 13:12:57 +01:00
Jan-Christoph Borchardt
1b5f43e7c3
add text to Settings button
2014-12-17 12:20:38 +01:00
Jan-Christoph Borchardt
9f9aa44b57
add alt text to 'Cancel upload' button
2014-12-17 12:05:45 +01:00
Jan-Christoph Borchardt
4344b3d3cf
fix Delete action text being translatable
2014-12-17 11:55:35 +01:00
Jan-Christoph Borchardt
edc8967c93
add text to Delete action
2014-12-17 11:50:58 +01:00
Jan-Christoph Borchardt
e5875fda38
properly name form labels for the file selection
2014-12-17 11:40:21 +01:00
Jan-Christoph Borchardt
bac2683c55
fix alt text for breadcrumbs home icon
2014-12-17 11:26:42 +01:00
Morris Jobke
d41082f4d6
first step to drop \OCP\Config:: in favour of IConfig
2014-12-17 11:12:37 +01:00
Jan-Christoph Borchardt
c7cf0d0386
fix file list summary left alignment
2014-12-17 11:08:39 +01:00
Jan-Christoph Borchardt
433d1de923
fix empty state for Favorites
2014-12-17 11:04:22 +01:00
Jan-Christoph Borchardt
f2d7fad0fb
put Favorites second in list, after 'All files'
2014-12-17 11:00:16 +01:00
Jenkins for ownCloud
6d80524e67
[tx-robot] updated from transifex
2014-12-17 01:56:41 -05:00
Thomas Müller
775f6a1354
make sure styles and scripts are only loaded once
2014-12-16 18:26:43 +01:00
Jenkins for ownCloud
5b9c453071
[tx-robot] updated from transifex
2014-12-16 01:55:32 -05:00
Lukas Reschke
be3d4fd303
Merge pull request #12360 from owncloud/files-tags
...
Add favorites to files app
2014-12-15 19:55:18 +01:00
Lukas Reschke
a0a3322b94
Remove unused file
...
That file is apparently unused - introduced with 30b58f5677
I guess we can remove it...
2014-12-15 17:29:16 +01:00
Vincent Petry
207d77e5cd
Fixed small code style issues
2014-12-15 17:20:41 +01:00
Jörn Friedrich Dreyer
6602d3ac77
Merge pull request #12555 from owncloud/app_specific_search
...
introduce inApps[] filter for search via ajax query
2014-12-15 16:14:40 +01:00
Vincent Petry
976baed5f9
Remove spinner when toggling file favorite
2014-12-15 15:50:57 +01:00
Vincent Petry
33eb4483b2
Fixed has-favorites CSS
2014-12-15 15:18:29 +01:00
Jan-Christoph Borchardt
fb220a1e09
shift actions to the left a bit to account for right shift due to favorites action, not not overlap with size info
2014-12-15 15:12:37 +01:00
Jan-Christoph Borchardt
4dbe8c6771
add CSS to shift header to account for when favorites are present
2014-12-15 15:11:51 +01:00
Vincent Petry
1d22cd5b22
Use star icon for favorites
2014-12-15 12:44:41 +01:00
Vincent Petry
dfe922b72a
Correctly replace favorites icon when re-rendering file actions
2014-12-15 12:10:54 +01:00
Vincent Petry
a5bb66f4a7
Added favorites feature to the files app
2014-12-15 12:10:54 +01:00
Morris Jobke
b831914aa6
Merge pull request #11991 from owncloud/bower-jquery-ui
...
bower jquery-ui - exported changes to a separate css file
2014-12-15 11:39:31 +01:00
Jenkins for ownCloud
036456fe16
[tx-robot] updated from transifex
2014-12-15 01:54:30 -05:00
Jenkins for ownCloud
6ae0217326
[tx-robot] updated from transifex
2014-12-14 01:54:56 -05:00
Morris Jobke
5b3971f002
Merge pull request #12639 from owncloud/bad_mtime_format
...
Fix formatting of bad dates from external storages
2014-12-13 10:07:10 +01:00
Morris Jobke
edcd2f2706
bower jquery-ui - exported changes to a separate css file
2014-12-13 09:47:34 +01:00
Morris Jobke
29e1c3a898
Merge pull request #12795 from owncloud/files-layoutchanges
...
Move file thumbnail element into the label tag
2014-12-13 09:00:43 +01:00
Jenkins for ownCloud
416e21d902
[tx-robot] updated from transifex
2014-12-13 01:55:24 -05:00
Robin McCorkell
fdbb68a3c3
Return ? if mtime is 0 or -1
...
Tooltip contains 'Unable to determine date'. Fixes #6395
2014-12-12 23:54:18 +00:00
Vincent Petry
4b57892c4e
Merge pull request #12778 from owncloud/searchbytags2
...
Added searchByTags to view, storage and cache
2014-12-12 14:27:19 +01:00
Thomas Müller
6b4502adeb
Merge pull request #12812 from owncloud/remove-53-workaround
...
Remove conditional check for 5.3 compatibility
2014-12-12 13:16:49 +01:00
Joas Schilling
4f92e4a233
Merge pull request #12808 from owncloud/add-special-parameterlist-to-manager
...
Add special parameterlist to manager
2014-12-12 13:03:26 +01:00
Vincent Petry
ffd5e93f70
Merge pull request #12789 from owncloud/external-icon
...
fix and compress files_external icon
2014-12-12 12:46:57 +01:00
Lukas Reschke
5eaa2214b8
Remove conditional check for 5.3 compatibility
2014-12-12 12:25:59 +01:00
Robin Appelman
3bf0922b13
Merge pull request #12527 from owncloud/js-pluginsystem
...
Simple Plugin system for Javascript
2014-12-12 11:43:31 +01:00
Joas Schilling
46def69574
Specify list of activity parameters for sharing extension
2014-12-12 11:41:01 +01:00
Vincent Petry
15ecb28d50
Make $userId mandatory for searchByTags
...
$userId is now a mandatory parameter for searchByTags.
Also fixed some places in the code where the argument was missing (Node
API and View)
2014-12-12 11:18:35 +01:00
Gadzy
ba3957fb8a
Check for share by link enabled
...
Display "Shared by link" section only if sharing by link is enabled.
2014-12-12 10:23:51 +01:00
Morris Jobke
e969fe6b12
Merge pull request #12698 from owncloud/handle_readonly_shared_files
...
Handle readonly shared files
2014-12-12 08:34:28 +01:00
Jenkins for ownCloud
68932b30fd
[tx-robot] updated from transifex
2014-12-12 01:55:24 -05:00
Vincent Petry
a89aad05c0
Replace input checkbox CSS selector with .electCheckBox
2014-12-11 18:23:30 +01:00
Vincent Petry
81e9d43e23
Move file thumbnail into the label element
2014-12-11 18:21:25 +01:00
Vincent Petry
25dde7e93b
Added searchByTags to view, storage and cache
2014-12-11 17:38:50 +01:00
Jörn Friedrich Dreyer
c615b3527f
show readonly message in file conflict dialog, make it always selected
2014-12-11 16:32:27 +01:00
Jan-Christoph Borchardt
c588ccf96a
fix and compress files_external icon
2014-12-11 15:33:31 +01:00
Jenkins for ownCloud
dc506dcfbf
[tx-robot] updated from transifex
2014-12-11 01:55:27 -05:00
Thomas Müller
80ae311329
Merge pull request #11892 from owncloud/remove_triggerupdate
...
Remove triggerupdate.php & add quiet option for CLI scanner
2014-12-10 16:17:29 +01:00
Jörn Friedrich Dreyer
1d490b559c
introduce inApps[] filter for search via ajax query, make file results show up in files app only
...
use more flexible return type
check array with !empty instead of count
2014-12-10 15:51:59 +01:00
Jörn Friedrich Dreyer
0f17486c1d
make path absolute
2014-12-10 11:04:17 +01:00
Morris Jobke
e3de51078d
Merge pull request #12090 from AdamWill/google-rename-delete
...
google: delete original after successful rename
2014-12-10 09:10:17 +01:00
Morris Jobke
3026cdbc80
Merge pull request #12549 from owncloud/shared-cache-non-existing
...
Dont return cached date in shared cache when the file doesn't exist
2014-12-10 08:49:40 +01:00
Jenkins for ownCloud
ea95bb0189
[tx-robot] updated from transifex
2014-12-10 01:55:34 -05:00
Morris Jobke
bfcd5a3802
Merge pull request #11214 from owncloud/issue/10836
...
Add an option to disallow sending sharing emails to non-owncloud users
2014-12-09 14:05:52 +01:00
Joas Schilling
26861a98c5
Merge pull request #12568 from owncloud/autoload-encryption-classes
...
Fix namespaces of encryption classes and encryption tests
2014-12-09 12:56:57 +01:00
Joas Schilling
539c0aeb04
Add an option to disallow sending sharing emails to non-owncloud users
...
Fix #10836
2014-12-09 11:32:39 +01:00
Thomas Müller
9ca8b864e2
Merge pull request #12708 from owncloud/l10nsaved
...
translated saved message in files external
2014-12-09 10:46:35 +01:00
Lukas Reschke
17f85ec5a9
Merge pull request #12688 from owncloud/rename-alt
...
introduce alt text for rename icon - fixes #12067
2014-12-09 10:37:33 +01:00
Lukas Reschke
3566edbcec
Merge pull request #12715 from owncloud/fix-broken-personal-page
...
remove duplicate loaded personal.js - fixes #12674
2014-12-09 10:35:08 +01:00
Morris Jobke
4d2573bff7
Merge pull request #12709 from owncloud/fix-11955
...
Skip headers that can not be split
2014-12-09 09:52:59 +01:00
Joas Schilling
b85e34c1da
Correctly namespace encryption tests
2014-12-09 09:47:27 +01:00
Joas Schilling
e67fe0336b
Use self:: instead of the class name in encryption tests
2014-12-09 09:47:27 +01:00
Joas Schilling
efac8ced90
Update OCA\Encryption to OCA\Files_Encryption in the encryption app itself
2014-12-09 09:47:26 +01:00
Joas Schilling
78a307995c
Fix namespace of Files_Encryption outside of the app
2014-12-09 09:47:26 +01:00
Joas Schilling
7f7006643f
Fix namespace of files_encryption classes and autoload them
2014-12-09 09:47:26 +01:00
Thomas Müller
c36bac3abd
Merge pull request #12406 from owncloud/drop-getApps-getUsers
...
Config cleanup - OC_Preferences refactoring
2014-12-09 09:36:38 +01:00
Morris Jobke
b9fab7441c
remove duplicate loaded personal.js - fixes #12674
2014-12-09 09:27:10 +01:00
Jenkins for ownCloud
8f8f9deb66
[tx-robot] updated from transifex
2014-12-09 01:56:38 -05:00
Lukas Reschke
25a87d4058
Merge pull request #12577 from owncloud/public-mount-api
...
Add a public api for apps to add mounts
2014-12-08 22:57:33 +01:00
Morris Jobke
0d4f0ab871
reduce OC_Preferences, OC_Config and \OCP\Config usage
...
* files_encryption
* files_versions
* files_trashbin
* tests
* status.php
* core
* server container
2014-12-08 22:42:37 +01:00
Victor Dubiniuk
adc7135429
Skip headers that can not be split
2014-12-08 23:43:43 +03:00
Volkan Gezer
26645c072a
translated saved message in files external
2014-12-08 21:40:15 +01:00
Lukas Reschke
de3ead5ab9
Merge pull request #12704 from owncloud/fix-12647-2
...
preserve an asterisk at the start when escaping a search term
2014-12-08 19:14:59 +01:00
Arthur Schiwon
0577bb569a
add doc
2014-12-08 17:22:52 +01:00
Arthur Schiwon
45443ee28c
preserve an asterisk at the start when escaping a search term
2014-12-08 17:19:57 +01:00
Robin Appelman
baf5c44bec
Merge pull request #12696 from owncloud/trashbin-selected-delete
...
Fix deleting selected files in the trashbin
2014-12-08 16:30:53 +01:00
Morris Jobke
1bfa405a93
introduce alt text for rename icon - fixes #12067
2014-12-08 15:49:09 +01:00
Robin Appelman
b2d4e53f66
Fix deleting selected files in the trashbin
2014-12-08 15:16:15 +01:00
Morris Jobke
1362c0b67a
Merge pull request #12452 from owncloud/server2server-ng-ocs
...
OCS API for server-to-server sharing
2014-12-08 14:12:03 +01:00
Lukas Reschke
d3188159d2
Merge pull request #12394 from owncloud/files-fileactionsimprovements
...
Improve FileActions JS to allow for custom rendering
2014-12-08 11:30:21 +01:00
Jenkins for ownCloud
2784d580bd
[tx-robot] updated from transifex
2014-12-08 01:54:57 -05:00
Thomas Müller
d571f42860
Merge pull request #12668 from owncloud/keepspace
...
Keep spaces out of the string
2014-12-07 13:15:37 +01:00
Jenkins for ownCloud
8ee9ee29ea
[tx-robot] updated from transifex
2014-12-07 01:54:32 -05:00
Volkan Gezer
57452a3641
Keep spaces out of the string
...
Otherwise translators cannot notice them on Transifex.
2014-12-07 01:57:34 +01:00
Jenkins for ownCloud
94eb2e782f
[tx-robot] updated from transifex
2014-12-06 01:54:56 -05:00
Lukas Reschke
1be5a3ca89
Merge pull request #12166 from helmutschneider/aws-2.7.5
...
Upgrade AWS sdk to 2.7.5. Fixes #12023
2014-12-05 20:12:53 +01:00
Lukas Reschke
116a1b366a
Merge pull request #11485 from brumsoel/master
...
Fix timestamp comparator return value
2014-12-05 19:53:09 +01:00
Vincent Petry
89db2a0277
Merge pull request #12523 from owncloud/port-11747
...
Only store user credentials when SMB_OC storage is enabled
2014-12-05 18:04:06 +01:00
Jenkins for ownCloud
4d53f163fd
[tx-robot] updated from transifex
2014-12-05 01:55:52 -05:00
Arthur Schiwon
1c369093e5
cache total user count
...
Conflicts:
apps/user_ldap/user_ldap.php
2014-12-04 19:09:13 +01:00
Arthur Schiwon
ee168a121d
Forward port of #12493
...
add ldap-search command to occ
Conflicts:
apps/user_ldap/appinfo/register_command.php
LDAP search filter creation changes:
1. do not prepend * wildcard to search terms. Will result in faster search, but
you don't find "foobar" when looking for "bar"
2. advanced behaviour when search string contains a space and multiple search
attributes are present. The search string is split into single words. The
resulting filter requires that each word at least appears once in any search
attribute. This is supposed to return better results in big LDAPs.
trim search string before passing it on
2014-12-04 19:02:09 +01:00
Vincent Petry
bf887eca8b
Remove obsoleted filelist prototype backup in tests
2014-12-04 18:39:20 +01:00
Robin Appelman
a369d78124
Use the mount config api for files_external
2014-12-04 16:47:30 +01:00
Robin Appelman
f4701d7721
Add public api for mount configurations
2014-12-04 16:47:27 +01:00
Morris Jobke
a0488453ac
Merge pull request #12596 from owncloud/remove-travis-traces
...
Remove last traces of travis integration
2014-12-04 16:04:15 +01:00
Jörn Friedrich Dreyer
3cdaa4094f
add quiet option, ref #8794
2014-12-04 13:44:30 +01:00
Jörn Friedrich Dreyer
7ef6df04da
remove triggerupdate, ref #11872
2014-12-04 13:44:30 +01:00
Bjoern Schiessle
698ecbf308
OCS API for server-to-server sharing
2014-12-04 13:18:13 +01:00
Bjoern Schiessle
1509dd1358
update error message
2014-12-04 12:01:11 +01:00
Bjoern Schiessle
0dd44eaf27
OC8 and later requires PHP >= 5.4, so we can remove the check from the encryption app
2014-12-04 11:17:44 +01:00
Morris Jobke
2c5e4b3d3f
Remove last traces of travis integration
2014-12-04 10:09:13 +01:00
Jenkins for ownCloud
5aad902507
[tx-robot] updated from transifex
2014-12-04 01:54:42 -05:00
brumsel
0dcfd5f20b
Modified filesort test cases to test for large sizes & timestamps
2014-12-03 23:45:57 +01:00
brumsel
4ba520e214
Merge remote-tracking branch 'upstream/master'
2014-12-03 23:04:49 +01:00
Bjoern Schiessle
0a173e2b58
fix typo
2014-12-03 19:46:32 +01:00
Morris Jobke
3fdb1937a3
Merge pull request #12382 from owncloud/enc_reorganize_folders2
...
[encryption] reorganize folder structure (second try to make Jenkins happy)
2014-12-03 16:08:40 +01:00
Thomas Müller
6daa588e1c
Merge pull request #12556 from owncloud/add-route-for-versions
...
Add route for download of versions
2014-12-03 14:01:58 +01:00
Lukas Reschke
8c8c257ce3
Merge pull request #12554 from owncloud/versions-app-autoload
...
Autoload lib files of versions app
2014-12-03 09:34:57 +01:00
Jenkins for ownCloud
af50df8912
[tx-robot] updated from transifex
2014-12-03 01:54:32 -05:00
Lukas Reschke
c4e0c02526
Add route for download of versions
...
Otherwise on master it was not possible anymore to download older versions.
Fixes itself.
2014-12-02 17:52:31 +01:00
Morris Jobke
f9958153ef
Merge pull request #12333 from owncloud/delete-selected-files
...
Fix deleting non deletable files by selecting them
2014-12-02 17:32:04 +01:00
Joas Schilling
1bd018a70c
Autoload exception from files_trashbin
2014-12-02 17:26:42 +01:00
Joas Schilling
694003d147
Autoload lib files of versions app
2014-12-02 17:21:19 +01:00