wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
31132 commits 157 branches 562 tags 714 MiB
Commit graph

31132 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bjoern Schiessle
89223379ad replaceUserKeys() actually deletes the users keys -> update method name and doc-block 2016-03-18 11:06:14 +01:00
Bjoern Schiessle
5e267589d4 only create and update user specific key if no master key is enabled 2016-03-18 11:06:14 +01:00
Jenkins for ownCloud
a6c921267e [tx-robot] updated from transifex 2016-03-18 01:59:00 -04:00
Thomas Müller
0bc51b9118 Merge pull request #23272 from owncloud/dropbox-downloadnotthefullfileinmemory 
Fix dropbox storage to not store the whole file in memory
 2016-03-17 20:52:41 +01:00
Thomas Müller
31ee463690 Merge pull request #23282 from owncloud/fix-caching-unavailable-ldap 
fix writing to cache when fallback server should be used immediately
 2016-03-17 20:52:22 +01:00
Thomas Müller
d6d59fe227 Merge pull request #23346 from owncloud/fix_23325 
Set proper public webdav permissions when public upload disabled
 2016-03-17 20:51:54 +01:00
Thomas Müller
876e032d09 Merge pull request #23370 from owncloud/fix-username-change 
Update avatar on username change if avatar is set
 2016-03-17 19:50:12 +01:00
Thomas Müller
f957ca405f Merge pull request #23371 from owncloud/paurisa-Fixed_21588 
Rating icons changed to .svg
 2016-03-17 19:49:11 +01:00
Thomas Müller
d6ee1798cc Merge pull request #23255 from owncloud/update-sabre3.0.8-fseek 
Update 3rdparty commit for sabre update 3.0.8
 2016-03-17 18:33:34 +01:00
Pau
37d7712411 Rating icons changed to .svg 2016-03-17 17:37:45 +01:00
Morris Jobke
d79c8c6d13 Update avatar on username change if avatar is set 
* fixes #20455
 2016-03-17 17:34:22 +01:00
Thomas Müller
8fb3e44610 Merge pull request #23287 from owncloud/issue-22786-absolute-paths 
Fix absolute path creation for remote shares with /oc webroot
 2016-03-17 14:29:57 +01:00
Roeland Jago Douma
533fdb4075 Set proper public webdav permissions when public upload disabled 
Fixes #23325

It can happen that a user shares a folder with public upload. And some
time later the admin disables public upload on the server.

To make sure this is handled correctly we need to check the config value
and reduce the permissions.

Fix is kept small to be easy backportable.
 2016-03-17 11:35:31 +01:00
Thomas Müller
828cb08d49 Merge pull request #23334 from owncloud/ext-user-mounting-gui 
Display external storage GUI even if user mounting disabled
 2016-03-17 09:55:23 +01:00
Thomas Müller
8237baba68 Merge pull request #23303 from owncloud/exclude-only-specific-third-party 
Exclude only known failing third-party files
 2016-03-17 09:50:02 +01:00
Thomas Müller
48a7f126fd Merge pull request #23326 from owncloud/manishbisht-combined-database-errors 
[CI] Installation: Combined database errors
 2016-03-17 09:33:26 +01:00
Thomas Müller
b5c56a7322 Merge pull request #23336 from owncloud/occ-typos 
Some typo corrections in occ command output
 2016-03-17 09:31:11 +01:00
Thomas Müller
a20cf140c3 Merge pull request #23340 from owncloud/dont-try-to-test-syntax-as-dav-test 
Don't try to execute a dav syntax test
 2016-03-17 09:28:44 +01:00
Joas Schilling
a400c5963b Don't try to execute a dav syntax test 2016-03-17 08:58:03 +01:00
Jenkins for ownCloud
ace1812026 [tx-robot] updated from transifex 2016-03-17 01:56:06 -04:00
Carla Schroder
0c9eaede41 Some typo corrections in occ command output 2016-03-16 16:14:25 -07:00
Robin McCorkell
a51ece97e3 Display external storage GUI even if user mounting disabled 2016-03-16 22:06:49 +00:00
Thomas Müller
f3f08cf910 Merge pull request #23192 from owncloud/make-ancient-users-happy-with-totally-untested-stuff 
Fallback for crappy ancient distributions
 2016-03-16 21:56:36 +01:00
Thomas Müller
8b5a1bbe3e Merge pull request #23258 from owncloud/sharee-tests 
Add integration tests for sharee endpoint
 2016-03-16 21:54:20 +01:00
Manish Bisht
07e7d4836e Update oci.php 
Error Fixed

combined the database errors

Merged Database Errors
 2016-03-16 19:21:14 +01:00
Thomas Müller
b4ea527fb2 Merge pull request #23253 from owncloud/give-swift-more-time 
Give swift 15 seconds after startup
 2016-03-16 17:32:55 +01:00
Thomas Müller
d188ed938c Merge pull request #23082 from owncloud/contacts_calendar_name_color 
add title and color to birthday calendar
 2016-03-16 17:17:21 +01:00
Thomas Müller
596bc3bab2 Merge pull request #23300 from owncloud/smb-not-available 
handle connection errors as storage not available in smb
 2016-03-16 16:50:35 +01:00
Morris Jobke
e7e743bdb4 Give swift 15 seconds after startup 2016-03-16 16:16:04 +01:00
Arthur Schiwon
8e0bd5630c fix writing to cache when fallback server should be used immediately 2016-03-16 14:44:18 +01:00
Lukas Reschke
ea9d225a1f Exclude only known failing third-party files 
This way we can also scan the third-party folder for incompatibilities with a used PHP version. Since there are some polyfills that would otherwise fail I had to exclude them manually here.
 2016-03-16 13:32:36 +01:00
Vincent Petry
db5419649f Update 3rdparty commit for sabre update 3.0.8 2016-03-16 13:16:49 +01:00
Robin Appelman
d498282e12 handle connection errors as storage not available in smb 2016-03-16 13:15:54 +01:00
Thomas Müller
2f5b929ee9 Merge pull request #23108 from owncloud/set-encrypted-version-at-least-to-1 
Ensure that stored version is at least 1 for cross-storage copy
 2016-03-16 13:14:36 +01:00
Thomas Müller
09a5b4076b Merge pull request #22994 from owncloud/check-syntax-on-travis 
Check the syntax on travis
 2016-03-16 13:13:34 +01:00
Thomas Müller
5f00724e5b Merge pull request #23189 from owncloud/require-at-least-libxml-2-7-0 
Require at least libxml 2.7.0
 2016-03-16 13:11:59 +01:00
Lukas Reschke
dc364222d9 Execute PHP Parallel Linter on Travis 2016-03-16 12:17:58 +01:00
Thomas Müller
225eebd8f9 Merge pull request #23155 from owncloud/fed-unshare-with 
Specify the target user when unsharing a federated share
 2016-03-16 11:19:09 +01:00
Lukas Reschke
676041ba7e Ensure that stored version is at least 1 for cross-storage copy 
In case of a move operation from an unencrypted to an encrypted
storage the old encrypted version would stay with "0" while the
correct value would be "1". Thus we manually set the value to "1"
for those cases.

See also https://github.com/owncloud/core/issues/23078
 2016-03-16 10:36:15 +01:00
Joas Schilling
140d5f7df3 Make sure to append the web root as per doc 2016-03-16 09:37:48 +01:00
Jenkins for ownCloud
631ae2f0f4 [tx-robot] updated from transifex 2016-03-16 01:55:43 -04:00
Vincent Petry
ab50ba7a58 Fix dropbox storage to not store the whole file in memory 
Since the library can only store the full response in memory on
download, we use an alternate client lib and set the correct headers to
be able to stream the content to a temp file.
 2016-03-15 18:05:27 +01:00
Thomas Müller
f7140294f2 Merge pull request #23157 from owncloud/remove-share-prop-entries 
remove old share propagation entries from appconfig
 2016-03-15 16:04:17 +01:00
Thomas Müller
27760ae54e Merge pull request #23164 from owncloud/db-connection-precondition-fix 
Prevent certain DBs throwing exceptions on same-value updates
 2016-03-15 16:03:55 +01:00
Thomas Müller
7b06dd485d Merge pull request #23250 from owncloud/fix-support-for-php7-in-htaccess 
Fix several .htaccess and .user.ini related problems
 2016-03-15 16:03:18 +01:00
Thomas Müller
8feb42c22e Merge pull request #23251 from owncloud/fix_22907 
allow group shares, even if not all public keys are available
 2016-03-15 16:00:47 +01:00
Joas Schilling
cb56dfec6b Split the context so we don't reset the config on each test 2016-03-15 14:53:16 +01:00
Joas Schilling
c4b0a1cdfd Add tests for user enumeration and sharing in group only 2016-03-15 14:24:51 +01:00
Joas Schilling
4e9c3b3d64 Always use the admin when putting poeple in a group 2016-03-15 14:24:21 +01:00
Joas Schilling
8eb9638490 Make the app config code ready for reuse 2016-03-15 14:23:41 +01:00