Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1380 from nextcloud/update-to-drone-0.5 | Morris Jobke | 2016-09-13 | 1 | -11/+67 |
|\ | | | | | Update drone.yml to 0.5 | ||||
| * | update drone.yml to 0.5 | Morris Jobke | 2016-09-13 | 1 | -11/+67 |
|/ | |||||
* | Merge pull request #1372 from nextcloud/upstream-26039 | Lukas Reschke | 2016-09-13 | 2 | -22/+22 |
|\ | | | | | Fix failing preview unit tests | ||||
| * | Fix failing preview unit tests (#26039) | Thomas Müller | 2016-09-12 | 2 | -22/+22 |
| | | |||||
* | | Merge pull request #1374 from nextcloud/upstream-26061 | Roeland Jago Douma | 2016-09-12 | 1 | -2/+10 |
|\ \ | | | | | | | Choose button remains disbaled for httpd/unix-directory | ||||
| * | | Choose button remains disbaled for httpd/unix-directory | Sujith Haridasan | 2016-09-12 | 1 | -2/+10 |
| |/ | | | | | | | | | | | | | | | | | | | This is not correct. Hence in this patch we validate if the mimetype is 'httpd/unix-directory'. If so we don't disable it. This patch addresses solution for issue: 26034 Signed-off-by: Sujith Haridasan <Sujith_Haridasan@mentor.com> | ||||
* | | Merge pull request #1368 from nextcloud/use-codesniffer | Christoph Wurst | 2016-09-12 | 19 | -38/+23 |
|\ \ | |/ |/| | Fix codesniffer complains on some apps | ||||
| * | Fix some more sniffs | Joas Schilling | 2016-09-12 | 3 | -3/+0 |
| | | |||||
| * | Fix encryption app | Joas Schilling | 2016-09-12 | 2 | -2/+1 |
| | | |||||
| * | Fix twofactor_backupcodes | Joas Schilling | 2016-09-12 | 3 | -7/+5 |
| | | |||||
| * | Fix more sniffing | Joas Schilling | 2016-09-12 | 4 | -6/+5 |
| | | |||||
| * | Fix the User_LDAP app | Joas Schilling | 2016-09-12 | 7 | -17/+12 |
| | | |||||
| * | Fix sniffes in admin_audit | Joas Schilling | 2016-09-12 | 1 | -3/+0 |
|/ | |||||
* | Merge pull request #1373 from nextcloud/upstream-26091 | Joas Schilling | 2016-09-12 | 2 | -41/+7 |
|\ | | | | | Clean up code coverage | ||||
| * | add updated composer autoloader code | Morris Jobke | 2016-09-12 | 1 | -5/+7 |
| | | |||||
| * | Clean up code coverage | Thomas Müller | 2016-09-12 | 1 | -36/+0 |
| | | | | | | | | - owncloud/core#26091 | ||||
* | | Merge pull request #1369 from nextcloud/georgehrke-readme-patch-1 | Morris Jobke | 2016-09-12 | 1 | -2/+2 |
|\ \ | | | | | | | replace he with they in readme | ||||
| * | | replace he with they in readme | Georg Ehrke | 2016-09-12 | 1 | -2/+2 |
| |/ | |||||
* | | Merge pull request #1359 from nextcloud/cache_controller_name | Joas Schilling | 2016-09-12 | 1 | -1/+15 |
|\ \ | |/ |/| | Cache the build ControllerName | ||||
| * | Cache the build ControllerName | Roeland Jago Douma | 2016-09-11 | 1 | -1/+15 |
| | | | | | | | | | | | | | | | | | | Often a route.php file will have many N routes but only M controllers. Where N >= M. Which means that in most cases the ControllerName will be converted multiple times. This is of course far from ideal. Note that this is per app so the cache will contain at most N entries. Which is not to bad. | ||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2016-09-12 | 12 | -0/+76 |
| | | |||||
* | | Merge pull request #1351 from nextcloud/cast_to_int | Morris Jobke | 2016-09-11 | 2 | -2/+2 |
|\ \ | | | | | | | Cast query result to int | ||||
| * | | Cast query result to int | Roeland Jago Douma | 2016-09-09 | 2 | -2/+2 |
| | | | | | | | | | | | | Else we never create the default address book | ||||
* | | | Merge pull request #1250 from nextcloud/remote_ocs | Roeland Jago Douma | 2016-09-11 | 4 | -260/+217 |
|\ \ \ | | | | | | | | | Move remote_shares OCS endpoint to AppFramework | ||||
| * | | | Move remote_shares OCS endpoint to AppFramework | Roeland Jago Douma | 2016-09-09 | 4 | -260/+217 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-09-11 | 10 | -0/+12 |
| |_|/ |/| | | |||||
* | | | Merge pull request #1346 from nextcloud/trash-detect-correct-mimetype | Roeland Jago Douma | 2016-09-10 | 1 | -2/+3 |
|\ \ \ | | | | | | | | | deleted files, fix mimetype detection | ||||
| * | | | detect the correct mimetype of the files in the trashbin, therefore we have ↵ | Bjoern Schiessle | 2016-09-09 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | to check the filename without the appended timestamp | ||||
* | | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-09-10 | 10 | -56/+66 |
| |_|/ |/| | | |||||
* | | | Merge pull request #1342 from nextcloud/throw-exceptions-not-printable | Morris Jobke | 2016-09-09 | 2 | -7/+5 |
|\ \ \ | |/ / |/| | | Don't print exception message in HTML | ||||
| * | | Don't print exception message in HTML | Lukas Reschke | 2016-09-09 | 2 | -7/+5 |
| |/ | | | | | | | | | | | The exception message is potentially influenced by user input and could thus be confusing (e.g. somebody could try to open a file like "Please send a mail to support@foo.com", and then the message would include that string. It is thus reasonable to not show the exception message by default. Also for the browser view I added an `exit()` at the end, as otherwise the XML exception would be attached. | ||||
* | | Merge pull request #1339 from nextcloud/master-limit-possible-image-mimetypes | Morris Jobke | 2016-09-09 | 2 | -9/+63 |
|\ \ | |/ |/| | Filter more mimetypes | ||||
| * | Filter more mimetypes | Lukas Reschke | 2016-09-09 | 2 | -9/+63 |
|/ | | | | There's no need to allow more than those defined mimetypes for images. | ||||
* | [tx-robot] updated from transifex | Nextcloud bot | 2016-09-09 | 42 | -68/+58 |
| | |||||
* | Merge pull request #1317 from nextcloud/add-sharing-disclaimer | Morris Jobke | 2016-09-08 | 9 | -4/+92 |
|\ | | | | | Adding a optional disclaimer to the anonymous upload page | ||||
| * | Adjust test | Lukas Reschke | 2016-09-08 | 1 | -1/+7 |
| | | |||||
| * | Use l10n | Lukas Reschke | 2016-09-08 | 1 | -1/+1 |
| | | |||||
| * | Fix tests | Lukas Reschke | 2016-09-08 | 2 | -4/+3 |
| | | |||||
| * | Adding a optional disclaimer to the anonymous upload page | Morris Jobke | 2016-09-08 | 8 | -3/+86 |
| | | |||||
* | | Merge pull request #1247 from nextcloud/storage-id-global-cache | Morris Jobke | 2016-09-08 | 8 | -27/+131 |
|\ \ | | | | | | | more efficient querying of numeric storage ids | ||||
| * | | more efficient querying of numeric storage ids | Robin Appelman | 2016-09-07 | 8 | -27/+131 |
| | | | |||||
* | | | Merge pull request #1297 from nextcloud/catch-exceptions-with-invalid-passwords | Roeland Jago Douma | 2016-09-08 | 2 | -6/+19 |
|\ \ \ | | | | | | | | | Catch the exception of the password policy app | ||||
| * | | | Fix typo | Joas Schilling | 2016-09-07 | 1 | -1/+1 |
| | | | | |||||
| * | | | Catch the exception of the password policy app | Joas Schilling | 2016-09-07 | 2 | -5/+18 |
| | | | | |||||
* | | | | Merge pull request #1328 from nextcloud/add-exemption-for-osx | Morris Jobke | 2016-09-08 | 1 | -1/+15 |
|\ \ \ \ | | | | | | | | | | | Add exemptions for incompatible UAs | ||||
| * | | | | Add exemptions for incompatible UAs | Lukas Reschke | 2016-09-08 | 1 | -1/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some user agents are notorious and don't really properly follow HTTP specifications. For those, have an automated opt-out. Since the protection for remote.php is applied in base.php as starting point we need to opt out here. | ||||
* | | | | | Merge pull request #1323 from nextcloud/show-download-button-for-updates-atm | Morris Jobke | 2016-09-08 | 9 | -48/+36 |
|\ \ \ \ \ | | | | | | | | | | | | | Show an download button instead of the updater | ||||
| * | | | | | Change updater URL | Joas Schilling | 2016-09-08 | 3 | -14/+14 |
| | | | | | | |||||
| * | | | | | Fix tests | Joas Schilling | 2016-09-08 | 2 | -7/+15 |
| | | | | | | |||||
| * | | | | | Show an update button instead of the updater | Joas Schilling | 2016-09-08 | 4 | -27/+7 |
| | | | | | |