summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-03-0116-4/+74
* [tx-robot] updated from transifexJenkins for ownCloud2015-02-2812-6/+84
* Merge pull request #14530 from owncloud/revert-14403Thomas Müller2015-02-27272-4976/+2589
|\
| * Revert "Updating license headers"Morris Jobke2015-02-26272-4976/+2589
* | Merge pull request #14561 from owncloud/fix-sftpThomas Müller2015-02-271-1/+4
|\ \
| * | apply suggestions from @atmoz to fix SFTP setupMorris Jobke2015-02-261-1/+4
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-2720-0/+20
* | | Merge pull request #14532 from owncloud/defaultvalueforremoteidVincent Petry2015-02-262-1/+2
|\ \ \ | |/ / |/| |
| * | Bump up files_sharing version for schema updateVincent Petry2015-02-261-1/+1
| * | Add default value for remote_idVincent Petry2015-02-261-0/+1
| |/
* | Merge pull request #14300 from owncloud/commandbusMorris Jobke2015-02-261-0/+2
|\ \
| * | Rename getAsyncCommandBus to getCommandBusRobin Appelman2015-02-251-1/+1
| * | require command that do file access to be run sync when encryption is enabledRobin Appelman2015-02-251-0/+2
* | | Merge pull request #14473 from owncloud/remove-uneeded-assignmentMorris Jobke2015-02-261-2/+0
|\ \ \ | |_|/ |/| |
| * | Remove uneeded assignmentLukas Reschke2015-02-241-2/+0
* | | Merge pull request #14502 from owncloud/failing-mysql-master-testsThomas Müller2015-02-263-3/+16
|\ \ \
| * | | Sort the array to be sureJoas Schilling2015-02-261-1/+8
| * | | Reset the group backend aswellJoas Schilling2015-02-251-1/+7
| * | | Extend the class so the Filesystem is cleaned upJoas Schilling2015-02-251-1/+1
| | |/ | |/|
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-2672-76/+92
* | | Merge pull request #14509 from owncloud/fix/14231Lukas Reschke2015-02-251-1/+7
|\ \ \
| * | | Show 404 page when accessing empty share URLLukas Reschke2015-02-251-1/+7
* | | | Merge pull request #14245 from cmeh/masterLukas Reschke2015-02-251-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Typo: Missing "n"cmeh2015-02-241-1/+1
* | | | Merge pull request #10735 from owncloud/use_remote_addrRobin McCorkell2015-02-251-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Use getRemoteAddress which supports reverse proxiesLukas Reschke2015-02-241-1/+1
* | | | Merge pull request #14462 from owncloud/add-some-php-docsThomas Müller2015-02-251-2/+70
|\ \ \ \
| * | | | Add some PHPDocsLukas Reschke2015-02-241-2/+70
| |/ / /
* | | | Merge pull request #14460 from owncloud/revive/12971Thomas Müller2015-02-251-3/+15
|\ \ \ \
| * | | | Fix code style as per reviewLukas Reschke2015-02-241-2/+2
| * | | | Add support for sftp custom portSA2015-02-241-3/+15
| |/ / /
* | | | Merge pull request #14475 from owncloud/fix-ext-owncloudRobin McCorkell2015-02-252-2/+10
|\ \ \ \
| * | | | Fix bugs in ownCloud external storageRobin McCorkell2015-02-252-2/+10
| | |_|/ | |/| |
* | | | Merge pull request #14151 from owncloud/update-sabre2.1Thomas Müller2015-02-253-299/+33
|\ \ \ \
| * | | | Remove locks plugin.Thomas Müller2015-02-252-4/+0
| * | | | Show a empty response for GET on non-files instead of the Browser PluginLukas Reschke2015-02-231-1/+2
| * | | | Removed broken webdav testsVincent Petry2015-02-231-272/+0
| * | | | Sabre Update to 2.1Vincent Petry2015-02-233-29/+38
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-2512-118/+150
| |/ / / |/| | |
* | | | Merge pull request #14068 from owncloud/autotest-external-sftpThomas Müller2015-02-243-4/+105
|\ \ \ \
| * | | | [files_external] sftp testsMorris Jobke2015-02-103-4/+105
* | | | | Merge pull request #13740 from owncloud/fix-12190-2Lukas Reschke2015-02-245-26/+85
|\ \ \ \ \
| * | | | | and escape the search termArthur Schiwon2015-01-293-1/+5
| * | | | | :lipstick:Arthur Schiwon2015-01-281-4/+4
| * | | | | fix counting of users in primary groupArthur Schiwon2015-01-282-24/+69
| * | | | | inlcude AD primary group in user filter, if a group is selected. fixes #12190Arthur Schiwon2015-01-281-2/+12
* | | | | | Fix code that never workedLukas Reschke2015-02-241-1/+1
| |_|_|/ / |/| | | |
* | | | | Merge pull request #14419 from owncloud/preview_apostrophe_fixJoas Schilling2015-02-241-2/+2
|\ \ \ \ \
| * | | | | fix issue with previews not being displayed if filename contains apostropheGeorg Ehrke2015-02-221-2/+2
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-244-8/+92
| |_|_|/ / |/| | | |