summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2797 from nextcloud/issue-2734-sudo-password-with-ldapJoas Schilling2017-01-054-9/+18
|\
| * Remove warningJoas Schilling2017-01-051-1/+1
| * Fix testsJoas Schilling2017-01-051-1/+13
| * Make sure the loginname is set when logging in via cookieJoas Schilling2017-01-051-0/+1
| * Use login name to fix password confirm with ldap usersJoas Schilling2017-01-051-7/+3
* | Merge pull request #2922 from nextcloud/fopen-only-simple-modesRobin Appelman2017-01-051-14/+11
|\ \
| * | log a warning when trying to use a non basic fopen modeRobin Appelman2017-01-051-14/+11
| |/
* | Merge pull request #2535 from nextcloud/allow-to-reuse-admin-as-install-name-...Joas Schilling2017-01-051-7/+9
|\ \
| * | Allow to reuse the same name when installing a new instanceJoas Schilling2016-12-121-7/+9
* | | [tx-robot] updated from transifexNextcloud bot2017-01-0538-184/+464
* | | Merge pull request #2830 from nextcloud/downstream-fix-birthday-generation-in...Roeland Jago Douma2017-01-052-18/+56
|\ \ \ | |_|/ |/| |
| * | Fix generation of birthday, deathdate and anniversary in case where no year i...Thomas Müller2017-01-052-18/+56
|/ /
* | Merge pull request #2937 from nextcloud/remove-static-stream-wrapperRobin Appelman2017-01-048-250/+22
|\ \
| * | update autoloaderMorris Jobke2017-01-042-2/+0
| * | remove static:// stream wrapperRobin Appelman2017-01-046-248/+22
|/ /
* | Merge pull request #2933 from nextcloud/dont-link-to-oc-forumMorris Jobke2017-01-041-1/+1
|\ \
| * | Don't link to the oC forumJoas Schilling2017-01-041-1/+1
* | | [tx-robot] updated from transifexNextcloud bot2017-01-0444-48/+838
|/ /
* | Merge pull request #2923 from nextcloud/remove-fakedir-streamRobin Appelman2017-01-035-82/+0
|\ \
| * | update autoloaderMorris Jobke2017-01-033-7/+31
| * | remove no longer used fakedir stream wrapperRobin Appelman2017-01-033-80/+0
* | | Merge pull request #2921 from nextcloud/remove-unused-assetic-use-statementsLukas Reschke2017-01-031-8/+0
|\ \ \
| * | | remove unused Assetic use statementsChristoph Wurst2017-01-031-8/+0
|/ / /
* | | Merge pull request #2913 from nextcloud/update-root-authoritiesChristoph Wurst2017-01-031-8/+38
|\ \ \
| * | | Update bundled CA CertificatesLukas Reschke2017-01-021-8/+38
* | | | [tx-robot] updated from transifexNextcloud bot2017-01-038-0/+82
* | | | Merge pull request #2850 from nextcloud/downstream-26603Roeland Jago Douma2017-01-0212-62/+175
|\ \ \ \
| * | | | mention property to follow same styleArthur Schiwon2016-12-231-3/+4
| * | | | Fixed size issues on main detail view and disappearing of share recipients (#...Michael Jobst2016-12-2312-61/+173
* | | | | Merge pull request #2872 from nextcloud/admin-settings-split-dbMorris Jobke2017-01-028-279/+459
|\ \ \ \ \
| * | | | | phpdocRobin Appelman2017-01-021-4/+23
| * | | | | update autoloaderRobin Appelman2016-12-283-5/+33
| * | | | | split db logic from settings managerRobin Appelman2016-12-286-279/+438
| | |_|/ / | |/| | |
* | | | | Merge pull request #2712 from nextcloud/master-2648Morris Jobke2017-01-0213-41/+1827
|\ \ \ \ \
| * | | | | Fix legacy caldav endpointsRoeland Jago Douma2017-01-024-32/+23
| * | | | | Add test execution against legacy DAV backendLukas Reschke2017-01-0211-9/+1804
* | | | | | Merge pull request #2912 from nextcloud/increase-coverage-response.phpLukas Reschke2017-01-021-3/+24
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Add 100% coverage for response.phpLukas Reschke2017-01-021-3/+24
| |/ / / /
* | | | | Merge pull request #2911 from nextcloud/rebrand-to-nextcloud-server-crawlerLukas Reschke2017-01-022-9/+73
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Rebrand to "Nextcloud" and add 100% coverageLukas Reschke2017-01-022-9/+73
* | | | | Merge pull request #2909 from nextcloud/tests/remember-me-integration-testRoeland Jago Douma2017-01-023-20/+45
|\ \ \ \ \
| * | | | | Test remember-me loginChristoph Wurst2017-01-023-20/+45
* | | | | | Merge pull request #2159 from nextcloud/s3-objectstore-ciMorris Jobke2017-01-025-4/+42
|\ \ \ \ \ \
| * | | | | | adjust testRobin Appelman2017-01-021-4/+2
| * | | | | | add ci support for s3 object storeRobin Appelman2017-01-024-0/+40
|/ / / / / /
* | | | | | Merge pull request #2896 from nextcloud/3rdparty_masterRoeland Jago Douma2017-01-021-0/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Point 3rdparty to masterRoeland Jago Douma2017-01-021-0/+0
|/ / / / /
* | | | | [tx-robot] updated from transifexNextcloud bot2017-01-0230-400/+762
* | | | | [tx-robot] updated from transifexNextcloud bot2017-01-014-2/+76
* | | | | [tx-robot] updated from transifexNextcloud bot2016-12-318-4/+8