summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* docker containers should be stopped before being removed - refs https://githu...Thomas Müller2016-03-098-0/+9
* Merge pull request #23008 from owncloud/only_query_file_folder_sharesThomas Müller2016-03-091-10/+51
|\
| * Select queries in the default share provider should query for file/folderRoeland Jago Douma2016-03-091-10/+51
* | Merge pull request #22930 from owncloud/bugfix-submit-disable-password-length...Thomas Müller2016-03-092-2/+12
|\ \
| * | Public link share disabled if password length is equal to 0prastut2016-03-082-2/+12
* | | Merge pull request #22951 from owncloud/fix_intThomas Müller2016-03-091-2/+2
|\ \ \
| * | | Fix capabilities intergration testsRoeland Jago Douma2016-03-081-2/+2
* | | | Merge pull request #22961 from owncloud/fix-gdrive-on-php54Thomas Müller2016-03-091-1/+2
|\ \ \ \
| * | | | Fix compatibility with PHP 5.4Lukas Reschke2016-03-081-1/+2
| |/ / /
* | | | Merge pull request #22972 from owncloud/use-httpclient-instead-of-file-get-co...Thomas Müller2016-03-091-27/+23
|\ \ \ \
| * | | | Use HTTPClient instead of file_get_contentsLukas Reschke2016-03-081-27/+23
* | | | | Merge pull request #22974 from owncloud/php-automagics-type-conversion-is-funThomas Müller2016-03-091-2/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Use "hasKey" instead of checking the valueLukas Reschke2016-03-081-2/+2
| |/ / /
* / / / [tx-robot] updated from transifexJenkins for ownCloud2016-03-0928-8/+124
|/ / /
* | | Merge pull request #22950 from owncloud/fixsharemountrecursionRoeland Douma2016-03-083-3/+10
|\ \ \ | |/ / |/| |
| * | Fix share mounting recursionVincent Petry2016-03-083-3/+10
|/ /
* | Merge pull request #22936 from owncloud/fix-group-share-migration-for-calenda...Thomas Müller2016-03-085-18/+31
|\ \
| * | Fix group sharing and sharing permissions - fixes #22932Thomas Müller2016-03-085-18/+31
* | | Merge pull request #22814 from owncloud/delete-empty-fileThomas Müller2016-03-081-0/+0
|\ \ \ | |/ / |/| |
| * | Delete empty fileLukas Reschke2016-03-031-0/+0
* | | Merge pull request #22800 from owncloud/fix-20536Thomas Müller2016-03-081-0/+3
|\ \ \
| * | | don't hide server not available exception, fixes #20536Arthur Schiwon2016-03-031-0/+3
* | | | Merge pull request #22885 from owncloud/master-show-version-to-update-toThomas Müller2016-03-082-3/+6
|\ \ \ \
| * | | | Show version to update to properlyLukas Reschke2016-03-052-3/+6
* | | | | Merge pull request #22915 from owncloud/cleanup_ocs_share_apiThomas Müller2016-03-081-57/+37
|\ \ \ \ \
| * | | | | Can't convert node to stringRoeland Jago Douma2016-03-071-1/+6
| * | | | | Move common code to functionRoeland Jago Douma2016-03-071-56/+31
* | | | | | Merge pull request #22918 from owncloud/remove-double-encoding-in-nameThomas Müller2016-03-081-4/+0
|\ \ \ \ \ \
| * | | | | | Remove double URL encodingLukas Reschke2016-03-071-4/+0
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-0836-24/+130
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge pull request #22921 from owncloud/add-before-commandThomas Müller2016-03-071-0/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Initialize submodules for Scrutinizer as wellLukas Reschke2016-03-071-0/+3
|/ / / / /
* | | | | Merge pull request #22880 from owncloud/fix-21656Thomas Müller2016-03-072-1/+4
|\ \ \ \ \
| * | | | | improve log output when no LDAP user was found on login attemptArthur Schiwon2016-03-052-1/+4
* | | | | | Merge pull request #22911 from owncloud/fix-failing-migrationThomas Müller2016-03-076-28/+68
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Calendar and addressbook migration commands are always availableThomas Müller2016-03-071-10/+2
| * | | | | Handle addressbook migration issue by writing the faulty event to the log and...Thomas Müller2016-03-073-7/+32
| * | | | | Handle calendar migration issue by writing the faulty event to the log and co...Thomas Müller2016-03-073-11/+34
* | | | | | Merge pull request #22900 from owncloud/diskfreespace-filesworkaroundThomas Müller2016-03-071-1/+9
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix call to disk_free_space when a file is providedVincent Petry2016-03-071-1/+9
* | | | | | Merge pull request #22902 from owncloud/share-archivenamedownloadallThomas Müller2016-03-072-3/+5
|\ \ \ \ \ \
| * | | | | | Remove "files" arg from download URL in public link pageVincent Petry2016-03-071-2/+4
| * | | | | | Fix archive file name when downloading public shareVincent Petry2016-03-071-1/+1
| |/ / / / /
* | | | | | Merge pull request #22898 from owncloud/quota-allowuploadwhenfreespaceisunlim...Thomas Müller2016-03-071-1/+1
|\ \ \ \ \ \
| * | | | | | Fix uploading when free space is unlimitedVincent Petry2016-03-071-1/+1
| |/ / / / /
* | | | | | Merge pull request #22872 from owncloud/password-change-tooltip-textThomas Müller2016-03-071-0/+2
|\ \ \ \ \ \
| * | | | | | Update error text for link passwordsMorris Jobke2016-03-041-0/+2
* | | | | | | Merge pull request #22815 from prastut/feature-enhance-loginflowThomas Müller2016-03-071-0/+11
|\ \ \ \ \ \ \
| * | | | | | | trigger login if remember_login checkedprastut2016-03-041-0/+11
* | | | | | | | Merge pull request #22812 from owncloud/node-lockThomas Müller2016-03-072-0/+75
|\ \ \ \ \ \ \ \