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

31037 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roeland Jago Douma
fe08b5e9d9 We should check for exceptions when trying to get the avatar 
Fixes #22550

* Updated phpdoc of avatatmanager
* Add unit test
 2016-02-22 10:14:14 +01:00
Pierre Jochem
1a8a667863 Solution for Proposal #19974 
Show username when writing into owncloud.log
 2016-02-22 10:02:45 +01:00
Lukas Reschke
6c96b3d07f Throw normal exceptions instead of eating them 
Partially addresses https://github.com/owncloud/core/issues/22550

Replaces https://github.com/owncloud/core/pull/20185
 2016-02-22 09:41:56 +01:00
Joas Schilling
2865ccfdc4 Move -an after the input arg because it is an output option 2016-02-22 09:40:46 +01:00
Joas Schilling
04da5a56dd Use the notification instead of the disruptive popup 2016-02-22 09:29:13 +01:00
Morris Jobke
3e59c04c7f Fixes pagination in IE 
* tested in Firefox, Chrome, Safari, IE and Edge with folder and file shares
* fixes #20044
 2016-02-22 08:55:20 +01:00
Thomas Müller
8a8209796d Merge pull request #22526 from owncloud/fix-english-texts 
Fix error in source language strings
 2016-02-21 00:03:22 +01:00
Lukas Reschke
3bd95cca6b Check if user has permission to create such a tag 
Fixes https://github.com/owncloud/core/issues/22512
 2016-02-19 20:45:20 +01:00
Lukas Reschke
c13259cf9e Add integration tests for tags 2016-02-19 20:45:20 +01:00
Lukas Reschke
357cdfd07f Merge pull request #22511 from owncloud/add-integration-tests-for-comments 
Add integration tests for comments
 2016-02-19 18:10:30 +01:00
Lukas Reschke
16be9af20a Add integration tests for comments 
This adds integration tests for the comments. Especially with regard to the permission handling, didn't find any problem in it.

Fixes https://github.com/owncloud/core/issues/22367
 2016-02-19 18:08:34 +01:00
Thomas Müller
32e4256945 Merge pull request #22529 from owncloud/tags-style 
improve tags interface styling
 2016-02-19 16:17:37 +01:00
Thomas Müller
f8677628d4 Merge pull request #22503 from owncloud/issue_22500 
When (re-)sharing an incomming federated share set the corrent owner
 2016-02-19 16:07:43 +01:00
Thomas Müller
fb38625741 Merge pull request #22518 from owncloud/checkdeletebeforecopyinsteadofrename 
Check delete permission before attemping copy+delete
 2016-02-19 16:06:55 +01:00
Thomas Müller
b5281b61ed Merge pull request #22410 from owncloud/fix_22119 
Do not copy skeleton on avatar access
 2016-02-19 16:06:40 +01:00
Jan-Christoph Borchardt
5d914d6980 improve tags interface styling 2016-02-19 15:40:10 +01:00
Andreas Schubert
12f2525d4f moved set -e after executable checking with which as old position off set -e stopped the script at this point without any error message 2016-02-19 15:16:04 +01:00
Thomas Müller
8abdcb8085 Fix error ins source language strings 
https://www.transifex.com/owncloud-org/owncloud/translate/#en_GB/core/50786279
https://www.transifex.com/owncloud-org/owncloud/translate/#en_GB/settings-1/50555028
 2016-02-19 15:04:16 +01:00
Thomas Müller
5b3a79a28b Merge pull request #22509 from owncloud/add-filesplugin-to-new-webdav-endpoint 
Add FilesPlugin
 2016-02-19 14:44:02 +01:00
Thomas Müller
2fd0e9b768 Merge pull request #22521 from owncloud/mssql-is-not-support-since-ages 
Remove old adapter - mssql is not supported
 2016-02-19 13:35:32 +01:00
Thomas Müller
66f0ba837f Merge pull request #22348 from owncloud/issue-21812-calendar-old-caldav-url 
Fix old calendar dav urls
 2016-02-19 13:33:16 +01:00
Thomas Müller
5820666254 Merge pull request #22218 from owncloud/occ-no-extra-messages 
Add global --no-warnings option to occ…
 2016-02-19 13:32:52 +01:00
Joas Schilling
c20c836a46 Remove old adapter - mssql is not supported 2016-02-19 13:16:43 +01:00
Bjoern Schiessle
4ef035cc61 make sure that the file name doesn't end with a trailing slash. Can for example happen single files shared across servers 2016-02-19 13:15:09 +01:00
Vincent Petry
a9e0cfad8b Check delete permission before attemping copy+delete 
Some move operations when cross-storage will be replaced by copy and
delete. Before attempting this, first check whether the source storage
has delete permissions.

This also prevents renaming system-wide external storages.
 2016-02-19 12:59:10 +01:00
Roeland Jago Douma
2dcf887cce When (re-)sharing an incomming federated share set the corrent owner 
Incomming federated shares are a special kind. We mount them as normal
webdav shares but we do supply owner info with the federated cloud id of
the share owner.

Since we do not yet have the new resharing behaviour on federated shares
we need to set the correct owner. Which will allow sharing and proper
mounting for other users.

fixes #22500
 2016-02-19 12:43:03 +01:00
Thomas Müller
e987d8cd47 Add FilesPlugin - fixes #22507 2016-02-19 12:37:24 +01:00
Thomas Müller
1106c354ac Merge pull request #22515 from owncloud/webdav_checksum_only_for_files 
Only add checksum headers for 'real' files
 2016-02-19 12:36:56 +01:00
Thomas Müller
b93003d3fb Merge pull request #22487 from owncloud/hidden-text-for-information 
Add hidden text to issue templates
 2016-02-19 12:36:21 +01:00
Thomas Müller
ba941ea50e Merge pull request #22472 from owncloud/scrutinizer-patch-1 
Scrutinizer Auto-Fixes
 2016-02-19 12:36:11 +01:00
Joas Schilling
b216be8cca Add correct principals for the current user before ACL check 2016-02-19 12:35:33 +01:00
Joas Schilling
4e2f9ce05b Convert the old principal to the new principal before getting calendars 2016-02-19 12:35:33 +01:00
Thomas Müller
ffc2950393 Merge pull request #22198 from owncloud/birthday-calendar 
Sync a users contacts birthday to the users birthday calendar
 2016-02-19 12:33:19 +01:00
Roeland Jago Douma
751d3df469 Only add checksum headers for files 
We can only add the checksum header for real ownCloud files (so we have
a fileinfo object etc).
 2016-02-19 10:56:43 +01:00
Roeland Jago Douma
f837c08465 Fix even more 2016-02-19 09:43:20 +01:00
Joas Schilling
8756a22c60 Fix more things 2016-02-19 09:43:11 +01:00
Thomas Müller
8e36678873 Fix PHPDoc 2016-02-19 09:43:11 +01:00
Scrutinizer Auto-Fixer
0d0151a3e1 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2016-02-19 09:43:11 +01:00
Thomas Müller
ae2304f23f Merge pull request #22405 from owncloud/gdrive-mimetype-and-office-fixes 
Fix GDrive handling of office files
 2016-02-19 09:13:35 +01:00
Thomas Müller
f6e61a296f Merge pull request #22424 from owncloud/add-generic-csrf-protection-to-webdav 
Require CSRF token for non WebDAV authenticated requests
 2016-02-19 09:13:00 +01:00
Victor Dubiniuk
972e0c62b3 Add global --no-warning option to occ in order not to pollute output with warnings 2016-02-19 00:33:48 +03:00
C Montero-Luque
99051cdbe5 9.0.0 beta 2 2016-02-18 14:39:05 -05:00
Thomas Müller
48f6ae0b2d Merge pull request #22493 from owncloud/issue_22467 
getRootFolder should not setup the FS for any user
 2016-02-18 16:46:00 +01:00
Thomas Müller
2a9b0aaaa1 Merge pull request #22482 from owncloud/getowner-cache 
cache result for getowner
 2016-02-18 16:45:40 +01:00
Thomas Müller
d1ef43481d Merge pull request #22444 from owncloud/fix-federated-share-delete 
get the actual user instead of a federated cloud id
 2016-02-18 16:44:57 +01:00
Thomas Müller
f9f66a996e Merge pull request #22496 from owncloud/jenkins-22355 
Fix on shared groups assignment.
 2016-02-18 16:44:27 +01:00
Thomas Müller
22541b73c5 Merge pull request #22422 from owncloud/issue-17230-better-promotion-of-app-updates 
Make app updates better visible (part1)
 2016-02-18 16:44:01 +01:00
Thomas Müller
d2f4b4b421 Merge pull request #22489 from owncloud/bump-zipstreamer 
Bump Zipstreamer
 2016-02-18 16:43:36 +01:00
Thomas Müller
d8de7d1e73 Adding cli command to sync birthday calendar 2016-02-18 14:49:45 +01:00
Thomas Müller
6c4cdddba8 Merge pull request #21610 from owncloud/quota-sharedfile 
Fix quota check for single shared files
 2016-02-18 14:25:32 +01:00