summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #15042 from wolfgangkarall/masterLukas Reschke2015-03-301-2/+2
|\
| * use permanent redirect for .well-known/(cal|card)dav, add 'L' flagWolfgang Karall2015-03-191-2/+2
* | Merge pull request #15269 from owncloud/migrate-checksetup-and-add-memcacheRobin McCorkell2015-03-3010-92/+382
|\ \
| * | Add check for activated local memcacheLukas Reschke2015-03-2810-92/+382
* | | Merge pull request #13964 from rullzer/capabilitiesMorris Jobke2015-03-303-0/+280
|\ \ \
| * | | Mark functions privateRoeland Jago Douma2015-03-111-2/+2
| * | | Slight better formattingRoeland Jago Douma2015-03-112-47/+11
| * | | New array syntaxRoeland Jago Douma2015-03-112-56/+56
| * | | Added new headerRoeland Jago Douma2015-03-112-11/+35
| * | | Now added enabled elementRoeland Jago Douma2015-03-112-9/+13
| * | | Added route againRoeland Jago Douma2015-03-111-0/+6
| * | | Add file_sharing info to capabilitiesRoeland Jago Douma2015-03-112-0/+282
* | | | Merge pull request #15239 from owncloud/see-no-evilMorris Jobke2015-03-305-21/+127
|\ \ \ \
| * | | | Fix link to the updaterJoas Schilling2015-03-272-1/+6
| * | | | fix layout for Sharing settingsJan-Christoph Borchardt2015-03-272-14/+17
| * | | | Move federated cloud sharing, files externals and updater to special positionsJoas Schilling2015-03-274-8/+106
* | | | | Merge pull request #15295 from owncloud/add-more-spacing-dialogMorris Jobke2015-03-302-2/+2
|\ \ \ \ \
| * | | | | Add more spacing to the file picker dialogLukas Reschke2015-03-282-2/+2
| | |_|/ / | |/| | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-3026-0/+62
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-2956-18/+74
|/ / / /
* | | | Merge pull request #15289 from owncloud/min-upload-limitVincent Petry2015-03-281-3/+7
|\ \ \ \
| * | | | Require minimum 1 MiB upload limitRobin McCorkell2015-03-271-3/+7
* | | | | Merge pull request #15288 from owncloud/check-datadir-relativeVincent Petry2015-03-282-5/+30
|\ \ \ \ \
| * | | | | Check for relative datadirectory pathRobin McCorkell2015-03-272-5/+30
| |/ / / /
* / / / / [tx-robot] updated from transifexJenkins for ownCloud2015-03-28116-40/+240
|/ / / /
* | | | Merge pull request #15284 from owncloud/revert-master-breakageMorris Jobke2015-03-274-129/+6
|\ \ \ \
| * | | | Revert "Deprecated \OCP\IAppConfig - add missing methods to IConfig"Vincent Petry2015-03-274-129/+6
|/ / / /
* | | | Merge pull request #15155 from owncloud/share-donotreturntrashedfilesMorris Jobke2015-03-272-11/+88
|\ \ \ \
| * | | | Add logout in share test to avoid nasty side effectsVincent Petry2015-03-271-0/+1
| * | | | Do not return shares for files outside "files"Vincent Petry2015-03-272-11/+87
* | | | | Merge pull request #13938 from owncloud/deprecate-iappconfigThomas Müller2015-03-277-18/+155
|\ \ \ \ \
| * | | | | migrate share helper method to IConfigMorris Jobke2015-03-181-3/+5
| * | | | | fix unit testsMorris Jobke2015-03-171-5/+15
| * | | | | fix failing unit testMorris Jobke2015-03-171-4/+6
| * | | | | Deprecated \OCP\IAppConfig - add missing methods to IConfigMorris Jobke2015-03-174-6/+129
* | | | | | Merge pull request #15240 from owncloud/storage-wrapper-priorityThomas Müller2015-03-274-10/+47
|\ \ \ \ \ \
| * | | | | | add priority to storage wrappersRobin Appelman2015-03-264-10/+47
* | | | | | | Merge pull request #15261 from owncloud/fix-14268-masterThomas Müller2015-03-273-47/+10
|\ \ \ \ \ \ \
| * | | | | | | use StreamResponse to download the log file - fixes #14268Thomas Müller2015-03-273-47/+10
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #15265 from owncloud/enc2_fixesThomas Müller2015-03-276-6/+63
|\ \ \ \ \ \ \
| * | | | | | | add deleteAllFileKeys to public interface and add "uid" as parameter for theBjoern Schiessle2015-03-273-2/+11
| * | | | | | | fix check if a file is excluded from encryption or notBjoern Schiessle2015-03-273-4/+52
* | | | | | | | Merge pull request #15247 from owncloud/fix_group_share_master_backportMorris Jobke2015-03-271-4/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | also call generateTarget for group share to add the correct prefix if share_f...Bjoern Schiessle2015-03-261-4/+5
* | | | | | | | | Merge pull request #15254 from owncloud/fix-14853-masterThomas Müller2015-03-272-11/+60
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Adding a pending indicator to the files summary - fixes #14853Thomas Müller2015-03-272-11/+60
* | | | | | | | | | Merge pull request #15259 from owncloud/fix-change-password-ie8Vincent Petry2015-03-272-1/+15
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | Show label for password change in IE8Morris Jobke2015-03-272-1/+15
* | | | | | | | | | Merge pull request #15227 from owncloud/ocetag-headerVincent Petry2015-03-273-0/+90
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Copy Etag header to OC-Etag for sabre callsVincent Petry2015-03-263-0/+90
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-02 17:38:28 +0000