Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | adding PHPDoc comments | Thomas Müller | 2013-10-22 | 1 | -0/+7 |
| | |||||
* | prevent user from creating or renaming sth. to an existing filename | Jörn Friedrich Dreyer | 2013-10-22 | 6 | -435/+523 |
| | | | | | | | | - show tooltip when violating naming constraints while typing - when target filename exists on server fallback to dialog to interrupt the users flow because something unexpected went wrong - fixes #5062 - also fixes some whitespace and codestyle issues in files js - uses css selector over filterAttr in touched js files | ||||
* | Merge pull request #5455 from owncloud/fixing-2423-master | Thomas Müller | 2013-10-22 | 1 | -1/+1 |
|\ | | | | | introduce link_to_docs() and migrate links | ||||
| * | introduce link_to_docs() and migrate links | Thomas Müller | 2013-10-21 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #5441 from owncloud/files-sharewithlinkasnormaluserfix | Vincent Petry | 2013-10-21 | 2 | -0/+3 |
|\ \ | |/ |/| | Fixed share with link checkbox missing as regular user | ||||
| * | Fixed share with link checkbox missing as regular user | Vincent Petry | 2013-10-21 | 2 | -0/+3 |
| | | | | | | | | | | | | | | | | | | Instead of loading the app config setting "shareapi_allow_links" using a synchronous ajax call that fails when the user is not an admin, this fix puts the flag directly in the template so it doesn't need to be loaded afterwards. Fixes #5440 | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-10-21 | 1 | -0/+2 |
| | | |||||
* | | Merge pull request #5424 from owncloud/sharing-directlink | Vincent Petry | 2013-10-21 | 3 | -0/+14 |
|\ \ | |/ |/| | Added direct link in public share page | ||||
| * | unbold the 'Direct link' label | Jan-Christoph Borchardt | 2013-10-21 | 1 | -1/+4 |
| | | |||||
| * | reduce width of direct link input field | Jan-Christoph Borchardt | 2013-10-21 | 1 | -1/+1 |
| | | |||||
| * | Added direct link in public share page | Vincent Petry | 2013-10-18 | 3 | -0/+11 |
| | | | | | | | | Fixes #1167 | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-10-19 | 9 | -0/+54 |
| | | |||||
* | | LDAP: Fix base-comparison with multibyte characters, fixes #5081. Thanks to ↵ | Arthur Schiwon | 2013-10-19 | 1 | -1/+1 |
|/ | | | | @sfyang | ||||
* | Merge pull request #3219 from owncloud/disabled-links-ui | Frank Karlitschek | 2013-10-18 | 2 | -0/+46 |
|\ | | | | | Disabled links UI fixes | ||||
| * | Remove "link" shares right after disabling the "allow_link_share" setting | Morris Jobke | 2013-10-18 | 2 | -0/+46 |
| | | |||||
* | | Merge pull request #5412 from owncloud/fix_5141 | Björn Schießle | 2013-10-18 | 1 | -5/+5 |
|\ \ | | | | | | | give getSelectedFilesTrash() a unique name for the trash.js | ||||
| * | | give getSelectedFilesTrash() a unique name for the trash.js to avoid ↵ | Bjoern Schiessle | 2013-10-18 | 1 | -5/+5 |
| | | | | | | | | | | | | confusions with the same function in files.js | ||||
* | | | Merge pull request #5411 from owncloud/ocs_share_api_cleanup | Vincent Petry | 2013-10-18 | 1 | -13/+4 |
|\ \ \ | |_|/ |/| | | filter duplicates directly in the sql query | ||||
| * | | filter duplicates directly in the sql query | Bjoern Schiessle | 2013-10-18 | 1 | -13/+4 |
| |/ | |||||
* / | Disable versions app JS in public mode | Vincent Petry | 2013-10-17 | 1 | -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 #5382 from owncloud/sharing_api_include_reshares | Björn Schießle | 2013-10-17 | 2 | -27/+145 |
|\ | | | | | add reshare option for the OCS Share API | ||||
| * | split up reset()['path'] to make it compatible with older PHP versions | Bjoern Schiessle | 2013-10-17 | 1 | -1/+2 |
| | | |||||
| * | add test for the reshare option | Bjoern Schiessle | 2013-10-17 | 1 | -2/+59 |
| | | |||||
| * | adjust tests | Bjoern Schiessle | 2013-10-17 | 2 | -4/+3 |
| | | |||||
| * | new option to add reshares to the result | Bjoern Schiessle | 2013-10-17 | 1 | -24/+85 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-10-17 | 5 | -0/+8 |
| | | |||||
* | | Merge pull request #5393 from owncloud/files-downloadzipwhenzipsizeiszero | Morris Jobke | 2013-10-17 | 1 | -1/+2 |
|\ \ | | | | | | | Fixed zip download button for unlimited filesize in public mode | ||||
| * | | Fixed zip download button for unlimited filesize in public mode | Vincent Petry | 2013-10-17 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | Added missing condition to check whenever allowed zip size is unlimited. Fixes #3717 | ||||
* | | | Fixed sharing status update for new/uploaded files | Vincent Petry | 2013-10-17 | 4 | -7/+25 |
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creating new files, folders or uploading files now have their sharing icon updated accordingly. For this, the global share status list that is cached in OC.Share.statuses is reused for new files. Performance should improve as the sharing list is now only loaded once per navigation session. In OC.Share, split loadIcons into loadIcons + updateIcons. Fixes #4977 | ||||
* | | Merge pull request #5378 from owncloud/files-permissionsafteruploadfix | Morris Jobke | 2013-10-17 | 1 | -2/+7 |
|\ \ | | | | | | | Fixed upload permissions distinction between public and logged in upload | ||||
| * | | Fixed upload permissions distinction between public and logged in upload | Vincent Petry | 2013-10-17 | 1 | -2/+7 |
| | | | | | | | | | | | | Fixes #5370 | ||||
* | | | Merge pull request #4935 from owncloud/webdav-depth-fix-master | Frank Karlitschek | 2013-10-17 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | WebDAV depth infinity support - the dirty way | ||||
| * | | Contains ownCloud's own implementation of the Sabre_DAV_Server regarding the ↵ | Thomas Müller | 2013-09-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | handling of depth infinity The clean way would have been to submit proper patches to the upstream project and reincorporate the code once released. This will and has to follow! | ||||
* | | | Merge pull request #5262 from owncloud/files-ie8-conflictdialogbrokenfix | Morris Jobke | 2013-10-16 | 1 | -1/+5 |
|\ \ \ | | | | | | | | | Fixed conflict dialog in IE8 | ||||
| * | | | Fixed conflict dialog in IE8 | Vincent Petry | 2013-10-10 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | - Fixed JS error that prevent the conflict dialog to open #5060 - Fixed JS error that prevented the overwrite case to run | ||||
* | | | | Merge pull request #5353 from owncloud/files-dndtodirbroken | Morris Jobke | 2013-10-16 | 1 | -14/+22 |
|\ \ \ \ | |_|_|/ |/| | | | Fixed drag and drop to subfolder and breadcrumb | ||||
| * | | | Fixed drag and drop upload to breadcrumb | Vincent Petry | 2013-10-15 | 1 | -26/+22 |
| | | | | |||||
| * | | | Fixed drag and drop onto folders | Vincent Petry | 2013-10-15 | 1 | -5/+17 |
| | | | | | | | | | | | | | | | | Fixes #5351 | ||||
* | | | | Merge pull request #5329 from owncloud/enc_fix_unencrypted_size | Björn Schießle | 2013-10-16 | 1 | -2/+19 |
|\ \ \ \ | | | | | | | | | | | try to fix unencrypted file size if it doesn't look plausible | ||||
| * | | | | revert last changes | Bjoern Schiessle | 2013-10-16 | 1 | -3/+1 |
| | | | | | |||||
| * | | | | added another test, if unencrypted size and encrypted size are equal we can ↵ | Bjoern Schiessle | 2013-10-15 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | also assume that something is wrong | ||||
| * | | | | fix array key | Bjoern Schiessle | 2013-10-14 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | try to fix unencrypted file size if it doesn't look plausible | Bjoern Schiessle | 2013-10-14 | 1 | -2/+19 |
| | | | | | |||||
* | | | | | Merge pull request #5354 from owncloud/enc_tests | Morris Jobke | 2013-10-16 | 1 | -216/+106 |
|\ \ \ \ \ | | | | | | | | | | | | | added simple test for getFileSize proxy | ||||
| * | | | | | fix comment | Bjoern Schiessle | 2013-10-15 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | added simple test for getFileSize proxy | Bjoern Schiessle | 2013-10-15 | 1 | -216/+106 |
| | |/ / / | |/| | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-10-16 | 22 | -1/+61 |
| | | | | | |||||
* | | | | | Merge pull request #5334 from owncloud/files-sharing-actionsafterupload | Morris Jobke | 2013-10-15 | 3 | -23/+29 |
|\ \ \ \ \ | |/ / / / |/| | | | | Files sharing actions + navigation fixes | ||||
| * | | | | Disabled ajax mode for public files view | Vincent Petry | 2013-10-14 | 2 | -21/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ajax loading is not supported yet for public files view. This fix disabled the history API, ajax loading and ajax directory switch in public mode until it is implemented properly. | ||||
| * | | | | Fixed file permissions after public upload | Vincent Petry | 2013-10-14 | 1 | -2/+2 |
| |/ / / | | | | | | | | | | | | | Fixes #5328 |