summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-02-11212-1336/+1732
* Merge pull request #3417 from nextcloud/push-notificationMorris Jobke2017-02-102-2/+27
|\
| * Make sure to use the right appdata directoryJoas Schilling2017-02-091-0/+7
| * Save the used token id in the session so it can be used later onJoas Schilling2017-02-091-2/+20
* | Merge pull request #3430 from nextcloud/fix-ios-client-detectionMorris Jobke2017-02-105-11/+10
|\ \
| * | Fix detection of the new iOS appJoas Schilling2017-02-105-11/+10
* | | Merge pull request #3443 from nextcloud/add-integration-tests-for-davblizzz2017-02-108-31/+90
|\ \ \
| * | | Add integration tests for legacy DAV endpointsLukas Reschke2017-02-108-31/+90
* | | | Merge pull request #3371 from m3ntalsp00n/reload_countdownblizzz2017-02-102-4/+40
|\ \ \ \ | |/ / / |/| | |
| * | | Fix indentation and l10n compliance.m3ntalsp00n2017-02-081-3/+3
| * | | fix tests, longer wait time, update notification stubm3ntalsp00n2017-02-041-2/+4
| * | | showUpdate funciton allows updated messagesm3ntalsp00n2017-02-041-2/+36
* | | | Merge pull request #3424 from nextcloud/fix-upgrade-pathBjörn Schießle2017-02-101-1/+1
|\ \ \ \
| * | | | Fix return value of getAllowedPreviousVersions()Morris Jobke2017-02-091-1/+1
| | |/ / | |/| |
* | | | Merge pull request #3425 from nextcloud/set-vendor-during-installBjörn Schießle2017-02-101-0/+15
|\ \ \ \
| * | | | Set vendor during installMorris Jobke2017-02-091-0/+15
| |/ / /
* | | | Merge pull request #3181 from nextcloud/fix-favorite-activity-mailBjörn Schießle2017-02-102-12/+28
|\ \ \ \
| * | | | Make sure the file information is available when sending the emailJoas Schilling2017-01-202-12/+28
* | | | | Merge pull request #3429 from nextcloud/oparoz-issuetemplateJoas Schilling2017-02-101-0/+3
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix log formattingOlivier Paroz2017-02-101-0/+3
|/ / / /
* | | | Merge pull request #3422 from nextcloud/transifexMorris Jobke2017-02-092-0/+6
|\ \ \ \
| * | | | add transifex config for sharebymailMorris Jobke2017-02-092-0/+6
|/ / / /
* | | | [tx-robot] updated from transifexNextcloud bot2017-02-1018-6/+42
* | | | Merge pull request #3297 from nextcloud/cloud-id-resolveRobin Appelman2017-02-0935-231/+707
|\ \ \ \
| * | | | fix copyright headersRobin Appelman2017-02-094-3/+11
| * | | | clean cloud idsRobin Appelman2017-02-093-11/+10
| * | | | add testsRobin Appelman2017-02-083-1/+146
| * | | | register cloudidmanager for files_sharingRobin Appelman2017-02-081-0/+4
| * | | | log ocs exceptionsRobin Appelman2017-02-081-0/+1
| * | | | remove test for removed codeRobin Appelman2017-02-081-22/+0
| * | | | Add a single public api for resolving a cloud id to a user and remote and backRobin Appelman2017-02-0832-209/+550
* | | | | Merge pull request #3184 from nextcloud/issue-3165Lukas Reschke2017-02-093-105/+48
|\ \ \ \ \
| * | | | | Prevent migration from ownCloud 11 to Nextcloud 12Joas Schilling2017-01-233-105/+48
* | | | | | Merge pull request #3408 from nextcloud/nullstorage-free-spaceJoas Schilling2017-02-092-2/+4
|\ \ \ \ \ \
| * | | | | | Fix unit testsMorris Jobke2017-02-081-1/+2
| * | | | | | return unknown free space from nullstorageRobin Appelman2017-02-081-1/+2
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #3396 from nextcloud/dont-log-password-on-failed-confirmationLukas Reschke2017-02-091-1/+2
|\ \ \ \ \ \
| * | | | | | Don't log the password on confirmPassword when LDAP throws an exceptionJoas Schilling2017-02-071-1/+2
* | | | | | | Merge pull request #3407 from nextcloud/issue-3312-user-settings-email-accoun...Björn Schießle2017-02-091-0/+17
|\ \ \ \ \ \ \
| * | | | | | | Update the email in the accounts table as wellJoas Schilling2017-02-081-0/+17
* | | | | | | | Merge pull request #3362 from nextcloud/fix/nc-token-cookie-nameJoas Schilling2017-02-094-5/+5
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | oc_token should be nc_tokenChristoph Wurst2017-02-024-5/+5
* | | | | | | | [tx-robot] updated from transifexNextcloud bot2017-02-0940-1092/+1300
| |_|_|/ / / / |/| | | | | |
* | | | | | | Merge pull request #3394 from nextcloud/issue-3344-files-activity-expects-par...Lukas Reschke2017-02-088-768/+541
|\ \ \ \ \ \ \
| * | | | | | | Fix files sharing legacy as wellJoas Schilling2017-02-087-750/+296
| * | | | | | | Add tests for getUser()Joas Schilling2017-02-071-0/+71
| * | | | | | | Add tests for getFile()Joas Schilling2017-02-072-11/+149
| * | | | | | | Make sure ownCloud 8.2 activities also can get displayedJoas Schilling2017-02-071-12/+30
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #3403 from nextcloud/rename-dbpassword-toggleJoas Schilling2017-02-082-9/+9
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Rename database password toggleMorris Jobke2017-02-072-9/+9
| |/ / / / /