summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1380 from nextcloud/update-to-drone-0.5Morris Jobke2016-09-131-11/+67
|\ | | | | Update drone.yml to 0.5
| * update drone.yml to 0.5Morris Jobke2016-09-131-11/+67
|/
* Merge pull request #1372 from nextcloud/upstream-26039Lukas Reschke2016-09-132-22/+22
|\ | | | | Fix failing preview unit tests
| * Fix failing preview unit tests (#26039)Thomas Müller2016-09-122-22/+22
| |
* | Merge pull request #1374 from nextcloud/upstream-26061Roeland Jago Douma2016-09-121-2/+10
|\ \ | | | | | | Choose button remains disbaled for httpd/unix-directory
| * | Choose button remains disbaled for httpd/unix-directorySujith Haridasan2016-09-121-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-codesnifferChristoph Wurst2016-09-1219-38/+23
|\ \ | |/ |/| Fix codesniffer complains on some apps
| * Fix some more sniffsJoas Schilling2016-09-123-3/+0
| |
| * Fix encryption appJoas Schilling2016-09-122-2/+1
| |
| * Fix twofactor_backupcodesJoas Schilling2016-09-123-7/+5
| |
| * Fix more sniffingJoas Schilling2016-09-124-6/+5
| |
| * Fix the User_LDAP appJoas Schilling2016-09-127-17/+12
| |
| * Fix sniffes in admin_auditJoas Schilling2016-09-121-3/+0
|/
* Merge pull request #1373 from nextcloud/upstream-26091Joas Schilling2016-09-122-41/+7
|\ | | | | Clean up code coverage
| * add updated composer autoloader codeMorris Jobke2016-09-121-5/+7
| |
| * Clean up code coverageThomas Müller2016-09-121-36/+0
| | | | | | | | - owncloud/core#26091
* | Merge pull request #1369 from nextcloud/georgehrke-readme-patch-1Morris Jobke2016-09-121-2/+2
|\ \ | | | | | | replace he with they in readme
| * | replace he with they in readmeGeorg Ehrke2016-09-121-2/+2
| |/
* | Merge pull request #1359 from nextcloud/cache_controller_nameJoas Schilling2016-09-121-1/+15
|\ \ | |/ |/| Cache the build ControllerName
| * Cache the build ControllerNameRoeland Jago Douma2016-09-111-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 transifexNextcloud bot2016-09-1212-0/+76
| |
* | Merge pull request #1351 from nextcloud/cast_to_intMorris Jobke2016-09-112-2/+2
|\ \ | | | | | | Cast query result to int
| * | Cast query result to intRoeland Jago Douma2016-09-092-2/+2
| | | | | | | | | | | | Else we never create the default address book
* | | Merge pull request #1250 from nextcloud/remote_ocsRoeland Jago Douma2016-09-114-260/+217
|\ \ \ | | | | | | | | Move remote_shares OCS endpoint to AppFramework
| * | | Move remote_shares OCS endpoint to AppFrameworkRoeland Jago Douma2016-09-094-260/+217
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2016-09-1110-0/+12
| |_|/ |/| |
* | | Merge pull request #1346 from nextcloud/trash-detect-correct-mimetypeRoeland Jago Douma2016-09-101-2/+3
|\ \ \ | | | | | | | | deleted files, fix mimetype detection
| * | | detect the correct mimetype of the files in the trashbin, therefore we have ↵Bjoern Schiessle2016-09-091-2/+3
| | | | | | | | | | | | | | | | to check the filename without the appended timestamp
* | | | [tx-robot] updated from transifexNextcloud bot2016-09-1010-56/+66
| |_|/ |/| |
* | | Merge pull request #1342 from nextcloud/throw-exceptions-not-printableMorris Jobke2016-09-092-7/+5
|\ \ \ | |/ / |/| | Don't print exception message in HTML
| * | Don't print exception message in HTMLLukas Reschke2016-09-092-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-mimetypesMorris Jobke2016-09-092-9/+63
|\ \ | |/ |/| Filter more mimetypes
| * Filter more mimetypesLukas Reschke2016-09-092-9/+63
|/ | | | There's no need to allow more than those defined mimetypes for images.
* [tx-robot] updated from transifexNextcloud bot2016-09-0942-68/+58
|
* Merge pull request #1317 from nextcloud/add-sharing-disclaimerMorris Jobke2016-09-089-4/+92
|\ | | | | Adding a optional disclaimer to the anonymous upload page
| * Adjust testLukas Reschke2016-09-081-1/+7
| |
| * Use l10nLukas Reschke2016-09-081-1/+1
| |
| * Fix testsLukas Reschke2016-09-082-4/+3
| |
| * Adding a optional disclaimer to the anonymous upload pageMorris Jobke2016-09-088-3/+86
| |
* | Merge pull request #1247 from nextcloud/storage-id-global-cacheMorris Jobke2016-09-088-27/+131
|\ \ | | | | | | more efficient querying of numeric storage ids
| * | more efficient querying of numeric storage idsRobin Appelman2016-09-078-27/+131
| | |
* | | Merge pull request #1297 from nextcloud/catch-exceptions-with-invalid-passwordsRoeland Jago Douma2016-09-082-6/+19
|\ \ \ | | | | | | | | Catch the exception of the password policy app
| * | | Fix typoJoas Schilling2016-09-071-1/+1
| | | |
| * | | Catch the exception of the password policy appJoas Schilling2016-09-072-5/+18
| | | |
* | | | Merge pull request #1328 from nextcloud/add-exemption-for-osxMorris Jobke2016-09-081-1/+15
|\ \ \ \ | | | | | | | | | | Add exemptions for incompatible UAs
| * | | | Add exemptions for incompatible UAsLukas Reschke2016-09-081-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-atmMorris Jobke2016-09-089-48/+36
|\ \ \ \ \ | | | | | | | | | | | | Show an download button instead of the updater
| * | | | | Change updater URLJoas Schilling2016-09-083-14/+14
| | | | | |
| * | | | | Fix testsJoas Schilling2016-09-082-7/+15
| | | | | |
| * | | | | Show an update button instead of the updaterJoas Schilling2016-09-084-27/+7
| | | | | |