Commit graph

17802 commits

Author SHA1 Message Date
Vincent Petry
688f6162da Add sorting to files list, trashbin and public files 2014-04-28 17:42:04 +02:00
Thomas Müller
e055a411ea Merge pull request #7167 from owncloud/files-ajaxload-infscroll
Infinite scrolling for files app
2014-04-28 17:39:02 +02:00
Thomas Müller
be6431bab0 Merge pull request #8380 from owncloud/kill_office_fallback
remove preview office fallback as it makes too much trouble and generates inacceptable results
2014-04-28 17:18:36 +02:00
Thomas Müller
bf61d841a2 typos, naming, remove unused code, identation 2014-04-28 16:51:57 +02:00
Thomas Müller
197b8ee052 Merge pull request #8340 from tribut/htaccess-escape-dots
Escape literal dots in mod_rewrite regexes
2014-04-28 16:09:03 +02:00
Vincent Petry
f99f451026 Fixed drag and drop into folder and onto breadcrumb
Fixed drag and drop code to use FileList.getSelectedFiles() instead of
the visible DOM elements.
2014-04-28 14:55:01 +02:00
Vincent Petry
a15b68c10f Fixed selection summary calculation issue 2014-04-28 14:55:01 +02:00
Vincent Petry
c29e8b0bae Cleanup of event handlers
Now using _.bind() for event handlers so we can use "this" which is more
readable than a static access to FileList.
2014-04-28 14:55:01 +02:00
Vincent Petry
3c006a5a4d Cleanup and fix trashbin "clear all files" operation 2014-04-28 14:55:01 +02:00
Vincent Petry
3159c2ee64 Fixed drag shadow file sorting 2014-04-28 14:55:01 +02:00
Vincent Petry
fd982df6ae Fixed selection to be based on FileList.files
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)
2014-04-28 14:55:01 +02:00
Vincent Petry
a952d80ad9 Fix trashbin previews and "delete selected" 2014-04-28 14:55:01 +02:00
Vincent Petry
8909b574fa Make sure there are always enough elements visible on the page 2014-04-28 14:55:01 +02:00
Vincent Petry
2883f231d0 Fixed insertion of files
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.
2014-04-28 14:55:01 +02:00
Vincent Petry
f6586f6bdf Fixed file sorting to work with scrolling
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.
2014-04-28 14:55:00 +02:00
Vincent Petry
9c2fbea6a4 Fix file selection for infinite scrolling
- 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
2014-04-28 14:55:00 +02:00
Vincent Petry
9f62059efa Fix file summary to use the whole file list
- 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
2014-04-28 14:49:39 +02:00
Bjoern Schiessle
73a2d87ab4 fix shouldEncrypt() method and improved decryptAll() unit tests 2014-04-28 14:49:19 +02:00
Vincent Petry
efdf0c4df0 Added infinite scrolling (in-memory list) 2014-04-28 14:34:28 +02:00
Thomas Müller
f685c3cceb Merge pull request #8381 from owncloud/files_irods
drop files_irods from apps_external
2014-04-28 14:31:31 +02:00
Arthur Schiwon
45e42c25de Group Database backend must not gather user details itself but ask user
backends. This is a port to master from PR #7745

remove OC_GROUP_BACKEND_GET_DISPLAYNAME option for group backends

Conflicts:
	lib/private/group/backend.php

LDAP: getDisplayNamesInGroup is not an option for group backends anymore

Conflicts:
	apps/user_ldap/group_ldap.php
	apps/user_ldap/group_proxy.php

clean up group backends

Conflicts:
	lib/private/group/database.php

remove now unnecessary test

implement getDisplayNames in group manager

adjust user manager tests

test for group manager's displayNamesInGroup

trim must not be used in empty in PHP < 5.5

keep the constant to not provoke PHP warnings

Conflicts:
	lib/private/group/backend.php
2014-04-28 13:49:56 +02:00
Sjors van der Pluijm
d7ec1fe447 rewind iterator before iteration starts 2014-04-28 13:05:20 +02:00
Thomas Müller
9128900c56 drop files_irods from apps_external 2014-04-28 12:39:28 +02:00
Thomas Müller
e27dc5b6f9 Merge pull request #8309 from DavidPrevot/chosen
Adapt chosen (css) path
2014-04-28 12:34:40 +02:00
Georg Ehrke
b68098ebba remove preview office fallback as it makes too much trouble and generates inacceptable results 2014-04-28 12:05:10 +02:00
Sjors van der Pluijm
d8be9d96ed fixes #8376 2014-04-28 10:20:24 +02:00
Felix Eckhofer
61ca269292 Remove trailing tab 2014-04-28 09:06:26 +02:00
Felix Eckhofer
460d06c235 Escape literal dots in mod_rewrite regexes 2014-04-28 09:06:26 +02:00
Thomas Müller
727e3e2359 Merge pull request #8327 from owncloud/l10n-files_external-fields
Add translatable mount configs
2014-04-28 08:52:50 +02:00
Thomas Müller
5fd776debf Merge pull request #7473 from owncloud/append-error-document
Remove .htaccess creation code
2014-04-28 08:50:42 +02:00
Jenkins for ownCloud
642f57c1d5 [tx-robot] updated from transifex 2014-04-28 01:56:24 -04:00
Lukas Reschke
e910e63140 Merge pull request #8372 from owncloud/give-admins-a-hint
Clarify the trusted_domain error page
2014-04-27 18:28:18 +02:00
Lukas Reschke
1d9ac38da6 Remove an added t by the github webeditor
Notice to myself: Stick to my IDE.
2014-04-27 16:41:09 +02:00
Lukas Reschke
7a8bfeae6e Grammatical fixes 2014-04-27 16:31:04 +02:00
Jenkins for ownCloud
8e5c9eea3a [tx-robot] updated from transifex 2014-04-27 01:54:54 -04:00
Lukas Reschke
b6612ef04a Clarify the trusted_domain error page 2014-04-26 23:11:29 +02:00
Thomas Müller
a1ddd23289 Merge pull request #8371 from owncloud/example-config
Add another example to the trusted_domains config
2014-04-26 23:00:02 +02:00
Lukas Reschke
2bea7ec2e7 Add another example to the trusted_domains config
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.
2014-04-26 22:37:30 +02:00
Volkan Gezer
6de6f68ae2 fix single quote sanitization 2014-04-26 18:58:01 +02:00
Lukas Reschke
15d05e55cb Merge pull request #8343 from owncloud/fix-status
Use echo since print_unescaped is not defined
2014-04-26 16:51:29 +02:00
icewind1991
7ac7546b71 Merge pull request #8353 from owncloud/publicshare-webdav
Expose public shares over webdav
2014-04-26 15:55:37 +02:00
Andreas Fischer
ff6564af57 "echo" is a language construct. Don't treat it like a function. 2014-04-26 14:50:34 +02:00
Lukas Reschke
96c06c14d8 Merge pull request #8341 from owncloud/template-tests-output-buffering
Improve Template Tests by Removing Manual Output Buffering
2014-04-26 12:29:36 +02:00
Jenkins for ownCloud
c591cf0836 [tx-robot] updated from transifex 2014-04-26 01:55:32 -04:00
Andreas Fischer
63cdf78390 Merge pull request #8355 from owncloud/l10n-expire
typo fix, by translators on transifex

* owncloud/l10n-expire:
  typo fix, by translators on transifex
2014-04-26 01:21:31 +02:00
icewind1991
282ea27ab9 Merge pull request #8356 from owncloud/fix-external-css
fix layout of external storage config table
2014-04-26 00:06:06 +02:00
Morris Jobke
ace0293bd1 fix layout of external storage config table 2014-04-25 16:34:48 +02:00
Volkan Gezer
ad1265da13 typo fix, by translators on transifex 2014-04-25 16:26:30 +02:00
icewind1991
7599fa94ce Merge pull request #8350 from owncloud/share-search-mime
fix search by mime for shared single files
2014-04-25 15:54:36 +02:00
Robin Appelman
b176708505 Expose public shares over webdav 2014-04-25 14:45:18 +02:00