summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5424 from owncloud/sharing-directlinkVincent Petry2013-10-213-0/+14
|\ | | | | Added direct link in public share page
| * unbold the 'Direct link' labelJan-Christoph Borchardt2013-10-211-1/+4
| |
| * reduce width of direct link input fieldJan-Christoph Borchardt2013-10-211-1/+1
| |
| * Added direct link in public share pageVincent Petry2013-10-183-0/+11
| | | | | | | | Fixes #1167
* | Merge pull request #5434 from owncloud/fix5209blizzz2013-10-212-1/+19
|\ \ | | | | | | dispayNamesInGroup(s) should always return uid as key in the result array, fixes #5209
| * | Test that dispayNamesInGroup(s) always returns uid as key in the result arrayArthur Schiwon2013-10-201-0/+18
| | |
| * | dispayNamesInGroup(s) should always return uid as key in the result attr, ↵Arthur Schiwon2013-10-201-1/+1
| | | | | | | | | | | | fixes #5209
* | | Merge pull request #5200 from owncloud/ie8-warning-fixFrank Karlitschek2013-10-201-0/+5
|\ \ \ | | | | | | | | Fix warning box in IE8
| * | | Fix warning box in IE8Morris Jobke2013-10-161-0/+5
| | | | | | | | | | | | | | | | * simulates a black transparent background on a blue pane
* | | | Merge pull request #5433 from owncloud/inputs-seem-disabledJan-Christoph Borchardt2013-10-201-2/+4
|\ \ \ \ | |_|/ / |/| | | input field background size to white, fix input fields seeming disabled,...
| * | | remove superfluous input hover color changeJan-Christoph Borchardt2013-10-201-1/+1
| | | |
| * | | input field background size to white, fix input fields seeming disabled, fix ↵Jan-Christoph Borchardt2013-10-201-1/+3
|/ / / | | | | | | | | | #5168
* | | Merge pull request #5429 from owncloud/fix_cron_docuFrank Karlitschek2013-10-201-2/+2
|\ \ \ | | | | | | | | harmonize this with the documentation. Once every minute is way to often.
| * | | change the languageFrank Karlitschek2013-10-201-2/+2
| | | |
| * | | harmonize this with the documentation. Once every minute is way to often. ↵Frank Karlitschek2013-10-191-2/+2
| | | | | | | | | | | | | | | | Every 15min should be fine just as the documentation suggests: http://doc.owncloud.org/server/5.0/admin_manual/configuration/background_jobs.html
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-2012-12/+12
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-1961-514/+3716
|/ / /
* | | LDAP: Fix base-comparison with multibyte characters, fixes #5081. Thanks to ↵Arthur Schiwon2013-10-191-1/+1
| | | | | | | | | | | | @sfyang
* | | Merge pull request #5422 from owncloud/fix_logfile_permissionsFrank Karlitschek2013-10-181-0/+1
|\ \ \ | |_|/ |/| | the logfile shoudn't be world readable.
| * | 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 dropdown
| * | 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 #5158
| * | | 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 scrollbar
| * | | | Fixed app list right container to not overlap left container scrollbarVincent Petry2013-10-141-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Container widths in apps list now use pixels instead of em - Container widths now match properly and rightcontainer doesn't overlap the scrollbar any more
* | | | | Merge pull request #3219 from owncloud/disabled-links-uiFrank Karlitschek2013-10-185-1/+81
|\ \ \ \ \ | | | | | | | | | | | | Disabled links UI fixes
| * | | | | 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
| * | | | | | give getSelectedFilesTrash() a unique name for the trash.js to avoid ↵Bjoern Schiessle2013-10-181-5/+5
| | |_|/ / / | |/| | | | | | | | | | | | | | | | confusions with the same function in files.js
* | | | | | Merge pull request #5411 from owncloud/ocs_share_api_cleanupVincent Petry2013-10-181-13/+4
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | filter duplicates directly in the sql query
| * | | | | 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 mode
| * | | | | Disable versions app JS in public modeVincent Petry2013-10-171-0/+7
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the version JS code isn't used in public link mode, disable it to prevent Chrome freezing bugs due to the t() call being synchronous. Fixes #4545
* | | | | 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
| * | | | | add options to disable the check for a working .htaccess file in data and ↵Frank Karlitschek2013-10-172-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | for a working WebDAV server. This are advanced settings that are needed in special situations where our check fail and the user runs into an http timeout.
* | | | | | Merge pull request #5358 from owncloud/postinstall-ocdavclientwithtimeoutVincent Petry2013-10-182-1/+49
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Added timeout for WebDAV post setup check
| * | | | | Fixed spacesVincent Petry2013-10-171-3/+3
| | | | | |
| * | | | | Added timeout value to WebDAV post setup checkVincent Petry2013-10-161-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #5357
| * | | | | Added DAV client wrapper that support timeout valuesVincent Petry2013-10-161-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since SabreDAV does not support passing a timeout value to curl, this commit adds a subclass for it that will set the timeout value to curlRequest().
* | | | | | Merge pull request #5382 from owncloud/sharing_api_include_resharesBjörn Schießle2013-10-172-27/+145
|\ \ \ \ \ \ | | | | | | | | | | | | | | add reshare option for the OCS Share API
| * | | | | | 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
| | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-08 15:48:38 +0000