Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix search box overlapping on mobile (#450) | Jan-Christoph Borchardt | 2016-07-22 | 3 | -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_code | Lukas Reschke | 2016-07-22 | 2 | -2/+41 |
|\ | | | | | Set proper status code in OCS AppFramework Middleware | ||||
| * | Add tests | Roeland Jago Douma | 2016-07-22 | 1 | -1/+35 |
| | | |||||
| * | Set proper status code in OCS AppFramework Middleware | Roeland Jago Douma | 2016-07-22 | 1 | -1/+6 |
| | | |||||
* | | Merge pull request #526 from nextcloud/bumb-app-requirements | Joas Schilling | 2016-07-22 | 17 | -17/+17 |
|\ \ | | | | | | | bumb compatible app versions for core apps | ||||
| * | | Also increase the min version | Joas Schilling | 2016-07-22 | 17 | -17/+17 |
| | | | |||||
| * | | bumb compatible app versions for core apps | Robin Appelman | 2016-07-22 | 17 | -17/+17 |
| |/ | |||||
* | | Merge pull request #522 from nextcloud/ocs_correct_login_exception | Roeland Douma | 2016-07-22 | 2 | -2/+4 |
|\ \ | |/ |/| | OCS correctly handle login exception | ||||
| * | Fix intergration tests | Roeland Jago Douma | 2016-07-22 | 1 | -2/+2 |
| | | |||||
| * | Catch LoginException | Roeland Jago Douma | 2016-07-22 | 1 | -0/+2 |
| | | |||||
* | | Merge pull request #517 from nextcloud/fix-typo | Joas Schilling | 2016-07-22 | 2 | -3/+3 |
|\ \ | | | | | | | Fix typo in docs | ||||
| * | | Use app name from stable9 | Joas Schilling | 2016-07-22 | 1 | -1/+1 |
| | | | |||||
| * | | Fix typo | Joas Schilling | 2016-07-22 | 1 | -2/+2 |
| |/ | |||||
* | | Merge pull request #500 from nextcloud/bump_version | Joas Schilling | 2016-07-22 | 18 | -20/+20 |
|\ \ | |/ |/| | Bump version | ||||
| * | Increase app versions | Joas Schilling | 2016-07-21 | 17 | -17/+17 |
| | | |||||
| * | Bump version | Roeland Jago Douma | 2016-07-21 | 1 | -3/+3 |
| | | |||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2016-07-22 | 114 | -174/+200 |
| | | |||||
* | | Merge pull request #505 from nextcloud/fix-license-script | Morris Jobke | 2016-07-21 | 1 | -4/+8 |
|\ \ | | | | | | | Fix the license script | ||||
| * | | only search the license header for @copyright statements | Bjoern Schiessle | 2016-07-21 | 1 | -2/+3 |
| | | | |||||
| * | | Fix the license script | Joas Schilling | 2016-07-21 | 1 | -2/+5 |
| | | | |||||
* | | | Merge pull request #496 from nextcloud/fix-config-generation | Morris Jobke | 2016-07-21 | 2 | -7/+7 |
|\ \ \ | | | | | | | | | Make the changes from doc fix persistant | ||||
| * | | | Change the app name | Joas Schilling | 2016-07-21 | 1 | -1/+1 |
| | | | | |||||
| * | | | Make the changes from ↵ | Joas Schilling | 2016-07-21 | 1 | -6/+6 |
| | |/ | |/| | | | | | | | https://github.com/nextcloud/documentation/commit/6ccd2c5678b85d35a8673d784bef5c6c89e7ecb9 persistant | ||||
* | | | Merge pull request #507 from nextcloud/run-le-script | Morris Jobke | 2016-07-21 | 1487 | -2939/+5010 |
|\ \ \ | | | | | | | | | Update emails and license headers with latest changes | ||||
| * | | | Update with robin | Joas Schilling | 2016-07-21 | 543 | -539/+809 |
| | | | | |||||
| * | | | Fix others | Joas Schilling | 2016-07-21 | 793 | -1261/+2207 |
| | | | | |||||
| * | | | Fix apps/ | Joas Schilling | 2016-07-21 | 679 | -1162/+2017 |
| | |/ | |/| | |||||
* | | | Merge pull request #374 from lpszBuffer/master | William Bargent | 2016-07-21 | 3 | -7/+27 |
|\ \ \ | | | | | | | | | Alters 'No Internet Connection' error message. #181 | ||||
| * | | | Alters 'No Internet Connection' error message. #181 | Derek | 2016-07-20 | 3 | -7/+27 |
| | | | | |||||
* | | | | Merge pull request #480 from nextcloud/fix_ocs_response_format | Lukas Reschke | 2016-07-21 | 4 | -6/+25 |
|\ \ \ \ | |_|/ / |/| | | | AppFramework default response for OCS is xml | ||||
| * | | | AppFramework do not get default response | Roeland Jago Douma | 2016-07-20 | 4 | -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-mailmap | Joas Schilling | 2016-07-21 | 1 | -7/+8 |
|\ \ \ \ | | | | | | | | | | | Fix more mailmap entries | ||||
| * | | | | Fix more mailmap entries | Joas Schilling | 2016-07-21 | 1 | -7/+8 |
|/ / / / | |||||
* | | | | Merge pull request #501 from nextcloud/mailmap | Björn Schießle | 2016-07-21 | 1 | -2/+2 |
|\ \ \ \ | |_|_|/ |/| | | | Fix e-mail in mailmap | ||||
| * | | | Fix e-mail in mailmap | Roeland Jago Douma | 2016-07-21 | 1 | -2/+2 |
|/ / / | |||||
* | | | Merge pull request #477 from nextcloud/fix-layout-public-upload | Morris Jobke | 2016-07-21 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | move closing div to the right place | ||||
| * | | | move closing div to the right place | Bjoern Schiessle | 2016-07-20 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #484 from nextcloud/reenable-help-section | Morris Jobke | 2016-07-21 | 2 | -8/+6 |
|\ \ \ \ | | | | | | | | | | | [master] Reenable help section | ||||
| * | | | | Add proper links | Lukas Reschke | 2016-07-21 | 1 | -4/+4 |
| | | | | | |||||
| * | | | | Revert "Remove "Help" link from personal sidebar" | Lukas Reschke | 2016-07-21 | 1 | -4/+2 |
| | | | | | | | | | | | | | | | | | | | | This reverts commit deef15a3c7119b2965e7212ce53ba70e6baed779. | ||||
* | | | | | Merge pull request #486 from nextcloud/master-link-proper | Morris Jobke | 2016-07-21 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | [master] Properly link to nextcloud | ||||
| * | | | | | [master] Properly link to nextcloud | Lukas Reschke | 2016-07-21 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Merge pull request #488 from nextcloud/brand-to-nextcloud | Morris Jobke | 2016-07-21 | 1 | -2/+2 |
|\ \ \ \ \ | |/ / / / |/| | | | | [master] Use proper branding | ||||
| * | | | | Use proper branding | Lukas Reschke | 2016-07-21 | 1 | -2/+2 |
|/ / / / | | | | | | | | | | | | | Stable9 has this already | ||||
* | | | | Merge branch 'master' of https://github.com/nextcloud/server | Lukas Reschke | 2016-07-21 | 24 | -30/+182 |
|\ \ \ \ | |||||
| * | | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-07-21 | 24 | -30/+182 |
| | | | | | |||||
* | | | | | Fix typo | Lukas Reschke | 2016-07-21 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Link to proper clients | Lukas Reschke | 2016-07-21 | 1 | -4/+3 |
| | | | | |||||
* | | | | Port ↵ | Lukas Reschke | 2016-07-21 | 2 | -1/+19 |
| | | | | | | | | | | | | | | | | https://github.com/nextcloud/server/commit/2d373416d8e54a7de84879a365c372a85104c6df to master | ||||
* | | | | Add ownCloud cert | Lukas Reschke | 2016-07-21 | 1 | -0/+66 |
| | | | |