summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* typos, naming, remove unused code, identationThomas Müller2014-04-283-53/+39
|
* Fixed drag and drop into folder and onto breadcrumbVincent Petry2014-04-283-82/+211
| | | | | Fixed drag and drop code to use FileList.getSelectedFiles() instead of the visible DOM elements.
* Fixed selection summary calculation issueVincent Petry2014-04-282-3/+27
|
* Cleanup of event handlersVincent Petry2014-04-281-32/+32
| | | | | Now using _.bind() for event handlers so we can use "this" which is more readable than a static access to FileList.
* Cleanup and fix trashbin "clear all files" operationVincent Petry2014-04-282-6/+2
|
* Fixed drag shadow file sortingVincent Petry2014-04-281-0/+1
|
* Fixed selection to be based on FileList.filesVincent Petry2014-04-285-161/+289
| | | | | | | | | | The file selection is now based on the internal model array FileList.files instead of the visible checkboxes. This makes it possible to virtually select files that haven't been rendered yet (select all, then deselect a visible one) Added more unit tests for selection (with shift and ctrl as well)
* Fix trashbin previews and "delete selected"Vincent Petry2014-04-282-4/+4
|
* Make sure there are always enough elements visible on the pageVincent Petry2014-04-282-0/+18
|
* Fixed insertion of filesVincent Petry2014-04-284-40/+169
| | | | | | | | | Removed "insert" flag, inserting is by default for FileList.add(). Added "animate" flag to FileList.add(). Added logic to correctly detect when to insert/append elements whenever the insertion point is visible or not. Fixed "render next page" logic to work correctly when many pages of files have been added.
* Fixed file sorting to work with scrollingVincent Petry2014-04-282-106/+150
| | | | | | | | | The FileList.files model is now updated with file operations. Adding files to the list will add to the model first, then to the DOM. If the insertion point isn't visible yet, the file won't be added to the DOM until the user scrolls down. Updated unit tests to include checking for the correct insertion point.
* Fix file selection for infinite scrollingVincent Petry2014-04-288-379/+626
| | | | | | | - moved file selection code to FileList - fix selection summary when all files are selected - nextPage now auto-selects files if "select all" checkbox is checked - fixed trashbin to use the same selection logic as FileList
* Fix file summary to use the whole file listVincent Petry2014-04-2812-138/+342
| | | | | | - moved the summary code into a new class FileSummary - FileSummary is calculated only once, then updated with add/remove - added new OC.Util namespace for JS utility functions
* Added infinite scrolling (in-memory list)Vincent Petry2014-04-282-6/+71
|
* Merge pull request #8381 from owncloud/files_irodsThomas Müller2014-04-2882-8015/+0
|\ | | | | drop files_irods from apps_external
| * drop files_irods from apps_externalThomas Müller2014-04-2882-8015/+0
| |
* | Merge pull request #8309 from DavidPrevot/chosenThomas Müller2014-04-281-1/+1
|\ \ | |/ |/| Adapt chosen (css) path
| * Adapt chosen (css) pathDavid Prévot2014-04-221-1/+1
| | | | | | | | | | | | | | | | | | | | Avoid shipping duplicate files in 3rdparty/css. 3rdparty/css/chosen/ already contains chosen.css and chosen-sprite.png so its useless to duplicate them in 3rdparty/css. Taking the same approach as in apps/calendar/appinfo/app.php and apps/files_external/settings.php.
* | Merge pull request #8327 from owncloud/l10n-files_external-fieldsThomas Müller2014-04-282-66/+67
|\ \ | | | | | | Add translatable mount configs
| * | fix single quote sanitizationVolkan Gezer2014-04-261-1/+1
| | |
| * | Add translatable mount configsVolkan Gezer2014-04-231-65/+66
| |/ | | | | | | Will close #8070
* | Merge pull request #7473 from owncloud/append-error-documentThomas Müller2014-04-283-48/+14
|\ \ | | | | | | Remove .htaccess creation code
| * \ Merge branch 'master' into append-error-documentThomas Müller2014-04-021730-59460/+97173
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: lib/private/setup.php lib/private/updater.php
| * | | A version bump is not necessary hereLukas Reschke2014-02-281-1/+1
| | | |
| * | | Typo + use regular assignmentLukas Reschke2014-02-281-2/+2
| | | |
| * | | Remove .htaccess creation codeLukas Reschke2014-02-284-49/+15
| | | | | | | | | | | | | | | | | | | | 1. We're maintaining the same code twice which leads inevitably to problems as this one. The createHtaccess routine is only used to use the correct paths to the 404 and 403 document. 2. Updating the ownCloud instance as described in our documentation (`Delete everything from your ownCloud installation directory, except data and config.`) will break the links to the ErrorDocuments anyways and show the default error handlers if ownCloud is not installed in the root directory.
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-28162-742/+1289
| | | |
* | | | Merge pull request #8372 from owncloud/give-admins-a-hintLukas Reschke2014-04-271-1/+1
|\ \ \ \ | | | | | | | | | | Clarify the trusted_domain error page
| * | | | Remove an added t by the github webeditorLukas Reschke2014-04-271-1/+1
| | | | | | | | | | | | | | | Notice to myself: Stick to my IDE.
| * | | | Grammatical fixesLukas Reschke2014-04-271-2/+2
| | | | |
| * | | | Clarify the trusted_domain error pageLukas Reschke2014-04-261-1/+1
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-2726-46/+59
|/ / / /
* | | | Merge pull request #8371 from owncloud/example-configThomas Müller2014-04-261-1/+1
|\ \ \ \ | | | | | | | | | | Add another example to the trusted_domains config
| * | | | Add another example to the trusted_domains configLukas Reschke2014-04-261-1/+1
|/ / / / | | | | | | | | | | | | Users often ask in IRC or the forum how to add another domain. Hopefully they will be able to find it out on their own if we have an example with two domains.
* | | | Merge pull request #8343 from owncloud/fix-statusLukas Reschke2014-04-261-1/+1
|\ \ \ \ | | | | | | | | | | Use echo since print_unescaped is not defined
| * | | | "echo" is a language construct. Don't treat it like a function.Andreas Fischer2014-04-261-1/+1
| | | | |
| * | | | Use echo since print_unescaped is not definedLukas Reschke2014-04-241-1/+1
| | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/8342
* | | | | Merge pull request #8353 from owncloud/publicshare-webdavicewind19912014-04-264-2/+131
|\ \ \ \ \ | | | | | | | | | | | | Expose public shares over webdav
| * | | | | Expose public shares over webdavRobin Appelman2014-04-254-2/+131
| | | | | |
* | | | | | Merge pull request #8341 from owncloud/template-tests-output-bufferingLukas Reschke2014-04-261-35/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | Improve Template Tests by Removing Manual Output Buffering
| * | | | | | Use PHPUnit's expectOutputString() instead of performing output buffering.Andreas Fischer2014-04-241-26/+11
| | | | | | |
| * | | | | | Split testP() tests into multiple methods.Andreas Fischer2014-04-241-1/+3
| | | | | | |
| * | | | | | Remove redundant test case for non-HTML string.Andreas Fischer2014-04-241-9/+2
| | | | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-26163-679/+810
| | | | | | |
* | | | | | | Merge pull request #8355 from owncloud/l10n-expireAndreas Fischer2014-04-261-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | typo fix, by translators on transifex * owncloud/l10n-expire: typo fix, by translators on transifex
| * | | | | | | typo fix, by translators on transifexVolkan Gezer2014-04-251-2/+2
| | | | | | | |
* | | | | | | | Merge pull request #8356 from owncloud/fix-external-cssicewind19912014-04-261-1/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | fix layout of external storage config table
| * | | | | | | fix layout of external storage config tableMorris Jobke2014-04-251-1/+6
|/ / / / / / /
* | | | | | | Merge pull request #8350 from owncloud/share-search-mimeicewind19912014-04-252-6/+10
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | fix search by mime for shared single files
| * | | | | | Merge branch 'master' into share-search-mimeRobin Appelman2014-04-2515-23/+12
| |\ \ \ \ \ \