summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Make scrutinizer happyJoas Schilling2015-04-014-4/+4
* Add logic for getting the user from the rss token to the ManagerJoas Schilling2015-03-303-2/+81
* Merge pull request #15269 from owncloud/migrate-checksetup-and-add-memcacheRobin McCorkell2015-03-302-38/+8
|\
| * Add check for activated local memcacheLukas Reschke2015-03-282-38/+8
* | [tx-robot] updated from transifexJenkins for ownCloud2015-03-3020-0/+48
|/
* 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
* | Check for relative datadirectory pathRobin McCorkell2015-03-271-5/+11
|/
* 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-271-11/+48
|\
| * Do not return shares for files outside "files"Vincent Petry2015-03-271-11/+48
* | Merge pull request #13938 from owncloud/deprecate-iappconfigThomas Müller2015-03-275-9/+134
|\ \
| * | migrate share helper method to IConfigMorris Jobke2015-03-181-3/+5
| * | 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-273-10/+20
|\ \ \
| * | | add priority to storage wrappersRobin Appelman2015-03-263-10/+20
* | | | Merge pull request #15265 from owncloud/enc2_fixesThomas Müller2015-03-275-6/+28
|\ \ \ \
| * | | | 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-272-4/+17
* | | | | 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 #15227 from owncloud/ocetag-headerVincent Petry2015-03-271-0/+46
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Copy Etag header to OC-Etag for sabre callsVincent Petry2015-03-261-0/+46
* | | | | Merge pull request #15225 from owncloud/make-setups-for-users-that-tend-to-us...Morris Jobke2015-03-271-0/+9
|\ \ \ \ \
| * | | | | Add some generic default headers as well via PHPLukas Reschke2015-03-261-0/+9
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-27124-510/+12
* | | | | | Filter potential dangerous characters in path nameLukas Reschke2015-03-261-0/+5
* | | | | | Merge pull request #13654 from oparoz/tmpfile-with-extensionVincent Petry2015-03-262-3/+10
|\ \ \ \ \ \
| * | | | | | Make the method compatible with all types of extensionsOlivier Paroz2015-03-191-1/+4
| * | | | | | Fix the office classOlivier Paroz2015-03-191-3/+7
| * | | | | | Keep the extension in temp filesOlivier Paroz2015-03-191-1/+1
* | | | | | | Merge pull request #14925 from owncloud/ext-mountoptions-uiRobin McCorkell2015-03-261-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Make sure mountOptions keep their data typeVincent Petry2015-03-261-1/+1
* | | | | | | | Merge pull request #13802 from owncloud/share-partfilepermissionsMorris Jobke2015-03-261-6/+15
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Fix permission checks in Sabre connectorVincent Petry2015-03-191-6/+15
* | | | | | | | Merge pull request #14488 from owncloud/enhancement/security/inline-dispositionMorris Jobke2015-03-261-0/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove unneeded argumentLukas Reschke2015-03-261-1/+1
| * | | | | | | | Serve all files with a Content-Disposition of 'attachment' via WebDAVLukas Reschke2015-03-261-0/+19
* | | | | | | | | Merge pull request #15234 from owncloud/encryption2_coreThomas Müller2015-03-2616-2/+2244
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | implement basic encryption functionallity in core to enable multiple encrypti...Bjoern Schiessle2015-03-2616-2/+2244
* | | | | | | | | Merge pull request #14399 from owncloud/ignore-empty-pluralsLukas Reschke2015-03-262-21/+3
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Revert "Correctly fallback to english, if the plural case is not translated"Joas Schilling2015-02-202-21/+3
* | | | | | | | | Merge pull request #15129 from owncloud/version-command-busLukas Reschke2015-03-263-3/+16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | check limit of serialized command in unit testsRobin Appelman2015-03-261-0/+3
| * | | | | | | | | ensure commands can be serialized in unit testsRobin Appelman2015-03-261-1/+4
| * | | | | | | | | Handle exceptions thrown during hooks when running unit testsRobin Appelman2015-03-261-0/+3
| * | | | | | | | | Force test cases using background commands to handle setting up the filesystemRobin Appelman2015-03-262-2/+6
* | | | | | | | | | Merge pull request #15232 from owncloud/remove-arg-separator-magicLukas Reschke2015-03-261-1/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove custom `arg_separator.output`Lukas Reschke2015-03-261-1/+0
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #14665 from owncloud/fileid-incrementMorris Jobke2015-03-264-0/+123
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |