Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #5827 from nextcloud/improve-public-share-header | Morris Jobke | 2017-07-22 | 2 | -4/+16 |
|\ | |||||
| * | Add filename and sharer in public page | Morris Jobke | 2017-07-21 | 2 | -4/+16 |
* | | [tx-robot] updated from transifex | Nextcloud bot | 2017-07-22 | 56 | -4/+162 |
* | | Merge pull request #5596 from nextcloud/mount-rename | Morris Jobke | 2017-07-21 | 2 | -11/+14 |
|\ \ | |||||
| * | | fix parsing of dav permissions | Robin Appelman | 2017-07-17 | 1 | -3/+2 |
| * | | non movable mounts can not be moved | Robin Appelman | 2017-07-17 | 1 | -8/+12 |
* | | | Merge pull request #5823 from nextcloud/improve-error-handling | Morris Jobke | 2017-07-21 | 3 | -13/+22 |
|\ \ \ | |||||
| * | | | use OCSv2 to make sure that the error also arrives at the web front-end | Bjoern Schiessle | 2017-07-21 | 1 | -2/+2 |
| * | | | improved error handling | Bjoern Schiessle | 2017-07-21 | 2 | -11/+20 |
* | | | | Merge pull request #5785 from nextcloud/path-repair-steps-storage | Morris Jobke | 2017-07-21 | 3 | -5/+42 |
|\ \ \ \ | |||||
| * | | | | Also repair storage id's when repairing invalid entries | Robin Appelman | 2017-07-21 | 3 | -5/+42 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #5821 from nextcloud/fix-theming-on-untrusted-domain | Lukas Reschke | 2017-07-21 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Fix error message on untrusted domain error page | Morris Jobke | 2017-07-21 | 1 | -1/+1 |
* | | | | Merge pull request #5820 from MarcelWaldvogel/minor-documentation-fixes | Roeland Jago Douma | 2017-07-21 | 4 | -4/+4 |
|\ \ \ \ | |||||
| * | | | | Minor typos | Marcel Waldvogel | 2017-07-21 | 3 | -3/+3 |
| * | | | | The app password avoids 1Il etc. Adapted comment accordingly | Marcel Waldvogel | 2017-07-21 | 1 | -1/+1 |
* | | | | | Merge pull request #5753 from nextcloud/fed-unshare-fail-remote | Roeland Jago Douma | 2017-07-21 | 1 | -2/+7 |
|\ \ \ \ \ | |||||
| * | | | | | still remove the federated share even if we cant notify the remote | Robin Appelman | 2017-07-17 | 1 | -2/+7 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #5795 from nextcloud/ci-for-archive-tar | Roeland Jago Douma | 2017-07-21 | 1 | -0/+0 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Adjust third-party ref | Lukas Reschke | 2017-07-21 | 1 | -0/+0 |
* | | | | | Merge pull request #5802 from nextcloud/rm_dep_controller_functions | Lukas Reschke | 2017-07-21 | 2 | -174/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Remove deprecated Controller Functions | Roeland Jago Douma | 2017-07-20 | 2 | -174/+1 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #5818 from nextcloud/ocs_privatedata | Roeland Jago Douma | 2017-07-21 | 8 | -455/+0 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | PrivateData to app | Roeland Jago Douma | 2017-07-21 | 8 | -455/+0 |
* | | | | | Merge pull request #5803 from nextcloud/fix-public-links | Morris Jobke | 2017-07-21 | 1 | -1/+3 |
|\ \ \ \ \ | |||||
| * | | | | | fix preview for public links | Bjoern Schiessle | 2017-07-20 | 1 | -1/+3 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #5797 from paulijar/share20-postUnshareFromSelf | Morris Jobke | 2017-07-21 | 4 | -0/+103 |
|\ \ \ \ \ | |||||
| * | | | | | Emit hook postUnshareFromSelf when the recipient of a share unshares it | Pauli Järvinen | 2017-07-20 | 4 | -0/+103 |
* | | | | | | Merge pull request #5819 from benediktg/add-mastdon-link | Morris Jobke | 2017-07-21 | 1 | -0/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add link to mastodon in readme | Benedikt Geissler | 2017-07-21 | 1 | -0/+1 |
* | | | | | | | Merge pull request #5817 from nextcloud/add-basic-sql-injection-checker | Morris Jobke | 2017-07-21 | 23 | -1/+311 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Exclude build/.phan/ from PHP 5.6 syntax check | Lukas Reschke | 2017-07-20 | 1 | -1/+1 |
| * | | | | | | Add Phan plugin to check for SQL injections | Lukas Reschke | 2017-07-20 | 23 | -0/+310 |
* | | | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-07-21 | 350 | -1080/+460 |
| |_|_|/ / / |/| | | | | | |||||
* | | | | | | Merge pull request #5629 from nextcloud/add-recovery-key-on-public-upload | Björn Schießle | 2017-07-20 | 1 | -2/+21 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | make sure that we always have a owner | Bjoern Schiessle | 2017-07-20 | 1 | -4/+17 |
| * | | | | | Add recovery key on public upload | Bjoern Schiessle | 2017-07-20 | 1 | -2/+8 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #5801 from nextcloud/activity-description-copy-paste | Morris Jobke | 2017-07-20 | 2 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Fix copy and paste error on activity descriptions | Joas Schilling | 2017-07-20 | 2 | -2/+2 |
| |/ / / / | |||||
* | | | | | Merge pull request #5790 from nextcloud/fix-documentation | Morris Jobke | 2017-07-20 | 1 | -5/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Fix config.sample.php documentation | Morris Jobke | 2017-07-19 | 1 | -5/+1 |
* | | | | | | Merge pull request #5800 from nextcloud/enable-acceptance-tests-again-on-dron... | Morris Jobke | 2017-07-20 | 4 | -17/+110 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Enable acceptance tests again on Drone 0.7 | Daniel Calviño Sánchez | 2017-07-20 | 1 | -9/+9 |
| * | | | | | Add option to acceptance test runner to set the Selenium server | Daniel Calviño Sánchez | 2017-07-20 | 1 | -1/+40 |
| * | | | | | Add option to acceptance test runner to set the Nextcloud server domain | Daniel Calviño Sánchez | 2017-07-20 | 2 | -1/+45 |
| * | | | | | Make possible to configure the domain for the Nextcloud test server | Daniel Calviño Sánchez | 2017-07-20 | 1 | -6/+16 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #5794 from nextcloud/update-php7.1-container | Roeland Jago Douma | 2017-07-20 | 1 | -6/+6 |
|\ \ \ \ \ | |||||
| * | | | | | Update PHP 7.1 containers | Lukas Reschke | 2017-07-19 | 1 | -6/+6 |
| |/ / / / | |||||
* / / / / | [tx-robot] updated from transifex | Nextcloud bot | 2017-07-20 | 42 | -0/+144 |
|/ / / / | |||||
* | | | | Merge pull request #5734 from nextcloud/only-readable-chars-in-share-tokens | Joas Schilling | 2017-07-19 | 4 | -11/+5 |
|\ \ \ \ |