summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #23672 from owncloud/use-retry-wrapper-for-sftpThomas Müller2016-03-311-1/+3
|\
| * Use RetryWrapper for SFTP storageLukas Reschke2016-03-301-1/+3
* | Merge pull request #15750 from owncloud/loading-feedback-email-usermanagementThomas Müller2016-03-313-10/+33
|\ \
| * | Add loading feedback for email change in user managementMorris Jobke2016-03-163-10/+33
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-3142-28/+492
* | | Merge pull request #23642 from stweil/masterThomas Müller2016-03-3011-14/+14
|\ \ \
| * | | apps/files_external: Fix typos in comments (found and fixed by codespell)Stefan Weil2016-03-305-6/+6
| * | | apps/files_trashbin: Fix typos in comments (found and fixed by codespell)Stefan Weil2016-03-302-3/+3
| * | | apps/dav: Fix typos in comments (found and fixed by codespell)Stefan Weil2016-03-304-5/+5
| | |/ | |/|
* | | Merge pull request #23508 from owncloud/text-columns-should-have-lengthThomas Müller2016-03-302-1/+22
|\ \ \
| * | | Text columns should really have a length :see_no_evil:Thomas Müller2016-03-232-1/+22
* | | | Merge pull request #23663 from owncloud/share-displayownerfixThomas Müller2016-03-302-3/+4
|\ \ \ \
| * | | | Fix displaying owner before share icon in file listVincent Petry2016-03-302-3/+4
* | | | | Merge pull request #23660 from owncloud/master-make-google-drive-drumpf-againThomas Müller2016-03-301-0/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Use the shipped cacerts.pem instead of the global oneLukas Reschke2016-03-301-0/+1
| | |/ / | |/| |
* | | | Merge pull request #23628 from owncloud/avatar-removeThomas Müller2016-03-302-3/+2
|\ \ \ \
| * | | | only remove avatars from the folder we store them inRobin Appelman2016-03-302-3/+2
* | | | | Merge pull request #23654 from owncloud/issue-23653-xcache-detection-failsThomas Müller2016-03-301-1/+1
|\ \ \ \ \
| * | | | | xcache.var_size with 64M should evaluate to isAvailableJoas Schilling2016-03-301-1/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #23651 from owncloud/fix_23536Thomas Müller2016-03-302-1/+24
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Non moveable mount points should always be UPDATE+DELETE shareableRoeland Jago Douma2016-03-302-1/+24
|/ / / /
* | | | Merge pull request #23630 from owncloud/upload-whiteThomas Müller2016-03-302-3/+1
|\ \ \ \
| * | | | correct form of upload-white icon to be same as upload iconJan-Christoph Borchardt2016-03-292-3/+1
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-3014-2/+42
|/ / / /
* | | | Merge pull request #23543 from owncloud/issue-23503-activity-emails-always-shortThomas Müller2016-03-292-2/+31
|\ \ \ \
| * | | | Allow the activity app to set the current user when sending emailsJoas Schilling2016-03-242-1/+29
| * | | | We are only formatting an object when it's not nullJoas Schilling2016-03-241-1/+2
* | | | | Merge pull request #23568 from owncloud/finally-fix-23328-now-for-addressbook...Thomas Müller2016-03-291-1/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Handle group shares of addressbooks on v1 as well ... now FINALLY ....Thomas Müller2016-03-241-1/+2
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-2948-22/+156
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-2828-6/+206
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-2742-18/+194
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-2636-0/+110
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-2544-4/+270
* | | | | Merge pull request #23549 from owncloud/dav-sharetypes-remoteThomas Müller2016-03-244-2/+8
|\ \ \ \ \
| * | | | | Return remote shares in oc:share-types Webdav propertyVincent Petry2016-03-244-2/+8
* | | | | | Merge pull request #23545 from owncloud/issue-17144-lock-mount-point-on-removalThomas Müller2016-03-241-0/+4
|\ \ \ \ \ \
| * | | | | | Lock the mountpoint while removingJoas Schilling2016-03-241-0/+4
* | | | | | | Merge pull request #23154 from owncloud/avatar-save-failureThomas Müller2016-03-244-7/+25
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | dont die when we cant save the resized avatar, log insteadRobin Appelman2016-03-114-7/+25
* | | | | | | Merge pull request #23511 from owncloud/sidebar-clickThomas Müller2016-03-242-4/+19
|\ \ \ \ \ \ \
| * | | | | | | sidebar click modificationErik Pellikka2016-03-242-4/+19
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #23551 from owncloud/objectstoremissingvarThomas Müller2016-03-241-0/+4
|\ \ \ \ \ \ \
| * | | | | | | add missing varJörn Friedrich Dreyer2016-03-241-0/+4
* | | | | | | | Merge pull request #23342 from owncloud/fix-group-sharing-for-v1-caldav-and-c...Thomas Müller2016-03-2410-88/+212
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix acls for calendar objects and cards - fixes #23273Thomas Müller2016-03-249-84/+192
| * | | | | | | Return proper current-user-principal on v1 endpoints - fixes #23306Thomas Müller2016-03-241-0/+15
| * | | | | | | Fix group shares on v1 caldav and carddav - fixes #23328Thomas Müller2016-03-243-4/+5
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #23542 from owncloud/catch-empty-app-path-oh-we-really-sho...Thomas Müller2016-03-241-3/+6
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | getAppPath can return falseLukas Reschke2016-03-241-3/+6
| |/ / / / /