| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #23702 from owncloud/emptycontent | Jan-Christoph Borchardt | 2016-03-31 | 4 | -4/+9 |
| |\ | | | | | improve emptycontent styles | ||||
| | * | improve emptycontent styles | Jan-Christoph Borchardt | 2016-03-31 | 4 | -4/+9 |
| |/ | |||||
| * | Merge pull request #23690 from owncloud/add-codecov-icon | Thomas Müller | 2016-03-31 | 1 | -0/+1 |
| |\ | | | | | Add codecov icon | ||||
| | * | Add codecov icon | Lukas Reschke | 2016-03-31 | 1 | -0/+1 |
| |/ | |||||
| * | Merge pull request #23672 from owncloud/use-retry-wrapper-for-sftp | Thomas Müller | 2016-03-31 | 1 | -1/+3 |
| |\ | | | | | Use RetryWrapper for SFTP storage | ||||
| | * | Use RetryWrapper for SFTP storage | Lukas Reschke | 2016-03-30 | 1 | -1/+3 |
| | | | | | | | | | | | | | Equivalent to https://github.com/owncloud/core/pull/23442 Required for making encryption work with external storage reliable. | ||||
| * | | Merge pull request #15750 from owncloud/loading-feedback-email-usermanagement | Thomas Müller | 2016-03-31 | 3 | -10/+33 |
| |\ \ | | | | | | | Add loading feedback for email change in user management | ||||
| | * | | Add loading feedback for email change in user management | Morris Jobke | 2016-03-16 | 3 | -10/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | | * show loading indicator while the request is running * change value after the request succeed - not before and undo maybe wrong changes * move markup to HTML template * show notification temporarily | ||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-31 | 42 | -28/+492 |
| | | | | |||||
| * | | | Merge pull request #23642 from stweil/master | Thomas Müller | 2016-03-30 | 11 | -14/+14 |
| |\ \ \ | | | | | | | | | apps: Fix some typos found by codespell | ||||
| | * | | | apps/files_external: Fix typos in comments (found and fixed by codespell) | Stefan Weil | 2016-03-30 | 5 | -6/+6 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Stefan Weil <sw@weilnetz.de> | ||||
| | * | | | apps/files_trashbin: Fix typos in comments (found and fixed by codespell) | Stefan Weil | 2016-03-30 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Fix also a wrong word. Signed-off-by: Stefan Weil <sw@weilnetz.de> | ||||
| | * | | | apps/dav: Fix typos in comments (found and fixed by codespell) | Stefan Weil | 2016-03-30 | 4 | -5/+5 |
| | | |/ | |/| | | | | | | | Signed-off-by: Stefan Weil <sw@weilnetz.de> | ||||
| * | | | Merge pull request #23508 from owncloud/text-columns-should-have-length | Thomas Müller | 2016-03-30 | 2 | -1/+22 |
| |\ \ \ | | | | | | | | | Text columns should really have a length :see_no_evil: | ||||
| | * | | | Text columns should really have a length :see_no_evil: | Thomas Müller | 2016-03-23 | 2 | -1/+22 |
| | | | | | |||||
| * | | | | Merge pull request #23663 from owncloud/share-displayownerfix | Thomas Müller | 2016-03-30 | 2 | -3/+4 |
| |\ \ \ \ | | | | | | | | | | | Fix displaying owner before share icon in file list | ||||
| | * | | | | Fix displaying owner before share icon in file list | Vincent Petry | 2016-03-30 | 2 | -3/+4 |
| | | | | | | | | | | | | | | | | | | | | | Initial display of owner was missing | ||||
| * | | | | | Merge pull request #23660 from owncloud/master-make-google-drive-drumpf-again | Thomas Müller | 2016-03-30 | 1 | -0/+1 |
| |\ \ \ \ \ | |/ / / / |/| | | | | Use the shipped cacerts.pem instead of the global one | ||||
| | * | | | | Use the shipped cacerts.pem instead of the global one | Lukas Reschke | 2016-03-30 | 1 | -0/+1 |
| | | |/ / | |/| | | | | | | | | | | The one we ship may cause problems since Equifax is not included anymore (SHA-1 certs) are deprecated. We should just be consistent here and also use the certificate file which is used by the other calls in the library. | ||||
| * | | | | Merge pull request #23628 from owncloud/avatar-remove | Thomas Müller | 2016-03-30 | 2 | -3/+2 |
| |\ \ \ \ | | | | | | | | | | | only remove avatars from the folder we store them in | ||||
| | * | | | | only remove avatars from the folder we store them in | Robin Appelman | 2016-03-30 | 2 | -3/+2 |
| | | | | | | |||||
| * | | | | | Merge pull request #23654 from owncloud/issue-23653-xcache-detection-fails | Thomas Müller | 2016-03-30 | 1 | -1/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | xcache.var_size with 64M should evaluate to isAvailable | ||||
| | * | | | | | xcache.var_size with 64M should evaluate to isAvailable | Joas Schilling | 2016-03-30 | 1 | -1/+1 |
| | | |/ / / | |/| | | | |||||
| * | | | | | Merge pull request #23651 from owncloud/fix_23536 | Thomas Müller | 2016-03-30 | 2 | -1/+24 |
| |\ \ \ \ \ | |/ / / / |/| | | | | Non moveable mount points should always be UPDATE+DELETE shareable | ||||
| | * | | | | Non moveable mount points should always be UPDATE+DELETE shareable | Roeland Jago Douma | 2016-03-30 | 2 | -1/+24 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #23536 The new sharing code is much stricter in checking permissions. However for non moveable mounts the permissions UPDATE+DELETE are not reported on the mount point. This is just a quick fix. * Updated unit tests | ||||
| * | | | | Merge pull request #23630 from owncloud/upload-white | Thomas Müller | 2016-03-30 | 2 | -3/+1 |
| |\ \ \ \ | | | | | | | | | | | correct form of upload-white icon to be same as upload icon | ||||
| | * | | | | correct form of upload-white icon to be same as upload icon | Jan-Christoph Borchardt | 2016-03-29 | 2 | -3/+1 |
| | | | | | | |||||
| * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-30 | 14 | -2/+42 |
| |/ / / / | |||||
| * | | | | Merge pull request #23543 from owncloud/issue-23503-activity-emails-always-short | Thomas Müller | 2016-03-29 | 2 | -2/+31 |
| |\ \ \ \ | | | | | | | | | | | Fix activity emails always using the short translation | ||||
| | * | | | | Allow the activity app to set the current user when sending emails | Joas Schilling | 2016-03-24 | 2 | -1/+29 |
| | | | | | | |||||
| | * | | | | We are only formatting an object when it's not null | Joas Schilling | 2016-03-24 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | Merge pull request #23568 from ↵ | Thomas Müller | 2016-03-29 | 1 | -1/+2 |
| |\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | owncloud/finally-fix-23328-now-for-addressbooks-as-well Handle group shares of addressbooks on v1 as well ... now FINALLY .... | ||||
| | * | | | | Handle group shares of addressbooks on v1 as well ... now FINALLY .... | Thomas Müller | 2016-03-24 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-29 | 48 | -22/+156 |
| | | | | | | |||||
| * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-28 | 28 | -6/+206 |
| | | | | | | |||||
| * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-27 | 42 | -18/+194 |
| | | | | | | |||||
| * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-26 | 36 | -0/+110 |
| | | | | | | |||||
| * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-25 | 44 | -4/+270 |
| | | | | | | |||||
| * | | | | | Merge pull request #23549 from owncloud/dav-sharetypes-remote | Thomas Müller | 2016-03-24 | 4 | -2/+8 |
| |\ \ \ \ \ | | | | | | | | | | | | | Return remote shares in oc:share-types Webdav property | ||||
| | * | | | | | Return remote shares in oc:share-types Webdav property | Vincent Petry | 2016-03-24 | 4 | -2/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes web UI to properly display the share status icon when an outgoing remote share exists | ||||
| * | | | | | | Merge pull request #23545 from owncloud/issue-17144-lock-mount-point-on-removal | Thomas Müller | 2016-03-24 | 1 | -0/+4 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Lock the mountpoint while removing | ||||
| | * | | | | | | Lock the mountpoint while removing | Joas Schilling | 2016-03-24 | 1 | -0/+4 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #23154 from owncloud/avatar-save-failure | Thomas Müller | 2016-03-24 | 4 | -7/+25 |
| |\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | dont die when we cant save the resized avatar, log instead | ||||
| | * | | | | | | dont die when we cant save the resized avatar, log instead | Robin Appelman | 2016-03-11 | 4 | -7/+25 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #23511 from owncloud/sidebar-click | Thomas Müller | 2016-03-24 | 2 | -4/+19 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | sidebar click modification | ||||
| | * | | | | | | | sidebar click modification | Erik Pellikka | 2016-03-24 | 2 | -4/+19 |
| | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | | Merge pull request #23551 from owncloud/objectstoremissingvar | Thomas Müller | 2016-03-24 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | add missing var | ||||
| | * | | | | | | | add missing var | Jörn Friedrich Dreyer | 2016-03-24 | 1 | -0/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #23342 from ↵ | Thomas Müller | 2016-03-24 | 10 | -88/+212 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | owncloud/fix-group-sharing-for-v1-caldav-and-carddav Fix group shares on v1 caldav and carddav | ||||
| | * | | | | | | | Fix acls for calendar objects and cards - fixes #23273 | Thomas Müller | 2016-03-24 | 9 | -84/+192 |
| | | | | | | | | | |||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |