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

1195 commits

Author SHA1 Message Date
Lukas Reschke
1e61c17932
Fix grammar 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-03-20 11:08:39 +01:00
Felix Heidecke
11f838f9e4
Add ignore_files to config, 
test files against ignore_files list on upload

fix typo and indentation

Move blacklist declaration to lib/public/Files/FileInfo.php,

Rename *ignored to *blacklisted

Mocked blacklist_files for testing

Mocked blacklist_files for testing

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-20 01:17:12 -06:00
Joas Schilling
0fe45966a0
Remove single quotes around search query like in user search 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-15 12:53:44 +01:00
Robin Appelman
ad4b5c82da
dont preserve mtime when uploading trough the web interface 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-13 13:33:18 +01:00
Stefan Schneider
f6ef024159 Correct incorrectly typed X-OC-Mtime header 
Signed-off-by: Stefan Schneider <stefan.schneider@squareweave.com.au>
 2017-03-10 18:16:27 +11:00
noveens
93f9db4d59
filelist only refreshed if directory changes 
check introduced at another method

comment added to explain one check

comment added to explain one check

unit tests added

small fixes in unit tests

missing semicolon added

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-02 21:43:44 -06:00
Morris Jobke
86149508d0
fix typo 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-02-28 00:14:34 -06:00
Christoph Wurst
3e7e49884e Replace deprecated $.tipsy(...) by $.tooltip(...) 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-02-27 22:25:05 +01:00
Marcin
20ad3f33d0 Fixed path in other folders search 
Signed-off-by: Marcin Czarnecki <marcin.czarnecki@protonmail.com>
 2017-02-21 00:38:46 +00:00
Robin Appelman
0f698e2021
open the sidebar when opening a permalink 
Also works for search results

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-01-23 18:06:24 +01:00
John Molakvoæ (skjnldsv)
961fcfa1fb
Popover positionning and classes 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-22 11:45:08 -06:00
John Molakvoæ (skjnldsv)
418ebfbdf4
fit newFileMenu to css guidelines 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-22 11:45:08 -06:00
Morris Jobke
08cdcf8f7f Merge pull request #2776 from nextcloud/prevent-quotes-from-being-a-problem 
Escape the name for the jquery selector
 2017-01-17 18:40:11 -06:00
Michael Jobst
969c19b2e9
Fixed size issues on main detail view and disappearing of share recipients (#26603) 
* fixed size issues on main detail view and disappearing of share recipients

* Changes due to code comments

* Moved reloadProperties() to FileInfoModel

* Solved Scrutinizer issues

* Bugfix: undefined value used on error

* check if options are set for FileInfoModel.initialize()

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-12-23 16:56:55 +01:00
Lukas Reschke
56c016946d Merge pull request #2763 from nextcloud/fix_maindetailsview_favorite_star-patch 
[downstream] Fix maindetailsview favorite star patch
 2016-12-23 16:36:53 +01:00
Christoph Wurst
cfada468e6
OC.Uploader does not have a 'state' method, therefore the 
dead code can be removed

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2016-12-23 15:38:48 +01:00
Thomas Müller
2bf4661e40
Just use moment to comupte the time left for the upload - translations are delivered as part of moment.js - fixes #26804 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-22 10:01:58 +01:00
Joas Schilling
e53d0c0d69
Escape the name for the jquery selector 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-12-20 09:32:47 +01:00
Michael Jobst
a7526b9837
Style modifications of favorite star on main detail view (#26658) 
* Style modifications of favorite star on main detail view

* Removed unused opacity change on mouse over

* favorite star title fixed

* favorite star opacity should  always be .7

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-19 17:34:09 +01:00
pflug
c7fc010215 Fix showConflict 
use getFullFileName to show conflicting file
add original.directory to make fileExists happy

Signed-off-by: Andreas Pflug <dev@admin4.org>
 2016-12-19 08:11:04 +01:00
Arthur Schiwon
7e2b866fd7
fix type in jsdoc 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-12-06 18:08:13 +01:00
Christoph Wurst
ea45b22053 Merge pull request #2444 from nextcloud/detect-also-a-400-status 
Catch status code 400
 2016-12-01 21:25:54 +01:00
Roeland Jago Douma
61d61e794c Merge pull request #2435 from nextcloud/sidebar-preview-non-preview 
allow registering sidebar preview handlers for mimetypes that dont co…
 2016-12-01 21:14:10 +01:00
Lukas Reschke
9704b4df52
Catch status code 400 
In case the server returns a statuscode 400 we should also gracefully return to the home directory.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-01 19:13:28 +01:00
Robin Appelman
a4900bf23f
allow registering sidebar preview handlers for mimetypes that dont come with server side previews 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-12-01 15:43:17 +01:00
Robin Appelman
7fc118e8ea
remove js debug statements in sidebar text preview generator 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-30 14:54:54 +01:00
Robin Appelman
8b9ad46ba3 Merge pull request #768 from nextcloud/s3-objectstore 
Add S3 objectstore backend
 2016-11-18 14:55:07 +01:00
Jan-Christoph Borchardt
a32c781326 use copy icon for local link rather than link icon to prevent confusion with sharing 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2016-11-17 21:46:07 +01:00
Joas Schilling
8f38adaab1 Merge pull request #2123 from nextcloud/downstream-26522 
Skip hidden files when counting visible files in list
 2016-11-16 19:10:35 +01:00
Robin Appelman
d5bfff6f4f
add comment for non empty text file 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-16 15:30:37 +01:00
Robin Appelman
c22776f04a
Dont create 0 byte text files 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-16 15:30:37 +01:00
Vincent Petry
1141fcc9ac
Skip hidden files when counting visible files in list (#26522) 
The file list UI logic that renders the next page doesn't properly
exclude hidden files when not shown. This fix makes sure that only rows
that are actually visible are counted when rendering a page, this makes
sure that the page will always have enough elements displayed.
 2016-11-14 16:21:57 +01:00
Michael Jobst
03cbc7217c
disabling dropping on dragging objects temporarily 
better solution
 2016-11-14 15:35:25 +01:00
Christoph Wurst
c55718ae5e
update breadcrumb view whenever the share information on the directory info model changes 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2016-11-07 14:58:45 +01:00
Christoph Wurst
bc1cb8a6d0
let users share the curren folder 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2016-11-07 14:58:45 +01:00
Christoph Wurst
c5597baf88
show whether the current folder was shared or not 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2016-11-07 14:58:45 +01:00
Vincent Petry
6a4ea2c15a
Upload autorename on client side 
Removes the need for POST to collection which would hit against upload
limits.

The client tries to auto rename the file by adding a suffix "(2)".
It tries to use the file list on the client side to guess a
suitable name. In case a file still cannot be uploaded and creates a
conflict, which can happen when the file was concurrently uploaded, the
logic will continue increasing the suffix.
 2016-11-02 22:15:03 +01:00
Vincent Petry
7e701504be
Remove upload_limit in files app as it is not needed with PUT upload (#26069) 
The web UI now uses for PUT uploads which aren't restricted by PHP's
upload_max_filesize and post_max_size

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-02 20:43:35 +01:00
Vincent Petry
50b8221255
Highlight files and update storage stats at end of upload (#26164) 
Properly trigger the "stop" even from the uploader.
Also update storage stats at the end of all uploads instead of for each
upload.
 2016-10-25 14:51:44 +02:00
Morris Jobke
c0adc3c2cf Merge pull request #1883 from nextcloud/downstream-26145 
Storage 503 message improvements
 2016-10-25 13:19:46 +02:00
Lukas Reschke
79706e0ddc Merge pull request #1283 from nextcloud/us_files-ui-webdav-upload 
Use Webdav PUT for uploads
 2016-10-25 10:31:03 +02:00
Vincent Petry
f374eb5f1d
More fixes to file upload 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-24 21:45:00 +02:00
Vincent Petry
f72ffa2f11
Fix js unit tests for webdav put upload changes 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-24 21:45:00 +02:00
Vincent Petry
786e858d23
Add support for chunked upload 
Hacked around Blueimp's jquery.fileupload to make it work with our new
chunking API.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-24 21:45:00 +02:00
Vincent Petry
59c5be1cc5
Use Webdav PUT for uploads in the web browser 
- uses PUT method with jquery.fileupload for regular and public file
  lists
- for IE and browsers that don't support it, use POST with iframe
  transport
- implemented Sabre plugin to handle iframe transport and redirect the
  embedded PUT request to the proper handler
- added RFC5995 POST to file collection with "add-member" property to
  make it possible to auto-rename conflicting file names
- remove obsolete ajax/upload.php and obsolete ajax routes

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-24 21:45:00 +02:00
ryanwr
3e96f33995 Sort favorite files first Issue #1802 
Signed-off-by: Ryan Welch <ryantwr@gmail.com>
 2016-10-24 17:55:47 +01:00
Vincent Petry
44cf67accd
Storage 503 message improvements 
"Storage not available" is now "Storage temporarily not available".
Exceptions are now logged in DEBUG level, not FATAL.
 2016-10-24 15:43:15 +02:00
Lukas Reschke
0864f53675 Merge pull request #1796 from nextcloud/oc_fav-report 
Make it possible to filter by tags with REPORT method
 2016-10-20 18:32:51 +02:00
Joas Schilling
6f2fe8c62a
Show the path, when the filename conflicts 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-10-19 11:33:25 +02:00
Vincent Petry
361f008c70
Make it possible to filter by tags with REPORT method 
Enhanced the REPORT method on the Webdav endpoint and added a
"oc:favorite" filter rule. When set, it will return a flat list of
results filtered with only favorite files.

The web UI was also adjusted to use this REPORT method instead of the
private API endpoint.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-19 11:06:29 +02:00
Morris Jobke
2bb031ecc6 Merge pull request #1606 from nextcloud/search-detail 
search design details
 2016-10-18 13:48:01 +02:00
Jan-Christoph Borchardt
2b79490201 use more fitting icon for files move action 2016-10-17 18:52:25 +02:00
Robin Appelman
fdc2e8ba56
Add file action to move files and folders 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-10-14 16:23:11 +02:00
skjnldsv
1930aa3102
Fix bold no results search text 
Fix wording
 2016-10-11 15:06:25 +02:00
Morris Jobke
0497affc46
fix drag and drop icon for files app 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2016-10-10 15:09:15 +02:00
Morris Jobke
62d5daa94f Merge pull request #1590 from nextcloud/issue-1432-special-chars-on-name-conflict 
Fix special characters when renaming to a conflict
 2016-10-03 16:47:20 +02:00
Christoph Wurst
407232b772 Merge pull request #1547 from nextcloud/files-translate-filesummary 
Translate file summary connector (#26221)
 2016-10-03 10:41:20 +02:00
Joas Schilling
0ecaf8e602
Fix special characters when renaming to a conflict 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-09-30 12:44:49 +02:00
John Molakvoæ
f623d020f7 Use css loading animation and not gif 
Signed-off-by: John Molakvoæ <fremulon@protonmail.com>
 2016-09-27 21:06:25 +02:00
Vincent Petry
7de4c809ef
Translate file summary connector (#26221) 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-09-27 18:38:56 +02:00
Morris Jobke
6b2920a6bc Merge pull request #1520 from nextcloud/upload-allow-zero 
Allow uploading empty files (#26113)
 2016-09-26 17:40:53 +02:00
Vincent Petry
e8836bfd30
Allow uploading empty files (#26113) 
Downstreaming of https://github.com/owncloud/core/pull/26113

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-09-26 11:28:05 +02:00
Morris Jobke
8d4e5747f3
Fix folder drag glitch in Firefox 
issue:
* drag'n'drop a folder into the files app in Firefox
* the highlight stays there because Firefox doesn't trigger the drop event for folders

solution:
* behave like the drop event if the dragover event isn't fired for 100ms (only applied in Firefox)
 2016-09-14 13:44:34 +02:00
Jan-Christoph Borchardt
a45cfbc2d2 search design details 2016-09-09 18:01:00 +02:00
Roeland Jago Douma
ca7b60ba81 Merge pull request #1215 from nextcloud/issue-1083-update-live-relative-timestamps 
Update relative timestamps for a better "live" feeling
 2016-09-01 14:13:23 +02:00
Joas Schilling
6c81c65eea
Also prevent null byte character 2016-09-01 12:24:14 +02:00
Joas Schilling
7cd86cfe59
Filter out %0A from paths 2016-09-01 10:06:06 +02:00
Joas Schilling
ee838a224e
Use live timestamp in the sidebar details 2016-09-01 09:02:36 +02:00
Joas Schilling
ee1c1b39b2
Update live timestamps to give a more live feeling 2016-09-01 09:02:36 +02:00
Roeland Jago Douma
e1ea45f32b Merge pull request #1147 from nextcloud/files-hidden-files-summary 
Display number of hidden files in files summary (#25870)
 2016-08-29 20:36:07 +02:00
Vincent Petry
7fa66409ae
Display number of hidden files in files summary (#25870) 
When dot files are hidden, the table summary and selection summary will
not show how many hidden files were included.
 2016-08-29 14:47:41 +02:00
Vincent Petry
29b45c5c42
Make sure file list files config always exists 
Initialize files config with defaults in case none was passed
 2016-08-29 14:44:25 +02:00
Roeland Jago Douma
f744131b18
Do not error on maxUploadChange 
The new admin page broke the updating of the max upload size. This is
due to very old code there.

* Now update is done in the background using js
* Added proper route+controller to update

Fixes #994
 2016-08-22 20:25:58 +02:00
Vincent Petry
f7deb2c2eb
Fix hidden files handling 
Hidden files (dot files) are now always rendered in the DOM to make
sure that all file operations and selection still work as expected.

Their visibility is now toggled on CSS level.
 2016-08-19 10:26:19 +02:00
Robin Appelman
6368506e57 only load sidebar previews when we know it's available 2016-07-27 12:59:43 +02:00
Robin Appelman
03c17ff614 dont load filelist previews if we know we dont have one 2016-07-27 12:59:43 +02:00
Robin Appelman
2139a031e7 block user sorting in recent files 2016-07-22 15:20:55 +02:00
Robin Appelman
2e3114cc28 Add recent file listing 2016-07-22 15:20:51 +02:00
Joas Schilling
45c99c226b
Fix the HTML encoding when uploading a folder in FF when using french l10n 2016-07-20 13:03:27 +02:00
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
Morris Jobke
dd337597b3 for text use max-height to trim whitespace 2016-07-04 17:38:26 +02:00
Robin Appelman
a4d75a60a9 Add large sidebar previews for text files 2016-07-04 12:54:12 +02:00
Robin Appelman
860b7c36ec Factor out handling sidebar previews 2016-07-04 12:04:32 +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
1d4c61af47 Merge pull request #25237 from owncloud/search-filelistnextpageresults 
Prerender file list pages to include search results
 2016-06-27 13:46:25 +02:00
Lukas Reschke
7a9d60d87e
Merge remote-tracking branch 'upstream/master' into master-upstream-sync 2016-06-26 12:55:05 +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 Petry
39b533d0d8
Hide search results after switching directory 
When clicking on a folder result in the search result list, the result
box for "results in another folder" must disappear.
 2016-06-24 11:32:14 +02:00
Vincent Petry
bf3ee69d86
Fix search result link for file results outside default list 
When outside the "All files" list, the search result link must properly
redirect to the "All files" list.
 2016-06-24 11:31:29 +02:00