summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix search box overlapping on mobile (#450)Jan-Christoph Borchardt2016-07-223-7/+7
| | | | | | | | * fix searchbox overlapping on mobile * also adjust log in background color in theme * Fix unit tests
* Merge pull request #524 from nextcloud/ocs_appframework_status_codeLukas Reschke2016-07-222-2/+41
|\ | | | | Set proper status code in OCS AppFramework Middleware
| * Add testsRoeland Jago Douma2016-07-221-1/+35
| |
| * Set proper status code in OCS AppFramework MiddlewareRoeland Jago Douma2016-07-221-1/+6
| |
* | Merge pull request #526 from nextcloud/bumb-app-requirementsJoas Schilling2016-07-2217-17/+17
|\ \ | | | | | | bumb compatible app versions for core apps
| * | Also increase the min versionJoas Schilling2016-07-2217-17/+17
| | |
| * | bumb compatible app versions for core appsRobin Appelman2016-07-2217-17/+17
| |/
* | Merge pull request #522 from nextcloud/ocs_correct_login_exceptionRoeland Douma2016-07-222-2/+4
|\ \ | |/ |/| OCS correctly handle login exception
| * Fix intergration testsRoeland Jago Douma2016-07-221-2/+2
| |
| * Catch LoginExceptionRoeland Jago Douma2016-07-221-0/+2
| |
* | Merge pull request #517 from nextcloud/fix-typoJoas Schilling2016-07-222-3/+3
|\ \ | | | | | | Fix typo in docs
| * | Use app name from stable9Joas Schilling2016-07-221-1/+1
| | |
| * | Fix typoJoas Schilling2016-07-221-2/+2
| |/
* | Merge pull request #500 from nextcloud/bump_versionJoas Schilling2016-07-2218-20/+20
|\ \ | |/ |/| Bump version
| * Increase app versionsJoas Schilling2016-07-2117-17/+17
| |
| * Bump versionRoeland Jago Douma2016-07-211-3/+3
| |
* | [tx-robot] updated from transifexNextcloud bot2016-07-22114-174/+200
| |
* | Merge pull request #505 from nextcloud/fix-license-scriptMorris Jobke2016-07-211-4/+8
|\ \ | | | | | | Fix the license script
| * | only search the license header for @copyright statementsBjoern Schiessle2016-07-211-2/+3
| | |
| * | Fix the license scriptJoas Schilling2016-07-211-2/+5
| | |
* | | Merge pull request #496 from nextcloud/fix-config-generationMorris Jobke2016-07-212-7/+7
|\ \ \ | | | | | | | | Make the changes from doc fix persistant
| * | | Change the app nameJoas Schilling2016-07-211-1/+1
| | | |
| * | | Make the changes from ↵Joas Schilling2016-07-211-6/+6
| | |/ | |/| | | | | | | https://github.com/nextcloud/documentation/commit/6ccd2c5678b85d35a8673d784bef5c6c89e7ecb9 persistant
* | | Merge pull request #507 from nextcloud/run-le-scriptMorris Jobke2016-07-211487-2939/+5010
|\ \ \ | | | | | | | | Update emails and license headers with latest changes
| * | | Update with robinJoas Schilling2016-07-21543-539/+809
| | | |
| * | | Fix othersJoas Schilling2016-07-21793-1261/+2207
| | | |
| * | | Fix apps/Joas Schilling2016-07-21679-1162/+2017
| | |/ | |/|
* | | Merge pull request #374 from lpszBuffer/masterWilliam Bargent2016-07-213-7/+27
|\ \ \ | | | | | | | | Alters 'No Internet Connection' error message. #181
| * | | Alters 'No Internet Connection' error message. #181Derek2016-07-203-7/+27
| | | |
* | | | Merge pull request #480 from nextcloud/fix_ocs_response_formatLukas Reschke2016-07-214-6/+25
|\ \ \ \ | |_|/ / |/| | | AppFramework default response for OCS is xml
| * | | AppFramework do not get default responseRoeland Jago Douma2016-07-204-6/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The OCSResponse differs from other responses in that it defaults to XML. However we fell back to json by default. This makes sure that if nothing is set we don't pass anything. Which defaults then to the controllers default (which is often 'json') but in the case of the OCSResponse 'xml'.
* | | | Merge pull request #506 from nextcloud/update-mailmapJoas Schilling2016-07-211-7/+8
|\ \ \ \ | | | | | | | | | | Fix more mailmap entries
| * | | | Fix more mailmap entriesJoas Schilling2016-07-211-7/+8
|/ / / /
* | | | Merge pull request #501 from nextcloud/mailmapBjörn Schießle2016-07-211-2/+2
|\ \ \ \ | |_|_|/ |/| | | Fix e-mail in mailmap
| * | | Fix e-mail in mailmapRoeland Jago Douma2016-07-211-2/+2
|/ / /
* | | Merge pull request #477 from nextcloud/fix-layout-public-uploadMorris Jobke2016-07-211-1/+1
|\ \ \ | | | | | | | | move closing div to the right place
| * | | move closing div to the right placeBjoern Schiessle2016-07-201-1/+1
| | | |
* | | | Merge pull request #484 from nextcloud/reenable-help-sectionMorris Jobke2016-07-212-8/+6
|\ \ \ \ | | | | | | | | | | [master] Reenable help section
| * | | | Add proper linksLukas Reschke2016-07-211-4/+4
| | | | |
| * | | | Revert "Remove "Help" link from personal sidebar"Lukas Reschke2016-07-211-4/+2
| | | | | | | | | | | | | | | | | | | | This reverts commit deef15a3c7119b2965e7212ce53ba70e6baed779.
* | | | | Merge pull request #486 from nextcloud/master-link-properMorris Jobke2016-07-211-1/+1
|\ \ \ \ \ | | | | | | | | | | | | [master] Properly link to nextcloud
| * | | | | [master] Properly link to nextcloudLukas Reschke2016-07-211-1/+1
| |/ / / /
* | | | | Merge pull request #488 from nextcloud/brand-to-nextcloudMorris Jobke2016-07-211-2/+2
|\ \ \ \ \ | |/ / / / |/| | | | [master] Use proper branding
| * | | | Use proper brandingLukas Reschke2016-07-211-2/+2
|/ / / / | | | | | | | | | | | | Stable9 has this already
* | | | Merge branch 'master' of https://github.com/nextcloud/serverLukas Reschke2016-07-2124-30/+182
|\ \ \ \
| * | | | [tx-robot] updated from transifexNextcloud bot2016-07-2124-30/+182
| | | | |
* | | | | Fix typoLukas Reschke2016-07-211-1/+1
|/ / / /
* | | | Link to proper clientsLukas Reschke2016-07-211-4/+3
| | | |
* | | | Port ↵Lukas Reschke2016-07-212-1/+19
| | | | | | | | | | | | | | | | https://github.com/nextcloud/server/commit/2d373416d8e54a7de84879a365c372a85104c6df to master
* | | | Add ownCloud certLukas Reschke2016-07-211-0/+66
| | | |