Commit graph

24030 commits

Author SHA1 Message Date
Roeland Jago Douma
d61f688126 Only show SSL table header if there are certificates 2015-03-31 13:00:24 +02:00
Jenkins for ownCloud
1d06d93d27 [tx-robot] updated from transifex 2015-03-31 01:55:55 -04:00
Lukas Reschke
8e0fef74ff Merge pull request #15312 from owncloud/activity-fix-compilation
Correct the app name for sharing events
2015-03-30 17:12:54 +02:00
Morris Jobke
bf17ac929d Merge pull request #15169 from rullzer/fix_displayNamesInGroup
Groupmanagers displayNamesInGroup should actually search in displaynames
2015-03-30 17:04:09 +02:00
Robin McCorkell
308a43a10e Merge pull request #15076 from owncloud/fix-smb-oc-admin
Support constructing an SMB_OC without saved session credentials
2015-03-30 15:38:22 +01:00
Lukas Reschke
5fdc1716d2 Merge pull request #15042 from wolfgangkarall/master
.htaccess RewriteRules: use permanent redirect for .well-known/(cal|card)dav, add 'L' flag
2015-03-30 16:22:36 +02:00
Joas Schilling
4c9c73bef9 Correct the app name for sharing events 2015-03-30 15:14:31 +02:00
Robin McCorkell
4f0abd910c Merge pull request #15269 from owncloud/migrate-checksetup-and-add-memcache
Add check for activated local memcache
2015-03-30 11:24:44 +01:00
Morris Jobke
cfe241a959 Merge pull request #13964 from rullzer/capabilities
Add OCS sharing info to capabilities - take 2
2015-03-30 10:06:05 +02:00
Morris Jobke
00b2be11dd Merge pull request #15239 from owncloud/see-no-evil
Move federated cloud sharing, files externals and updater to special pos...
2015-03-30 09:05:31 +02:00
Morris Jobke
0edeefd031 Merge pull request #15295 from owncloud/add-more-spacing-dialog
Add more spacing to the file picker dialog
2015-03-30 08:07:40 +02:00
Jenkins for ownCloud
da55ff630c [tx-robot] updated from transifex 2015-03-30 01:54:41 -04:00
Jenkins for ownCloud
1db9605afb [tx-robot] updated from transifex 2015-03-29 01:55:31 -04:00
Lukas Reschke
397264f361 Add more spacing to the file picker dialog
Without this the first `>` looked somewhat off, to test this change go to the personal settings and choose a profile picture in a subfolder.
2015-03-28 14:19:27 +01:00
Lukas Reschke
65202d2a18 Add check for activated local memcache
Also used the opportunity to refactor it into an AppFramework controller so that we can unit test it.

Fixes https://github.com/owncloud/core/issues/14956
2015-03-28 13:59:22 +01:00
Vincent Petry
d3752ca1e9 Merge pull request #15289 from owncloud/min-upload-limit
Require minimum 1 MiB upload limit
2015-03-28 11:34:11 +01:00
Vincent Petry
3f891c2650 Merge pull request #15288 from owncloud/check-datadir-relative
Check for relative datadirectory path
2015-03-28 11:28:33 +01:00
Jenkins for ownCloud
8b9b600644 [tx-robot] updated from transifex 2015-03-28 01:55:46 -04:00
Robin McCorkell
ab991458ad Require minimum 1 MiB upload limit 2015-03-27 23:43:35 +00:00
Robin McCorkell
1511a42da7 Check for relative datadirectory path 2015-03-27 23:29:46 +00:00
Morris Jobke
d55b88c043 Merge pull request #15284 from owncloud/revert-master-breakage
Revert "Deprecated \OCP\IAppConfig - add missing methods to IConfig"
2015-03-27 20:01:33 +01:00
Vincent Petry
a32c71d25e Revert "Deprecated \OCP\IAppConfig - add missing methods to IConfig"
This reverts commit 012016d331.
2015-03-27 18:50:11 +01:00
Morris Jobke
f4dc9e6bf3 Merge pull request #15155 from owncloud/share-donotreturntrashedfiles
Do not return shares for files outside "files"
2015-03-27 17:05:14 +01:00
Thomas Müller
4d12c4a38b Merge pull request #13938 from owncloud/deprecate-iappconfig
Deprecated \OCP\IAppConfig - add missing methods to IConfig
2015-03-27 16:07:41 +01:00
Vincent Petry
23cb8112fc Add logout in share test to avoid nasty side effects 2015-03-27 15:54:29 +01:00
Thomas Müller
722e50a112 Merge pull request #15240 from owncloud/storage-wrapper-priority
add priority to storage wrappers
2015-03-27 15:18:44 +01:00
Thomas Müller
5db932d1e4 Merge pull request #15261 from owncloud/fix-14268-master
use StreamResponse to download the log file
2015-03-27 15:07:50 +01:00
Thomas Müller
98bc1ad70a Merge pull request #15265 from owncloud/enc2_fixes
core improvements for Encryption 2.0
2015-03-27 14:58:33 +01:00
Morris Jobke
e918bcf212 Merge pull request #15247 from owncloud/fix_group_share_master_backport
also call generateTarget for group shares
2015-03-27 14:40:52 +01:00
Thomas Müller
0ecc1c89ad Merge pull request #15254 from owncloud/fix-14853-master
Adding a pending indicator to the files summary
2015-03-27 14:18:47 +01:00
Vincent Petry
4d57b7bb3c Merge pull request #15259 from owncloud/fix-change-password-ie8
Show label for password change in IE8
2015-03-27 14:11:14 +01:00
Vincent Petry
80f83ab5e0 Do not return shares for files outside "files" 2015-03-27 13:25:23 +01:00
Vincent Petry
7ad4dfa201 Merge pull request #15227 from owncloud/ocetag-header
Copy Etag header to OC-Etag for sabre calls
2015-03-27 13:10:27 +01:00
Morris Jobke
5aa81833f9 Merge pull request #15260 from owncloud/adjust-controls-bar-width
adjust controls bar width to not overlay scrollbar
2015-03-27 11:56:22 +01:00
Bjoern Schiessle
b5fad75e57 add deleteAllFileKeys to public interface and add "uid" as parameter for the
update call
2015-03-27 11:51:53 +01:00
Bjoern Schiessle
c6be1ba8d3 fix check if a file is excluded from encryption or not 2015-03-27 11:51:50 +01:00
Thomas Müller
b5545932e7 use StreamResponse to download the log file - fixes #14268 2015-03-27 11:30:32 +01:00
Morris Jobke
7e73b25533 Merge pull request #15258 from owncloud/users-addtofilteredgroup
Don't append user in a filtered list if groups don't match
2015-03-27 10:02:33 +01:00
Morris Jobke
a62f38a18b Merge pull request #15225 from owncloud/make-setups-for-users-that-tend-to-use-owncloud-on-not-proper-machines-a-little-bit-more-secure
Add some generic default headers as well via PHP
2015-03-27 09:54:40 +01:00
Jan-Christoph Borchardt
701cb27a9e fix scrutinizer issues 2015-03-27 09:38:41 +01:00
Joas Schilling
4608d3def7 Fix link to the updater 2015-03-27 09:38:13 +01:00
Jan-Christoph Borchardt
908538d863 fix layout for Sharing settings 2015-03-27 09:38:13 +01:00
Joas Schilling
495562f40c Move federated cloud sharing, files externals and updater to special positions 2015-03-27 09:38:09 +01:00
Jenkins for ownCloud
880b31c513 [tx-robot] updated from transifex 2015-03-27 01:56:21 -04:00
Jan-Christoph Borchardt
d728b85fdd adjust controls bar width to not overlay scrollbar 2015-03-27 01:34:55 +01:00
Thomas Müller
fb8994603b Merge pull request #15252 from owncloud/prevent-directory-characters-in-temporary-path
Filter potential dangerous characters in path name
2015-03-27 01:19:55 +01:00
Thomas Müller
710498402f Merge pull request #15256 from owncloud/emptycontent-messages
fine-tuning the empty content messages
2015-03-27 01:17:46 +01:00
Morris Jobke
3e8343c07c Show label for password change in IE8
* fixes #10729
2015-03-27 01:16:31 +01:00
Thomas Müller
2b0906cdff Adding a pending indicator to the files summary - fixes #14853 2015-03-27 01:16:29 +01:00
Morris Jobke
f72939df91 Merge pull request #15255 from owncloud/test-namespacesforrepairtests
Fix namespace for repair step tests
2015-03-27 00:16:47 +01:00