summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3884 from nextcloud/downstream-26956Joas Schilling2017-03-204-4/+45
|\
| * Use DIJoas Schilling2017-03-171-1/+1
| * Skip null groups in group manager (#26871) (#26956)Vincent Petry2017-03-174-4/+45
* | Merge pull request #3868 from nextcloud/issue-3834-escape-theming-footerJoas Schilling2017-03-202-5/+6
|\ \
| * | Don't use private apiJoas Schilling2017-03-201-1/+2
| * | Correctly escape the footer description from themingJoas Schilling2017-03-172-5/+5
* | | Merge pull request #3950 from nextcloud/downstream-27149Lukas Reschke2017-03-202-1/+6
|\ \ \
| * | | Fix grammarLukas Reschke2017-03-201-1/+1
| * | | Add ignore_files to config,Felix Heidecke2017-03-202-1/+6
* | | | Merge pull request #3946 from nextcloud/downstream-27263Roeland Jago Douma2017-03-201-0/+4
|\ \ \ \
| * | | | Fix public link download buttonVincent Petry2017-03-201-0/+4
| |/ / /
* / / / Log files:scan exception, add InterruptedExceptionVincent Petry2017-03-201-8/+10
|/ / /
* | | [tx-robot] updated from transifexNextcloud bot2017-03-2016-46/+336
* | | Merge pull request #3906 from nextcloud/shares-circles-2Roeland Jago Douma2017-03-197-9/+117
|\ \ \
| * | | shares-circlesMaxence Lange2017-03-177-9/+117
* | | | Merge pull request #3913 from cwickert/masterRoeland Jago Douma2017-03-191-1/+1
|\ \ \ \
| * | | | DummyGetResponsePlugin: ownCloud -> NexcloudChristoph Wickert2017-03-181-1/+1
| |/ / /
* | | | [tx-robot] updated from transifexNextcloud bot2017-03-198-0/+348
* | | | [tx-robot] updated from transifexNextcloud bot2017-03-1810-0/+182
|/ / /
* | | Merge pull request #3887 from nextcloud/downstream-26379Morris Jobke2017-03-173-0/+377
|\ \ \
| * | | Safer queriesJoas Schilling2017-03-171-2/+2
| * | | Better outputJoas Schilling2017-03-171-10/+13
| * | | Add CleanupRemoteStorages commandJörn Friedrich Dreyer2017-03-173-0/+374
* | | | Merge pull request #3886 from nextcloud/downstream-26995Joas Schilling2017-03-172-1/+13
|\ \ \ \
| * | | | Chunking NG: Assemble in natural sort order of filesMarkus Goetz2017-03-172-1/+13
| | |_|/ | |/| |
* | | | Merge pull request #2824 from nextcloud/ext-storage-expireversionsMorris Jobke2017-03-163-10/+29
|\ \ \ \ | |_|/ / |/| | |
| * | | Properly expire ext storage versions (#26601)Vincent Petry2017-03-103-10/+29
* | | | [tx-robot] updated from transifexNextcloud bot2017-03-1736-498/+838
| |/ / |/| |
* | | Merge pull request #3679 from nextcloud/socialsharingLukas Reschke2017-03-161-0/+19
|\ \ \
| * | | Fix layout of sharing buttonsMorris Jobke2017-03-141-0/+8
| * | | Move social buttons to menuRoeland Jago Douma2017-03-031-0/+11
* | | | Don't set the HTTP status twiceJoas Schilling2017-03-161-1/+0
| |_|/ |/| |
* | | Merge pull request #3802 from Ko-/masterRoeland Jago Douma2017-03-162-2/+6
|\ \ \
| * | | Check that set_time_limit is not disabled before calling itKo-2017-03-112-2/+6
* | | | Fix scheduling plugin on legacy caldav endpointJoas Schilling2017-03-161-1/+1
* | | | [tx-robot] updated from transifexNextcloud bot2017-03-1650-68/+18
* | | | 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 #3848 from nextcloud/remove-single-quotes-around-search-queryRoeland Jago Douma2017-03-151-1/+1
|\ \ \ \ \
| * | | | | Remove single quotes around search query like in user searchJoas Schilling2017-03-151-1/+1
* | | | | | 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-1512-30/+126
* | | | | | | fix mockMaxence Lange2017-03-141-1/+1
* | | | | | | switch reshares to trueMaxence Lange2017-03-141-1/+1
* | | | | | | Merge pull request #3600 from coletivoEITA/masterRoeland Jago Douma2017-03-141-2/+2
|\ \ \ \ \ \ \
| * | | | | | | added method needsPartFile() in StorageVinicius Cubas Brand2017-03-141-2/+2
* | | | | | | | Merge pull request #3824 from nextcloud/dav-search-getlastmodifiedRobin Appelman2017-03-142-3/+9
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | safer casting of datetimeRobin Appelman2017-03-141-1/+5