summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3788 from nextcloud/fed-share-modifyRoeland Jago Douma2017-03-152-21/+59
|\
| * Add api to change the remote of an incoming federated shareRobin Appelman2017-03-102-21/+59
* | Merge pull request #3843 from nextcloud/encryption-fix-mail-shareJoas Schilling2017-03-151-3/+3
|\ \
| * | take share by mail into consideration if we calculate the access listBjoern Schiessle2017-03-141-3/+3
* | | Merge pull request #3848 from nextcloud/remove-single-quotes-around-search-queryRoeland Jago Douma2017-03-152-4/+4
|\ \ \
| * | | Remove single quotes around search query like in user searchJoas Schilling2017-03-152-4/+4
* | | | Merge pull request #3841 from nextcloud/encyryption-trash-binBjörn Schießle2017-03-154-14/+34
|\ \ \ \
| * | | | delete files right away in case of a encryption exceptionBjoern Schiessle2017-03-142-8/+29
| * | | | always throw a encryption exceptionBjoern Schiessle2017-03-142-6/+5
| | |/ / | |/| |
* | | | [tx-robot] updated from transifexNextcloud bot2017-03-1524-98/+220
* | | | Merge pull request #3838 from Xuanwo/basename-fixRoeland Jago Douma2017-03-141-1/+2
|\ \ \ \
| * | | | [OC/Files/Cache]: Fix wrong usage of basenameXuanwo2017-03-141-1/+2
| |/ / /
* | | | Merge pull request #3829 from nextcloud/reshares-in-folderRoeland Jago Douma2017-03-142-2/+2
|\ \ \ \
| * | | | fix mockMaxence Lange2017-03-141-1/+1
| * | | | switch reshares to trueMaxence Lange2017-03-141-1/+1
|/ / / /
* | | | Merge pull request #3836 from nextcloud/do-not-double-check-app-updateRoeland Jago Douma2017-03-142-9/+4
|\ \ \ \
| * | | | Do not double cherck app updateMorris Jobke2017-03-132-9/+4
| | |/ / | |/| |
* | | | Merge pull request #3600 from coletivoEITA/masterRoeland Jago Douma2017-03-144-2/+18
|\ \ \ \
| * | | | added method needsPartFile() in StorageVinicius Cubas Brand2017-03-144-2/+18
* | | | | Merge pull request #3783 from andrius-kulbis/masterRoeland Jago Douma2017-03-141-1/+2
|\ \ \ \ \
| * | | | | Fix detecting deleted shares in object storeAndrius2017-03-091-1/+2
* | | | | | Merge pull request #3824 from nextcloud/dav-search-getlastmodifiedRobin Appelman2017-03-142-3/+9
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | safer casting of datetimeRobin Appelman2017-03-141-1/+5
| * | | | | fix unit testMorris Jobke2017-03-131-1/+1
| * | | | | fix searching and ordering on getlastmodifiedRobin Appelman2017-03-131-2/+4
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-03-1414-198/+266
* | | | | | Merge pull request #3827 from nextcloud/issue-3826-remove-double-password-con...Morris Jobke2017-03-132-3/+7
|\ \ \ \ \ \
| * | | | | | Remove the double password confirmation on changing cronJoas Schilling2017-03-132-3/+7
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #3828 from nextcloud/no-no-empty-wildcard-searchLukas Reschke2017-03-131-0/+4
|\ \ \ \ \ \
| * | | | | | dont allow empty wildcard searchRobin Appelman2017-03-131-0/+4
| |/ / / / /
* | | | | | Merge pull request #3648 from nextcloud/sabre-3.2.2Lukas Reschke2017-03-133-9/+9
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Make intergration tests work againRoeland Jago Douma2017-03-101-3/+3
| * | | | | Fix testsRoeland Jago Douma2017-03-101-6/+6
| * | | | | [3rdparty] Bump sabre/dav to 3.2.2Roeland Jago Douma2017-03-101-0/+0
* | | | | | Merge pull request #3822 from nextcloud/webui-upoad-no-mtimeRobin Appelman2017-03-131-5/+0
|\ \ \ \ \ \
| * | | | | | dont preserve mtime when uploading trough the web interfaceRobin Appelman2017-03-131-5/+0
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #3814 from nextcloud/oc-27328-delay-language-initialisationRoeland Jago Douma2017-03-135-59/+59
|\ \ \ \ \ \
| * | | | | | use closure to properly defer l10n initialization (#27328)Jörn Friedrich Dreyer2017-03-135-59/+59
* | | | | | | Merge pull request #3819 from nextcloud/dont-add-user-to-subadminRoeland Jago Douma2017-03-131-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Call right function after sudo modeLukas Reschke2017-03-131-1/+1
| |/ / / / /
* | | | | | Merge pull request #3780 from GitHubUser4234/audit_log_agentLukas Reschke2017-03-131-0/+3
|\ \ \ \ \ \
| * | | | | | author updateRoger Szabo2017-03-101-0/+1
| * | | | | | improvement of userAgent variable assigmentRoger Szabo2017-03-101-1/+1
| * | | | | | log user agent globally insteadRoger Szabo2017-03-102-4/+2
| * | | | | | audit log the user-agentRoger Szabo2017-03-091-0/+4
* | | | | | | Merge pull request #3803 from Thijsdh/masterLukas Reschke2017-03-131-0/+6
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Create app password by pressing enterThijs den Hartog2017-03-131-0/+6
* | | | | | | Merge pull request #3772 from nextcloud/favorite-searchMorris Jobke2017-03-137-23/+155
|\ \ \ \ \ \ \
| * | | | | | | Allow searching for favoritesRobin Appelman2017-03-087-23/+155
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | [tx-robot] updated from transifexNextcloud bot2017-03-1318-6/+92