summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-02-1522-64/+354
* Merge pull request #3480 from nextcloud/screensharing-iconMorris Jobke2017-02-145-0/+44
|\
| * add screensharing iconJan-Christoph Borchardt2017-02-145-0/+44
* | Merge pull request #3477 from nextcloud/fix-cloud-id-manager-injectionMorris Jobke2017-02-143-1/+7
|\ \ | |/ |/|
| * Fix DI of the cloud id manager into appsJoas Schilling2017-02-143-1/+7
* | Merge pull request #3341 from nextcloud/transparent-white-checkboxJan-Christoph Borchardt2017-02-143-8/+14
|\ \
| * | Transparent white checkboxJohn Molakvoæ (skjnldsv)2017-01-313-8/+14
* | | Merge pull request #3472 from nextcloud/enable-avatars-alwaysMorris Jobke2017-02-1419-138/+46
|\ \ \
| * | | Always enable avatarsMorris Jobke2017-02-1319-138/+46
* | | | Merge pull request #3465 from nextcloud/storage-log-locksLukas Reschke2017-02-145-3/+97
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add missing PHPDoc and properly throw exceptionMorris Jobke2017-02-134-0/+8
| * | | Add storage to log item as wellLukas Reschke2017-02-131-3/+33
| * | | Add comment about log.conditionMorris Jobke2017-02-131-0/+1
| * | | Add option to enable locking debug loggingRobin Appelman2017-02-132-3/+58
| |/ /
* | | [tx-robot] updated from transifexNextcloud bot2017-02-1468-206/+1094
* | | Merge pull request #3444 from nextcloud/recognize-bat-and-cmdMorris Jobke2017-02-133-3/+20
|\ \ \
| * | | Recognize .bat and .cmd filesJoas Schilling2017-02-103-3/+20
* | | | Merge pull request #3324 from nextcloud/fix-2431Lukas Reschke2017-02-133-36/+85
|\ \ \ \
| * | | | LDAP's checkPassword should only catch when a user was not found, fixes #2431Arthur Schiwon2017-01-303-36/+85
* | | | | Merge pull request #3448 from kuimovvg/masterLukas Reschke2017-02-131-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | bug when connect to yandex webdav servervkuimov2017-02-101-1/+1
* | | | | [tx-robot] updated from transifexNextcloud bot2017-02-1316-60/+248
* | | | | [tx-robot] updated from transifexNextcloud bot2017-02-1230-10/+314
* | | | | [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