Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/nextcloud/server | root | 2016-07-25 | 77 | -175/+346 |
|\ | |||||
| * | Merge pull request #530 from nextcloud/fix-theme-loading | Morris Jobke | 2016-07-25 | 2 | -2/+10 |
| |\ | |||||
| | * | Make sure we try to autoload the class | Joas Schilling | 2016-07-22 | 2 | -2/+10 |
| * | | [tx-robot] updated from transifex | Nextcloud bot | 2016-07-25 | 10 | -6/+78 |
| * | | [tx-robot] updated from transifex | Nextcloud bot | 2016-07-24 | 10 | -2/+24 |
| * | | Merge pull request #533 from nextcloud/oparoz-ns-server-contributing.md | Roeland Douma | 2016-07-23 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | change core to server | Olivier Paroz | 2016-07-23 | 1 | -1/+1 |
| * | | | Merge pull request #534 from nextcloud/twofactor-isset | Joas Schilling | 2016-07-23 | 1 | -9/+11 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Check if an app provide two-factor-auth providers before we try to use them | Robin Appelman | 2016-07-23 | 1 | -9/+11 |
| |/ / | |||||
| * / | [tx-robot] updated from transifex | Nextcloud bot | 2016-07-23 | 28 | -124/+150 |
| |/ | |||||
| * | Fix search box overlapping on mobile (#450) | Jan-Christoph Borchardt | 2016-07-22 | 3 | -7/+7 |
| * | Merge pull request #524 from nextcloud/ocs_appframework_status_code | Lukas Reschke | 2016-07-22 | 2 | -2/+41 |
| |\ | |||||
| | * | 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 |
| |\ \ | |||||
| | * | | 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 |
| |\ \ | | |/ | |/| | |||||
| | * | 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 |
| |\ \ | |||||
| | * | | Use app name from stable9 | Joas Schilling | 2016-07-22 | 1 | -1/+1 |
| | * | | Fix typo | Joas Schilling | 2016-07-22 | 1 | -2/+2 |
| | |/ | |||||
* | | | Merge branch 'master' of https://github.com/nextcloud/server | root | 2016-07-22 | 18 | -20/+20 |
|\| | | |||||
| * | | Merge pull request #500 from nextcloud/bump_version | Joas Schilling | 2016-07-22 | 18 | -20/+20 |
| |\ \ | | |/ | |/| | |||||
| | * | Increase app versions | Joas Schilling | 2016-07-21 | 17 | -17/+17 |
| | * | Bump version | Roeland Jago Douma | 2016-07-21 | 1 | -3/+3 |
* | | | New LDAPProvider for user_ldap | root | 2016-07-22 | 26 | -98/+1074 |
|/ / | |||||
* | | [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 |
|\ \ | |||||
| * | | 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 |
|\ \ \ | |||||
| * | | | Change the app name | Joas Schilling | 2016-07-21 | 1 | -1/+1 |
| * | | | Make the changes from https://github.com/nextcloud/documentation/commit/6ccd2... | Joas Schilling | 2016-07-21 | 1 | -6/+6 |
| | |/ | |/| | |||||
* | | | Merge pull request #507 from nextcloud/run-le-script | Morris Jobke | 2016-07-21 | 1487 | -2939/+5010 |
|\ \ \ | |||||
| * | | | 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 | 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 do not get default response | Roeland Jago Douma | 2016-07-20 | 4 | -6/+25 |
* | | | | Merge pull request #506 from nextcloud/update-mailmap | Joas Schilling | 2016-07-21 | 1 | -7/+8 |
|\ \ \ \ | |||||
| * | | | | 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 | 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 | 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 |
|\ \ \ \ |