Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Nextcloud bot | 2017-02-16 | 6 | -8/+16 |
* | Merge pull request #2606 from temparus/master | blizzz | 2017-02-15 | 2 | -3/+13 |
|\ | |||||
| * | Update license header | Sandro Lutz | 2017-02-07 | 2 | -0/+4 |
| * | Merge remote-tracking branch 'nextcloud/master' | Sandro Lutz | 2017-02-07 | 1293 | -19077/+36242 |
| |\ | |||||
| * | | Add missing use statement for PublicEmitter | Sandro Lutz | 2017-02-07 | 1 | -0/+1 |
| * | | Fix typo for UserManager variable | Sandro Lutz | 2017-02-01 | 1 | -1/+1 |
| * | | Add check if UserManager is of type PublicEmitter before calling preLogin hook | Sandro Lutz | 2017-02-01 | 2 | -2/+6 |
| * | | Change where preLogin hook gets called | Sandro Lutz | 2017-02-01 | 2 | -3/+4 |
| * | | Remove preLoginValidation hook | Sandro Lutz | 2017-02-01 | 2 | -6/+0 |
| * | | Fix indentation | Sandro Lutz | 2017-02-01 | 2 | -4/+4 |
| * | | Add preLoginValidation hook | Sandro Lutz | 2017-02-01 | 2 | -0/+6 |
* | | | Merge pull request #3495 from nextcloud/dav-protected | Roeland Jago Douma | 2017-02-15 | 1 | -7/+7 |
|\ \ \ | |||||
| * | | | Make it easier to subclass DAV storage | Robin Appelman | 2017-02-15 | 1 | -7/+7 |
* | | | | Merge pull request #3449 from nextcloud/notify-subfolder-self-test | Roeland Jago Douma | 2017-02-15 | 1 | -3/+8 |
|\ \ \ \ | |||||
| * | | | | fix self test for non leading slash | Robin Appelman | 2017-02-10 | 1 | -2/+2 |
| * | | | | Make the notify self test for subfolders more reliable | Robin Appelman | 2017-02-10 | 1 | -1/+6 |
* | | | | | Merge pull request #3447 from nextcloud/getmetadata-permissions-mask | Roeland Jago Douma | 2017-02-15 | 2 | -1/+10 |
|\ \ \ \ \ | |||||
| * | | | | | also apply permissions mask in getMetaData | Robin Appelman | 2017-02-10 | 2 | -1/+10 |
| |/ / / / | |||||
* | | | | | Merge pull request #3262 from nextcloud/jail-scanner-storage-id | Roeland Jago Douma | 2017-02-15 | 3 | -7/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Make sure we use the correct storage id when scanning a jailed storage | Robin Appelman | 2017-01-25 | 3 | -7/+3 |
* | | | | | | Merge pull request #2704 from nextcloud/2fa-fix-backup-codes-print | Roeland Jago Douma | 2017-02-15 | 1 | -9/+11 |
|\ \ \ \ \ \ | |||||
| * | | | | | | add title to backup codes print page | Christoph Wurst | 2017-01-17 | 1 | -0/+1 |
| * | | | | | | print and close the new tab, not the current one when printing backup codes | Christoph Wurst | 2017-01-17 | 1 | -9/+10 |
* | | | | | | | Merge pull request #3421 from espro/freeipa-uuid-fix | Morris Jobke | 2017-02-15 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Update uuidAttributes list to include FreeIPA's ipauniqueid | Brent Bloxam | 2017-02-10 | 1 | -1/+1 |
* | | | | | | | | Merge pull request #3485 from nextcloud/Popovermenu-files-css-fix | blizzz | 2017-02-15 | 1 | -4/+0 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Css fix | John Molakvoæ (skjnldsv) | 2017-02-15 | 1 | -4/+0 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #3473 from nextcloud/fix-addressbook-deletion | blizzz | 2017-02-15 | 4 | -3/+30 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | this is public | John Molakvoæ (skjnldsv) | 2017-02-14 | 1 | -1/+1 |
| * | | | | | | | | Test fix | John Molakvoæ (skjnldsv) | 2017-02-14 | 1 | -1/+1 |
| * | | | | | | | | tests | John Molakvoæ (skjnldsv) | 2017-02-14 | 1 | -1/+1 |
| * | | | | | | | | getUsersOwnAddressBooks | John Molakvoæ (skjnldsv) | 2017-02-14 | 2 | -1/+28 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge pull request #3487 from nextcloud/fix-files-header-name | blizzz | 2017-02-15 | 3 | -13/+0 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix app name of files app | Morris Jobke | 2017-02-14 | 3 | -13/+0 |
* | | | | | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-02-15 | 22 | -64/+354 |
* | | | | | | | | | Merge pull request #3480 from nextcloud/screensharing-icon | Morris Jobke | 2017-02-14 | 5 | -0/+44 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | add screensharing icon | Jan-Christoph Borchardt | 2017-02-14 | 5 | -0/+44 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge pull request #3477 from nextcloud/fix-cloud-id-manager-injection | Morris Jobke | 2017-02-14 | 3 | -1/+7 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Fix DI of the cloud id manager into apps | Joas Schilling | 2017-02-14 | 3 | -1/+7 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge pull request #3341 from nextcloud/transparent-white-checkbox | Jan-Christoph Borchardt | 2017-02-14 | 3 | -8/+14 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Transparent white checkbox | John Molakvoæ (skjnldsv) | 2017-01-31 | 3 | -8/+14 |
* | | | | | | | | | Merge pull request #3472 from nextcloud/enable-avatars-always | Morris Jobke | 2017-02-14 | 19 | -138/+46 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Always enable avatars | Morris Jobke | 2017-02-13 | 19 | -138/+46 |
* | | | | | | | | | | Merge pull request #3465 from nextcloud/storage-log-locks | Lukas Reschke | 2017-02-14 | 5 | -3/+97 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Add missing PHPDoc and properly throw exception | Morris Jobke | 2017-02-13 | 4 | -0/+8 |
| * | | | | | | | | | Add storage to log item as well | Lukas Reschke | 2017-02-13 | 1 | -3/+33 |
| * | | | | | | | | | Add comment about log.condition | Morris Jobke | 2017-02-13 | 1 | -0/+1 |
| * | | | | | | | | | Add option to enable locking debug logging | Robin Appelman | 2017-02-13 | 2 | -3/+58 |
| |/ / / / / / / / | |||||
* | | | | | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-02-14 | 68 | -206/+1094 |
* | | | | | | | | | Merge pull request #3444 from nextcloud/recognize-bat-and-cmd | Morris Jobke | 2017-02-13 | 3 | -3/+20 |
|\ \ \ \ \ \ \ \ \ |