summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* LDAP: Fix base-comparison with multibyte characters, fixes #5081. Thanks to @...Arthur Schiwon2013-10-191-1/+1
* Merge pull request #5422 from owncloud/fix_logfile_permissionsFrank Karlitschek2013-10-181-0/+1
|\
| * the logfile shoudn't be world readable.Frank Karlitschek2013-10-181-0/+1
|/
* Merge pull request #5338 from frisco82/fixGroupDisplayMorris Jobke2013-10-181-1/+4
|\
| * Show (group) after groups in share dropdownRamiro Aparicio2013-10-141-1/+4
* | Merge pull request #5403 from owncloud/fix-breadcrumbsJan-Christoph Borchardt2013-10-181-1/+2
|\ \
| * | correctly position ... overflow in breadcrumbs, fix #5158Jan-Christoph Borchardt2013-10-171-1/+2
* | | Merge pull request #5321 from owncloud/settings-applistwidthsVincent Petry2013-10-181-1/+5
|\ \ \
| * | | Fixed app list right container to not overlap left container scrollbarVincent Petry2013-10-141-1/+5
* | | | Merge pull request #3219 from owncloud/disabled-links-uiFrank Karlitschek2013-10-185-1/+81
|\ \ \ \
| * | | | Remove "link" shares right after disabling the "allow_link_share" settingMorris Jobke2013-10-184-0/+64
| * | | | readability: single line -> multiple linesMorris Jobke2013-10-181-4/+10
| * | | | Fix accidental deletion of ifMichael Gapczynski2013-10-181-0/+1
| * | | | Don't show links option in dropdown if disabledMichael Gapczynski2013-10-181-1/+6
| * | | | Don't return links for shared files if disabledMichael Gapczynski2013-10-181-0/+4
* | | | | Use display name from magic cookie, fixes #4884Arthur Schiwon2013-10-181-0/+1
* | | | | Merge pull request #5412 from owncloud/fix_5141Björn Schießle2013-10-181-5/+5
|\ \ \ \ \
| * | | | | give getSelectedFilesTrash() a unique name for the trash.js to avoid confusio...Bjoern Schiessle2013-10-181-5/+5
| | |_|/ / | |/| | |
* | | | | Merge pull request #5411 from owncloud/ocs_share_api_cleanupVincent Petry2013-10-181-13/+4
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | filter duplicates directly in the sql queryBjoern Schiessle2013-10-181-13/+4
| |/ / /
* | | | Merge pull request #5405 from owncloud/sharing-chromehangswithversionenabledMorris Jobke2013-10-181-0/+7
|\ \ \ \
| * | | | Disable versions app JS in public modeVincent Petry2013-10-171-0/+7
| |/ / /
* | | | Merge pull request #5395 from owncloud/more_check_optionsVincent Petry2013-10-182-0/+13
|\ \ \ \
| * | | | add options to disable the check for a working .htaccess file in data and for...Frank Karlitschek2013-10-172-0/+13
* | | | | Merge pull request #5358 from owncloud/postinstall-ocdavclientwithtimeoutVincent Petry2013-10-182-1/+49
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fixed spacesVincent Petry2013-10-171-3/+3
| * | | | Added timeout value to WebDAV post setup checkVincent Petry2013-10-161-1/+3
| * | | | Added DAV client wrapper that support timeout valuesVincent Petry2013-10-161-0/+46
* | | | | Merge pull request #5382 from owncloud/sharing_api_include_resharesBjörn Schießle2013-10-172-27/+145
|\ \ \ \ \
| * | | | | split up reset()['path'] to make it compatible with older PHP versionsBjoern Schiessle2013-10-171-1/+2
| * | | | | add test for the reshare optionBjoern Schiessle2013-10-171-2/+59
| * | | | | adjust testsBjoern Schiessle2013-10-172-4/+3
| * | | | | new option to add reshares to the resultBjoern Schiessle2013-10-171-24/+85
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-17140-2722/+2503
* | | | | | Merge pull request #5393 from owncloud/files-downloadzipwhenzipsizeiszeroMorris Jobke2013-10-171-1/+2
|\ \ \ \ \ \
| * | | | | | Fixed zip download button for unlimited filesize in public modeVincent Petry2013-10-171-1/+2
* | | | | | | Merge pull request #5392 from owncloud/update-3rdparty-submoduleMorris Jobke2013-10-171-0/+0
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | update 3rdparty submoduleThomas Müller2013-10-171-0/+0
* | | | | | | Merge pull request #5394 from owncloud/sabre-server-locationThomas Müller2013-10-171-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Move OC_Connector_Sabre_Server to expected location.Andreas Fischer2013-10-171-0/+0
| |/ / / / /
* | | | | | Merge pull request #5389 from owncloud/fix_shell_execMorris Jobke2013-10-172-4/+4
|\ \ \ \ \ \
| * | | | | | fix commentGeorg Ehrke2013-10-171-1/+1
| * | | | | | only call shell_exec if enabledGeorg Ehrke2013-10-172-3/+3
| |/ / / / /
* | | | | | Merge pull request #5381 from owncloud/files-sharingstateafteruploadMorris Jobke2013-10-175-46/+83
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Added missing var in share.jsVincent Petry2013-10-171-0/+1
| * | | | | Fixed sharing status update for new/uploaded filesVincent Petry2013-10-175-46/+82
* | | | | | Merge pull request #5385 from owncloud/generate-sql-migration-masterMorris Jobke2013-10-173-1/+68
|\ \ \ \ \ \
| * | | | | | new console command to generate sql migration scriptsThomas Müller2013-10-173-1/+68
* | | | | | | Merge pull request #5379 from owncloud/undefined-shippedFrank Karlitschek2013-10-171-5/+5
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | fix undefined "shipped"Morris Jobke2013-10-171-5/+5