summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/nextcloud/serverroot2016-07-2577-175/+346
|\
| * Merge pull request #530 from nextcloud/fix-theme-loadingMorris Jobke2016-07-252-2/+10
| |\
| | * Make sure we try to autoload the classJoas Schilling2016-07-222-2/+10
| * | [tx-robot] updated from transifexNextcloud bot2016-07-2510-6/+78
| * | [tx-robot] updated from transifexNextcloud bot2016-07-2410-2/+24
| * | Merge pull request #533 from nextcloud/oparoz-ns-server-contributing.mdRoeland Douma2016-07-231-1/+1
| |\ \
| | * | change core to serverOlivier Paroz2016-07-231-1/+1
| * | | Merge pull request #534 from nextcloud/twofactor-issetJoas Schilling2016-07-231-9/+11
| |\ \ \ | | |/ / | |/| |
| | * | Check if an app provide two-factor-auth providers before we try to use themRobin Appelman2016-07-231-9/+11
| |/ /
| * / [tx-robot] updated from transifexNextcloud bot2016-07-2328-124/+150
| |/
| * Fix search box overlapping on mobile (#450)Jan-Christoph Borchardt2016-07-223-7/+7
| * Merge pull request #524 from nextcloud/ocs_appframework_status_codeLukas Reschke2016-07-222-2/+41
| |\
| | * 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
| |\ \
| | * | 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
| |\ \ | | |/ | |/|
| | * 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
| |\ \
| | * | Use app name from stable9Joas Schilling2016-07-221-1/+1
| | * | Fix typoJoas Schilling2016-07-221-2/+2
| | |/
* | | Merge branch 'master' of https://github.com/nextcloud/serverroot2016-07-2218-20/+20
|\| |
| * | Merge pull request #500 from nextcloud/bump_versionJoas Schilling2016-07-2218-20/+20
| |\ \ | | |/ | |/|
| | * Increase app versionsJoas Schilling2016-07-2117-17/+17
| | * Bump versionRoeland Jago Douma2016-07-211-3/+3
* | | New LDAPProvider for user_ldaproot2016-07-2226-98/+1074
|/ /
* | [tx-robot] updated from transifexNextcloud bot2016-07-22114-174/+200
* | Merge pull request #505 from nextcloud/fix-license-scriptMorris Jobke2016-07-211-4/+8
|\ \
| * | 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
|\ \ \
| * | | Change the app nameJoas Schilling2016-07-211-1/+1
| * | | Make the changes from https://github.com/nextcloud/documentation/commit/6ccd2...Joas Schilling2016-07-211-6/+6
| | |/ | |/|
* | | Merge pull request #507 from nextcloud/run-le-scriptMorris Jobke2016-07-211487-2939/+5010
|\ \ \
| * | | 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. #181Derek2016-07-203-7/+27
* | | | Merge pull request #480 from nextcloud/fix_ocs_response_formatLukas Reschke2016-07-214-6/+25
|\ \ \ \ | |_|/ / |/| | |
| * | | AppFramework do not get default responseRoeland Jago Douma2016-07-204-6/+25
* | | | Merge pull request #506 from nextcloud/update-mailmapJoas Schilling2016-07-211-7/+8
|\ \ \ \
| * | | | 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 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 placeBjoern Schiessle2016-07-201-1/+1
* | | | Merge pull request #484 from nextcloud/reenable-help-sectionMorris Jobke2016-07-212-8/+6
|\ \ \ \