Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #5628 from owncloud/files-fixsummary | VicDeo | 2013-10-30 | 1 | -6/+7 |
|\ | | | | | Fixed summary visibility check | ||||
| * | Fixed summary visibility check | Vincent Petry | 2013-10-30 | 1 | -6/+7 |
| | | | | | | | | | | Now using the integer values to check whether to show the summary parts instead of trying to parse the html code. | ||||
* | | Prevent closing the create dropdown when right clicking in Firefox | Vincent Petry | 2013-10-30 | 1 | -1/+5 |
|/ | | | | | | | Firefox sends a click event on the document when right clicking which makes pasting with right click into the field impossible. Fixes #5498 | ||||
* | Merge pull request #5616 from owncloud/fixing-l10n-master | Vincent Petry | 2013-10-30 | 2 | -2/+2 |
|\ | | | | | Fixing l10n master | ||||
| * | avoid usage of brand name 'ownCloud' | Thomas Müller | 2013-10-28 | 2 | -2/+2 |
| | | |||||
* | | Added fix to correctly parse non-array error messages | Vincent Petry | 2013-10-29 | 1 | -2/+7 |
| | | | | | | | | Some apps like the antivirus app return messages in a non-array format. | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-10-29 | 18 | -7/+193 |
|/ | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-10-27 | 48 | -48/+100 |
| | |||||
* | Fix double not in newfile/newfolder language. | Andreas Fischer | 2013-10-27 | 2 | -2/+2 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-10-27 | 70 | -501/+251 |
| | |||||
* | Merge pull request #5494 from owncloud/fixing-3593-master | Thomas Müller | 2013-10-24 | 1 | -0/+1 |
|\ | | | | | introducing new dav property {xmlns:oc="http://owncloud.org/ns}id | ||||
| * | introducing new dav property {xmlns:oc="http://owncloud.org/ns}id | Thomas Müller | 2013-10-23 | 1 | -0/+1 |
| | | |||||
* | | Merge pull request #5477 from ↵ | Thomas Müller | 2013-10-23 | 7 | -457/+579 |
|\ \ | | | | | | | | | | | | | owncloud/prevent_user_from_creating_or_renaming_to_an_existing_filename prevent user from creating or renaming sth. to an existing filename | ||||
| * | | fix translations | Jörn Friedrich Dreyer | 2013-10-23 | 2 | -10/+10 |
| | | | |||||
| * | | Merge branch 'master' into ↵ | Jörn Friedrich Dreyer | 2013-10-23 | 4 | -13/+34 |
| |\| | | | | | | | | | | | | | | | | | | | prevent_user_from_creating_or_renaming_to_an_existing_filename Conflicts: apps/files/js/filelist.js | ||||
| * | | use a more descriptive error message when the user tries to create '/Shared' | Jörn Friedrich Dreyer | 2013-10-23 | 2 | -3/+3 |
| | | | |||||
| * | | cleanup array value assignment | Jörn Friedrich Dreyer | 2013-10-23 | 1 | -8/+4 |
| | | | |||||
| * | | cleanup precondition checking when creating new files / folders | Jörn Friedrich Dreyer | 2013-10-23 | 2 | -19/+50 |
| | | | | | | | | | | | | | | | | | | - use i18n - use trim when checking for empty file / folder name - use more verbose error descriptions | ||||
| * | | use correct filename in error result json | Jörn Friedrich Dreyer | 2013-10-23 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' into ↵ | Thomas Müller | 2013-10-22 | 1 | -3/+29 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | prevent_user_from_creating_or_renaming_to_an_existing_filename Conflicts: apps/files/js/filelist.js | ||||
| * | | | fixing js syntax error | Thomas Müller | 2013-10-22 | 1 | -2/+2 |
| | | | | |||||
| * | | | fixing undefined variable $newname | Thomas Müller | 2013-10-22 | 1 | -1/+1 |
| | | | | |||||
| * | | | 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 #5435 from owncloud/share-improvements | Thomas Müller | 2013-10-23 | 1 | -1/+1 |
|\ \ \ \ | |_|_|/ |/| | | | Share improvements | ||||
| * | | | improve wording of permission notice | Jan-Christoph Borchardt | 2013-10-20 | 1 | -1/+1 |
| | | | | |||||
| * | | | beautify 'you dont have write permissions' notice, fix #2770 | Jan-Christoph Borchardt | 2013-10-20 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #5310 from owncloud/hide_filestable-header_when_empty | Christopher Schäpers | 2013-10-22 | 3 | -10/+24 |
|\ \ \ \ | | | | | | | | | | | Hide files list header, when theres no files to see | ||||
| * | | | | Fixed empty content logic | Vincent Petry | 2013-10-21 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | - Remove obsolete code that used another approach for hiding emptycontent - Fixed logic for the showing of the empty content message | ||||
| * | | | | Fix mind-boggling emptycontent logic | kondou | 2013-10-21 | 3 | -6/+8 |
| | | | | | |||||
| * | | | | Fix shared folder still showing fileheader | kondou | 2013-10-21 | 2 | -3/+3 |
| | | | | | |||||
| * | | | | Improve updateEmptyContent logic | kondou | 2013-10-20 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Create FileList.updateEmptyContent() and fix not showing emptycontent after ↵ | kondou | 2013-10-20 | 1 | -5/+10 |
| | | | | | | | | | | | | | | | | | | | | deletion | ||||
| * | | | | Hide files list header, when theres no files to see | kondou | 2013-10-12 | 3 | -5/+12 |
| | | | | | |||||
* | | | | | Merge pull request #5466 from owncloud/files-thumbnailloadingdelaystyle | Thomas Müller | 2013-10-22 | 1 | -2/+10 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Fixed ugly white space while loading file thumbnail | ||||
| * | | | | Fixed ugly white space while loading file thumbnail | Vincent Petry | 2013-10-22 | 1 | -2/+10 |
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Preview images are now pre-loaded before being set on the file element. This fixes #5135 and prevents a white space to be displayed while the thumbnails is being loaded. | ||||
* / | | | Added FileList.setViewerMode to hide controls | Vincent Petry | 2013-10-22 | 1 | -0/+25 |
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some files app embed themselves under the controls (like the text editor). The new method FileList.setViewerMode() makes it possible to properly show/hide the control buttons using the correct permissions. Apps using this approach must call setViewerMode(true) when starting and setViewerMode(false) upon closing to restore the controls. This is needed for #5284 | ||||
* | / | 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-19 | 2 | -0/+22 |
| | | |||||
* | | 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 | ||||
* | | Fixed sharing status update for new/uploaded files | Vincent Petry | 2013-10-17 | 3 | -4/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 |