wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
33441 commits 157 branches 562 tags 714 MiB
Commit graph

482 commits

Author SHA1 Message Date
Lukas Reschke
2a1a3957b6 Merge pull request #333 from nextcloud/sync-master 
Sync master
 2016-07-07 19:29:43 +02:00
Morris Jobke
ba16fd0d33 Merge branch 'master' into sync-master 2016-07-07 11:29:46 +02:00
Vincent Petry
cf6fe95cbf Merge pull request #25325 from owncloud/filelist-prependslash 
Filelist change dir auto-prepend slash
 2016-07-06 12:44:03 +02:00
Vincent Petry
1f9d728538 Ignore invalid paths in the JS file list (#25368) 2016-07-06 11:55:02 +02:00
Robin Appelman
d623763aac Add "goto" links for files in non-default file lists 2016-07-05 22:22:55 +02:00
Björn Schießle
5b4cea4b36 Merge pull request #275 from nextcloud/master-sync-upstream 
[Master] Sync upstream
 2016-07-01 18:31:51 +02:00
Lukas Reschke
76c73d5ec3 Match on 405 2016-07-01 15:19:21 +02:00
Lukas Reschke
4ac9eaab03 Match for /../ 2016-07-01 15:01:48 +02:00
Lukas Reschke
5b65591d84 Do not allow directory traversal using "../" 
We should not allow directory traversals using "../" here.

To test access the following URL once with and then without this patch:

http://localhost/server/index.php/apps/files/?dir=../../This+Should+Not+Be+Here
 2016-07-01 13:36:05 +02:00
Lukas Reschke
179a355b2c Merge remote-tracking branch 'upstream/master' into master-sync-upstream 2016-07-01 11:36:35 +02:00
Vincent Petry
4acb06923d Filelist change dir auto-prepend slash 
Prepend a slash to directories in case it was missing since many places
assume that it's there.
 2016-07-01 11:10:37 +02:00
Vincent Petry
5cfbb9624f Prevent infinite loop in search auto-nextpage 
When loading the next page of search results, make sure that the loop
can end if there are no more elements in case the total doesn't match.

Also added a check to avoid recomputing the search results whenever the
setFilter() is called with the same value. This happens when navigating
away to another folder, the search field gets cleared automatically and
it calls FileList.setFilter('').
 2016-06-30 11:10:48 +02:00
Lukas Reschke
6670d37658 Merge remote-tracking branch 'upstream/master' into master-sync-upstream 2016-06-27 18:23:00 +02:00
Vincent Petry
b4cf297758 Prerender file list pages to include search results 
When filtering the file list, if a result is on an unrendered page,
make sure to call _nextPage() to prerender the pages in order to
display all matching results.
 2016-06-24 13:55:14 +02:00
Vincent Chan
203a07e7f3 change folder icon when dragging over a directory 2016-06-15 01:03:59 +02:00
Vincent Chan
937d21ed29 properly fix folder upload to use delegatedEvent 2016-06-14 11:51:03 +02:00
Vincent Petry
76c0bc29fe Merge pull request #20150 from pellaeon/pr-droppable-hover-visual-cue 
Add visual cue when moving draggable item over droppable item,
 2016-05-30 16:03:36 +02:00
Dmitry Popov
83aa28ed1d My fix for #24272, #23613, File not found when single file in a folder (#24800) 
* Fixed group share searching for members of
multiple group. Issue #11808.

* Fixed group share searching, continued.

Avoid searching for empty group list in getItemSharedWithUser().
Broke tests in previous commit, #12030.

* Simler check for group count.

* Fix for https://github.com/owncloud/core/issues/24783 , described there

* Now it's #24272, 24783 was a duplicate. Previous change was also not very good. Now we don't create ZIP with a single file inside.
 2016-05-24 14:09:05 +02:00
Pellaeon Lin
72ac5dd8a1 Make entire file tr droppable, 
so that .canDrop will highlight the entire row when drag hover
 2016-05-21 12:54:29 +08:00
Fabian
2a7d3dd831 dont update search onResize 
this.updateSearch() sets the current file list instance and clears the box. This is unnecessary and makes the search box unsuable on some mobile devices where a keyboard fade-in causes a onResize trigger, which would then clear and blur the box.
 2016-05-17 22:57:07 +02:00
Vincent Petry
88da2966b4 Merge pull request #22341 from owncloud/pellaeon-pr-breadcrumb-filelist-overlap-drop 
Handle case when breadcrumb and filelist item overlap and both receive a drop
 2016-05-13 17:12:36 +02:00
Vincent Petry
fdeafef6a0
Auto-add fileid in URL for currently displayed folder 2016-05-06 16:46:59 +02:00
Christoph Wurst
df2a9d1733
OCA.Files.App is not available on public page 2016-04-21 14:23:18 +02:00
Thomas Müller
1ab27ddd4a Merge pull request #24081 from owncloud/migrate-deprecated-jquery-v1-functions 
migrate deprecated jQuery 1.x functions
 2016-04-20 20:38:38 +02:00
Christoph Wurst
6c5696d3a8
filter hidden files on the web interface 
add checkbox to toggle show/hide hidden files

persist show hidden setting

fix settings menu layout

test ApiController::showHiddenFiles

don't show hidden files by default

Store config in Backbone model and inject it into FileList

Filter files only temporarily when rending the file list

Fix file rename validation
 2016-04-19 16:08:56 +02:00
Christoph Wurst
05d203a989
replace $.parseJSON() by JSON.parse() 2016-04-19 15:06:42 +02:00
Christoph Wurst
37530f27f0
migrate jQuery.fn.unload() 2016-04-19 12:05:09 +02:00
Thomas Müller
63a385d2b8 Merge pull request #23933 from owncloud/remember-file-sorting 
remember file sort order
 2016-04-15 14:06:21 +02:00
Christoph Wurst
576f7244e6 fix default value, update js/php tests 2016-04-13 14:25:23 +02:00
Christoph Wurst
a4683bcfa9 persist file sorting changes 2016-04-13 11:28:42 +02:00
Christoph Wurst
3f492dd826 load file sorting mode from the db 2016-04-13 11:28:42 +02:00
Christoph Wurst
4d02233faa restore selection after re-rendering file rows 2016-04-13 11:20:26 +02:00
Joas Schilling
bba28590b7
Remove xxx from ownCloud we dont want to see that 🙈 2016-04-07 12:18:44 +02:00
Jan-Christoph Borchardt
a8a98d42cb improve emptycontent styles 2016-03-31 15:31:04 +02:00
Erik Pellikka
50655cbf7f sidebar click modification 2016-03-24 11:57:40 +01:00
Pellaeon Lin
48430d4481 Handle case when breadcrumb and filelist item overlap 
and both receive a drop.

Build breadcrumb over and out callback in filelist.js and
pass them as options to utilize local selectors of filelist

Re-enable td elements after drop to bread crumb

Fix# drop handler still being called after enable,
it seems that waiting for a short time before re-enabling solves the
problem

* Add explanations for setTimeout re-enable td.filename drop handler
 2016-03-17 10:20:57 +01:00
Stefan Weil
692f312513 apps/files: Fix typos in comments (found and fixed by codespell) 
This contribution is AGPL and MIT licensed.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2016-03-09 15:14:05 +01:00
Vincent Petry
dbdf2173ac Return false on 401 in file list + trash file list 
This gives a chance to the global ajax error handler to do its work if
the session expired.
 2016-03-03 09:09:30 +01:00
Roeland Jago Douma
92cff0984d Make file actions use icon CSS classes 
This makes theming of file actions possible
 2016-02-25 22:49:52 +01:00
Thomas Müller
7af7d18cfa Merge pull request #16783 from owncloud/handle-redirects-global 
Adding global error handler for ajax calls which run into redirection…
 2016-02-17 14:49:04 +01:00
Vincent Petry
d565290d16 Close file detail sidebar when selecting/unselecting files 
Interacting with the checkboxes, also "Select all" will automatically
close the sidebar now.
 2016-02-15 14:58:44 +01:00
Vincent Petry
b8b77709c0 Add handler for global ajax errors 2016-02-15 12:48:47 +01:00
Vincent Petry
ae367c7e97 Fix elementToFile to also return path when defined 
Fixes issue when opening the share dialog for a file inside the favorite
list, and the file is from a subfolder
 2016-02-08 22:33:39 +01:00
Robin McCorkell
a49aff2db7 Only check selection for delete permissions, not parent folder 2016-01-15 16:52:51 +00:00
Erik Pellikka
ace66057f2 Fixed issue #21452 
removed whitespace

removed whitespace

Changed it based on PVince81's suggestion
 2016-01-13 14:47:00 +01:00
Roeland Jago Douma
86735c6b5a Updating a file should not update the summary 2016-01-09 22:07:34 +01:00
Thomas Müller
7693c6d84a Merge pull request #21254 from owncloud/files-uploadcanceliconfix 
Correctly render uploadtext indicator only on folders
 2015-12-28 10:21:38 +01:00
Vincent Petry
ca14277fca Make a modifiable copy of the webdav properties in JS file list 
Plugins can extend _getWebdavProperties to add custom properties.
These should not be added to the original properties list, so now the
FileList makes a copy of the array.
 2015-12-22 11:17:24 +01:00
Vincent Petry
7ecb9696ba Use showBusyState for upload into folder 
This makes sure that the original icon will be restored properly in case
it's not the default folder icon
 2015-12-18 18:09:54 +01:00
Vincent Petry
d27826bac0 Correctly render uploadtext indicator only on folders 2015-12-18 18:09:46 +01:00