summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Nextcloud license header for new filesroot2016-07-283-24/+31
* Merge branch 'master' of https://github.com/nextcloud/serverroot2016-07-2712-7/+117
|\
| * [tx-robot] updated from transifexNextcloud bot2016-07-272-0/+2
| * Merge pull request #292 from nextcloud/recent-filesWilliam Bargent2016-07-255-2/+98
| |\
| | * use limit instead of since when listing recent filesRobin Appelman2016-07-223-45/+11
| | * add recent files to node apiRobin Appelman2016-07-224-1/+131
| | * Fix storage id with storage jailRobin Appelman2016-07-221-1/+1
| * | Merge pull request #509 from nextcloud/appframework_magic_allow_default_varsMorris Jobke2016-07-251-0/+6
| |\ \
| | * | Inject parametersRoeland Jago Douma2016-07-221-0/+6
| | |/
| * | Merge pull request #550 from nextcloud/ldap-integration-test-autoloaderMorris Jobke2016-07-251-1/+1
| |\ \
| | * | fix autoloading in LPAP integration tests, resolves #544Arthur Schiwon2016-07-251-1/+1
| * | | Merge pull request #523 from Faldon/masterJoas Schilling2016-07-253-4/+10
| |\ \ \
| | * | | Changed code style and made use of '===' comparison.Thomas Pulzer2016-07-221-1/+4
| | * | | Reverted the default syslog tag to avoid breaking existing systems.Thomas Pulzer2016-07-221-1/+1
| | * | | Changed logtype to file instead of owncloud.Thomas Pulzer2016-07-224-5/+8
| | | |/ | | |/|
* | | | final changesroot2016-07-273-13/+10
* | | | Merge branch 'master' of https://github.com/nextcloud/serverroot2016-07-2514-26/+55
|\| | |
| * | | 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-252-0/+4
| | |_|/ | |/| |
| * | | [tx-robot] updated from transifexNextcloud bot2016-07-242-0/+4
| * | | 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-236-14/+20
| |/ /
| * / Set proper status code in OCS AppFramework MiddlewareRoeland Jago Douma2016-07-221-1/+6
| |/
* / New LDAPProvider for user_ldaproot2016-07-224-0/+218
|/
* [tx-robot] updated from transifexNextcloud bot2016-07-228-0/+8
* Merge pull request #507 from nextcloud/run-le-scriptMorris Jobke2016-07-21673-1330/+2138
|\
| * Update with robinJoas Schilling2016-07-21278-272/+278
| * Fix othersJoas Schilling2016-07-21673-1061/+1863
* | 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
* | Revert "Remove "Help" link from personal sidebar"Lukas Reschke2016-07-211-4/+2
* | Merge branch 'master' of https://github.com/nextcloud/serverLukas Reschke2016-07-212-4/+4
|\ \
| * | [tx-robot] updated from transifexNextcloud bot2016-07-212-4/+4
* | | Fix typoLukas Reschke2016-07-211-1/+1
|/ /
* | Link to proper clientsLukas Reschke2016-07-211-4/+3
* | Port https://github.com/nextcloud/server/commit/2d373416d8e54a7de84879a365c37...Lukas Reschke2016-07-212-1/+19
* | Use proper certificatesLukas Reschke2016-07-211-2/+9
* | Use proper documentation linksLukas Reschke2016-07-211-2/+2
* | Merge pull request #479 from nextcloud/add-bruteforce-throttlerLukas Reschke2016-07-217-22/+282
|\ \ | |/ |/|
| * Mitigate race conditionLukas Reschke2016-07-201-1/+4
| * JSON encode the valuesLukas Reschke2016-07-201-1/+1
| * Implement brute force protectionLukas Reschke2016-07-207-22/+279
* | Merge pull request #476 from nextcloud/port-same-site-cookiesLukas Reschke2016-07-208-1/+198
|\ \
| * | [master] Port Same-Site Cookies to masterLukas Reschke2016-07-208-1/+198
| |/
* | Merge pull request #466 from nextcloud/escape-special-charactersLukas Reschke2016-07-202-3/+3
|\ \
| * | Escape special characters (#25429)Aaron Wood2016-07-202-3/+3
* | | Deprecate \OCP\APIRoeland Jago Douma2016-07-201-0/+2
* | | Add OCSMiddleware to catch OCS exceptionsRoeland Jago Douma2016-07-206-0/+253
* | | Merge pull request #462 from nextcloud/master-explodeMorris Jobke2016-07-201-1/+1
|\ \ \ | |_|/ |/| |