b9cd5bc1dc
Prevent wrong matches in getRelativePath
...
Before this fix, the root "/files" with path "/files_trashbin" would
return "_trashbin" as relative path...
2015-09-22 11:34:37 +02:00
67231ed9a7
Merge pull request #19231 from phil-davis/r1
...
Minor text typos
2015-09-21 23:35:30 +02:00
5226ec1d4a
Merge pull request #19229 from owncloud/webdavauth-in-user-external
...
Move WebDAVAuth to User_External
2015-09-21 23:27:11 +02:00
a165710e99
Minor text typos
...
that I noticed while looking at some code.
2015-09-21 23:04:25 +05:45
b1f05ef1f3
Move WebDAVAuth to User_External
2015-09-21 17:59:48 +02:00
283216e9a0
Merge pull request #19223 from owncloud/improve_description_decrypt_encrypt_all
...
Improve description of the encrypt-all and decrypt-all command line tool
2015-09-21 17:34:47 +02:00
daf5d1ff2e
fix small typo
2015-09-21 16:48:15 +02:00
03e05d5dbc
improve description and help output for the encrypt-all and decrypt-all command
2015-09-21 16:48:14 +02:00
8b83c6d5a4
Merge pull request #18934 from owncloud/bump-3rdparty
...
Update 3rdparty reference
2015-09-21 16:14:42 +02:00
1d2f4aa540
Merge pull request #19215 from owncloud/fix_trashbin_previews
...
fix trashbin previews for text files
2015-09-21 16:12:10 +02:00
fd6b4de2d4
Merge pull request #18481 from owncloud/fix-apache-login-master
...
Repeated calls to loginWithApache() should not not try to set user in…
2015-09-21 16:09:33 +02:00
ac8da41ccd
Merge pull request #18709 from owncloud/cleanup-login-semantics
...
Pushes input inside the bottom group - login.
2015-09-21 16:08:48 +02:00
d8901cf7cd
Merge pull request #19221 from owncloud/improved_error_messages
...
decrypt-all: improved error message if user doesn't exists
2015-09-21 16:06:43 +02:00
b23a5e6886
Merge pull request #17347 from owncloud/dav-fopen-overwrite
...
dont download the existing file for webdav if we're going to overwrite it
2015-09-21 14:13:04 +02:00
b520a1e520
Merge pull request #19081 from owncloud/prevent0bytedownloads
...
prevent 0 byte downloads when storage returns false
2015-09-21 13:50:35 +02:00
4ecf710dcd
dont download the existing file for webdav if we're going to overwrite it
2015-09-21 13:45:25 +02:00
2762f29acf
Merge pull request #19189 from owncloud/fix-19135
...
Fix missing checkboxes in file comparator
2015-09-21 13:36:49 +02:00
d2e90b6050
improved error message if user doesn't exists
2015-09-21 13:19:35 +02:00
964cfc8e08
fix missing checkboxes in file comparator
2015-09-21 12:57:34 +02:00
a174ba5a36
make sure to add the correct file size to the file info, otherwise we will not show the preview for every filetype
2015-09-21 12:41:19 +02:00
0f2865abb2
Repeated calls to loginWithApache() should not not try to set user information in the session again
2015-09-21 11:55:41 +02:00
6006a03ef1
Merge pull request #19122 from owncloud/discardexpirationdatefornonlinkshares
...
Discard expiration date from result for non-link shares
2015-09-21 11:47:37 +02:00
d7d3e8d802
Merge pull request #19176 from owncloud/fix-19118
...
Fix checkboxes in files_external
2015-09-21 11:22:22 +02:00
f2a1e5bd2b
Bump 3rdparty reference
2015-09-21 11:15:02 +02:00
c5f0ad49b0
Merge pull request #19197 from radarhere/patch-1
...
Fixed typo
2015-09-21 10:41:18 +02:00
8a07cb4a74
Merge pull request #19183 from owncloud/oparoz-sharejs-typo
...
Typo
2015-09-21 10:30:59 +02:00
d2e701d74f
Merge pull request #19148 from owncloud/issue-19113-stop-setting-single-user-in-constructor
...
Do not set single user in constructor of encryption occ commands
2015-09-21 09:58:38 +02:00
7b483dfcbe
[tx-robot] updated from transifex
2015-09-21 01:54:41 -04:00
62a0a7fab5
Fixed typo
2015-09-21 00:07:02 +10:00
bbd1e99605
[tx-robot] updated from transifex
2015-09-20 01:54:48 -04:00
624f5de67a
fix checkboxes in files_external
2015-09-19 10:36:38 +02:00
9776d60b57
Typo
2015-09-19 10:34:19 +02:00
c433d48d8e
[tx-robot] updated from transifex
2015-09-19 01:55:22 -04:00
9d1885a535
8.2 beta1
2015-09-18 14:01:46 -04:00
08ae1e8183
Merge pull request #19008 from owncloud/jquery_avatar_tests
...
JS tests for jquery.avatar
2015-09-18 17:31:18 +02:00
9dc136a0d0
Merge pull request #19028 from owncloud/McNetic-zipstreamer-0.7
...
[jenkins] changed ZipStreamer to use composer for updates, update to 0.7
2015-09-18 17:03:49 +02:00
bbf128f1b2
Merge pull request #19098 from owncloud/db-lock-no-transaction
...
Remove the need for the transaction in the database locking backend
2015-09-18 17:02:18 +02:00
3325fb4cdd
Merge pull request #19058 from owncloud/multiselect-bar-style
...
adjust multiselect bar to controls bar, fix #18989
2015-09-18 15:52:05 +02:00
5472a5f455
Also catch exceptions on encryptAll and reset trashbin and singleUser mode
2015-09-18 15:05:18 +02:00
d62cffbc9a
Merge pull request #18901 from owncloud/encryption-dav-tests
...
Add tests for doing dav requests with encryption enabled
2015-09-18 14:54:06 +02:00
eb41a4da7f
Merge branch 'zipstreamer-0.7' of https://github.com/McNetic/owncloud_core into McNetic-zipstreamer-0.7
2015-09-18 14:43:37 +02:00
101fe59ce2
Merge pull request #17689 from owncloud/repair-ocs-ids
...
Add repair step for outdated OCS IDs
2015-09-18 13:42:51 +02:00
5db186e77c
adapted to changed subproject commit
2015-09-18 13:42:36 +02:00
7c6d811584
Prefer OCS Id from database
...
To be consistent with other logic the app id from the database needs to be prefered. Especially when it comes to be able to replace an outdated OCS id.
2015-09-18 13:27:26 +02:00
947e3d7ab5
Add repair step for outdated OCS IDs
...
There is the case where OCs IDs might become outdated such as it has been with the calendar and contacts app which refer to the old dummy entry. This means that users with the old OCS id can't update updates as well will receive invalid state flags. (e.g. "experimental" instead of "approved")
To allow instances to properly update the applications in the future we need to migrate the OCS IDs for now manually.
2015-09-18 13:27:26 +02:00
188d6d2e28
Merge pull request #18911 from owncloud/preview-show-cached-directly
...
Show cached previews directly
2015-09-18 13:02:10 +02:00
0101b1c65f
Merge pull request #18840 from owncloud/fix-app-disable-route
...
Rebuild app navigation in JS
2015-09-18 13:00:58 +02:00
a4a5c9dafd
Merge pull request #18943 from owncloud/trashbin-expiration-cronjob-no-db
...
Add Trashbin expiration cronjob
2015-09-18 12:01:23 +02:00
b59c42e5df
Merge pull request #18983 from owncloud/fix_18926
...
check for the right user if we can change his password
2015-09-18 11:59:57 +02:00
75425b28df
Merge pull request #18679 from owncloud/add-reshare-activities
...
Add reshare activities for the parent sharee and the original file owner
2015-09-18 11:59:30 +02:00
Vincent Petry
Thomas Müller
Phil Davis
Björn Schießle
Bjoern Schiessle
Robin Appelman
Robin Appelman
Hendrik Leppelsack
Lukas Reschke
Jenkins for ownCloud
Andrew Murray
Olivier Paroz
C Montero-Luque
Joas Schilling
Nicolai Ehemann