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

316 commits

Author SHA1 Message Date
kondou
f84fe479a5 Only use mimetype_list and clean up a bit 2013-09-05 18:40:55 +02:00
kondou
992b59f70b Make it possible to pass rawlist.php an JSON array, to filter by more than one mimetype 2013-09-05 16:54:12 +02:00
Jörn Friedrich Dreyer
4af5a8c483 Merge branch 'master' into fix_3728_with_file_exists_dialog 
Conflicts:
	apps/files/ajax/upload.php
	apps/files/js/file-upload.js
	apps/files/js/filelist.js
	apps/files/js/files.js
	apps/files/templates/part.list.php
 2013-09-04 14:11:40 +02:00
Georg Ehrke
40cee5639e use gerMimeTypeDetector detectPath instead of getMimeType 2013-08-30 18:07:49 +02:00
Thomas Müller
3eed060ec9 backport of #4357 to master 2013-08-27 23:53:04 +02:00
Jörn Friedrich Dreyer
7c9d999243 reduced complexity, added listing conflicts to dialog 2013-08-22 14:29:00 +02:00
Kondou
c7af26ec84 Merge pull request #4497 from owncloud/newlines_at_eof_kondou 
Add newlines at the end of files
 2013-08-18 07:16:15 -07:00
Bart Visscher
eb97818519 Merge pull request #4483 from owncloud/compare-true-false 
Compare result are already true/false
 2013-08-18 03:26:35 -07:00
kondou
9e8a6b704d Add _many_ newlines at the end of files 2013-08-18 11:06:59 +02:00
Andreas Fischer
d38929fb10 Fix spacing of all touched lines. 2013-08-17 23:38:26 +02:00
Bart Visscher
29b6dd53a0 Compare result are already true/false 2013-08-17 12:58:10 +02:00
Jörn Friedrich Dreyer
f94e603698 progress fixes 2013-08-16 11:40:55 +02:00
Thomas Müller
57f7ff2dbd communicate size of newly created file back and update UI 2013-08-16 00:31:27 +02:00
Thomas Müller
7279a07ca2 Merge branch 'master' into mimetype-defaults 
Conflicts:
	apps/files/ajax/newfile.php
 2013-08-16 00:13:10 +02:00
Jörn Friedrich Dreyer
e1927d5bee fix whitespace, check selected files before starting upload 2013-08-14 10:55:12 +02:00
Andreas Fischer
beb27168de Use multiple lines for the JSON data array. 2013-08-08 22:14:21 +02:00
Andreas Fischer
0ab8850478 Adjust JSON code to stable5. 2013-08-08 22:14:21 +02:00
Andreas Fischer
1ed049a682 Do not repeat JSON success code. 2013-08-08 22:14:21 +02:00
Andreas Fischer
0718c92dc8 Do not repeat definition of $target. 2013-08-08 22:13:53 +02:00
Andreas Fischer
67df0a60fb Check expected type after JSON decode instead of checking what is not expected. 
This will also allow "true" and "false" as filenames instead of only "null".
 2013-08-07 17:01:14 +02:00
Robin Appelman
9321eceed6 add the option to have templates for newly created files 2013-08-07 16:53:09 +02:00
Robin Appelman
2b89b7c880 Split scanning logic from ajax file 2013-07-19 16:44:47 +02:00
Thomas Müller
dad91c156f Merge branch 'master' into fixing-3942-master 
Conflicts:
	apps/files/ajax/upload.php
 2013-07-06 00:02:11 +02:00
Thomas Müller
e159cbf527 on reshares we now recursively move to the root of all reshares - therefore some code has been refactured and added as a new public function 2013-07-05 17:39:41 +02:00
Thomas Müller
352c1415be proper fix for getting the shared item if no user is logged in 2013-07-05 13:45:21 +02:00
Thomas Müller
d1d6885585 php 5.3 compliant now 2013-07-05 13:22:38 +02:00
Thomas Müller
0c32f66899 get the real physical folder name for anonymous upload 2013-07-05 12:15:47 +02:00
Thomas Müller
11172db55b handle anonymous upload to reshared folder 2013-07-05 09:58:41 +02:00
Robin Appelman
86342224da fix uploading when ['dirtoken'] is not set 2013-07-01 15:39:11 +02:00
Robin Appelman
e55ed10b0d code style 2013-07-01 15:37:52 +02:00
Roman Geber
ddb0ff346d Public upload feature 2013-06-25 12:24:14 +02:00
Robin Appelman
6778a45d45 use json to encode user list 2013-06-19 15:02:18 +02:00
Robin Appelman
85585ede02 allow scanning files for multiple users 2013-06-19 01:26:08 +02:00
Robin Appelman
398fe8bf32 reuse etag when doing a forced rescan 2013-06-14 17:05:52 +02:00
Roland Hager
2df8468b2f Revert "FIX: Download of files named "true" or "false" impossible" 
This reverts commit d2d71c8797.
which was accidentally commited
 2013-06-12 18:30:28 +02:00
Roland Hager
d2d71c8797 FIX: Download of files named "true" or "false" impossible 
It was not possible to download a file called "true" or "false" (caseinsensitive) when clicking the link "download" due to the result of json_decode().
Both cases are now implicitly checked.

Hotfix provided by Herbert Pophal
 2013-06-12 17:25:21 +02:00
Thomas Tanghus
152e275c8a Various cleanups in OC.dialogs 2013-05-17 04:54:08 +02:00
Morris Jobke
e2bd32323d [files] fix mock creation and remove hardcoded 'require' statement 2013-05-12 13:02:01 +02:00
Morris Jobke
b777c0fd75 [files] rename lib to "App" 2013-05-12 11:47:22 +02:00
Morris Jobke
b9f426b1d7 [files] remove normalizePath on rename and dependency injection 2013-05-12 11:47:22 +02:00
Morris Jobke
324c423548 [files] kill stripslashes 2013-05-12 11:47:22 +02:00
Morris Jobke
1020d5c16c [files] refactoring 2013-05-12 11:47:22 +02:00
Morris Jobke
33b31931bd string comparision 2013-05-12 11:47:22 +02:00
Morris Jobke
b393c91a96 wrong root dir name 2013-05-12 11:47:22 +02:00
Morris Jobke
a878bd9923 fix allowed rename of folder in root directory to reserved name "Shared" 
refs #2159
 2013-05-12 11:47:22 +02:00
Robin Appelman
3de40f7cfb Files: set the proper mimetype when creating a new text file 2013-05-06 17:55:22 +02:00
Bart Visscher
a21885953f No need to strip slashes, json_decode handles that for us 2013-04-19 13:45:40 +02:00
Jörn Friedrich Dreyer
0968eb0a65 return original filename to fileupload 2013-03-28 18:03:52 +01:00
Robin Appelman
32b8fd8fb7 Improve handeling of unlimited max upload size 2013-03-15 16:31:35 +01:00
Björn Schießle
3970d1f875 remove debug output 2013-03-07 14:18:27 +01:00
Björn Schießle
4a4f705adc json encode list of files 2013-03-07 14:15:02 +01:00
Bart Visscher
19c5213b53 Join split translated strings 2013-02-21 23:47:56 +01:00
Robin Appelman
d96146a017 Give storage backends the option to define having no known free space 
When this is the case only the configured max upload size is taking into account for uploading
 2013-02-16 03:27:50 +01:00
Robin Appelman
9bdc43e1fc Files: explicitly define 2013-02-08 12:03:28 +01:00
Robin Appelman
5ef9d96d10 Files: rename 'space' to 'storage' in upload.php 2013-02-07 23:59:14 +01:00
Robin Appelman
b67251b0ff Files: add translation support back to move/rename 2013-02-07 23:57:18 +01:00
TheSFReader
469b1e8dd2 Correct it 2013-02-01 20:29:02 +01:00
Robin Appelman
5417e44b2a Files: fix moving files by DnD 2013-01-31 17:56:44 +01:00
Robin Appelman
207aa22d12 merge master into filesystem 2013-01-30 19:24:24 +01:00
Jörn Friedrich Dreyer
1d0ee61f3a use post instead of get 2013-01-30 12:59:35 +01:00
Robin Appelman
86e5a9cd73 Files: fix sharing newly uploaded files 2013-01-28 21:09:18 +01:00
Robin Appelman
930b9b9cd0 merge master into filesystem 2013-01-26 18:49:45 +01:00
Robin Appelman
83d6221322 merge master into filesytem 2013-01-20 03:11:04 +01:00
Thomas Mueller
b8318e6df4 Merge branch 'master' into fixing-998-master 
Conflicts:
	apps/files/js/files.js
 2013-01-19 15:58:15 +01:00
Lukas Reschke
53b95cb8fd Merge pull request #1230 from owncloud/remove-unused-autocomplete.php 
Remove uneeded file
 2013-01-19 05:56:27 -08:00
Thomas Mueller
cdd07b3339 introducing class OCA/files/lib/Helper with new function to build an array with storage stats 
DRYing the code by using \OCA\files\lib\Helper::buildFileStorageStatistics()
now returning used space percent on each ajax call
 2013-01-19 00:31:09 +01:00
Thomas Mueller
afb5de955e Merge branch 'master' into fixing-998-master 
Conflicts:
	apps/files/ajax/upload.php
	apps/files/js/files.js
 2013-01-18 23:22:34 +01:00
Lukas Reschke
f447e6469f Remove uneeded file 
I don't saw any usage of this file through the code, I assume it can
safely be removed.
 2013-01-18 23:07:11 +01:00
Thomas Müller
31cc9aa80d Merge pull request #986 from owncloud/fixing-784-master 
the maximum upload size is now part of the response of the upload and de...
 2013-01-18 14:06:00 -08:00
Thomas Mueller
5ff29b4348 fixing indent 2013-01-18 20:09:03 +01:00
Thomas Mueller
b7d3bf5f81 rename space -> storage 2013-01-17 16:49:10 +01:00
Robin Appelman
7debfac0dc Cache: more efficient upgrading 2013-01-15 19:11:12 +01:00
Robin Appelman
94068e5d08 Cache: show upgrade progress 2013-01-15 18:13:50 +01:00
Robin Appelman
9bf367e7f8 merge master into filesystem 2013-01-15 14:57:23 +01:00
Thomas Mueller
388bb6a5e1 Merge branch 'master' into fixing-unused-and-undefined-in-master 2013-01-14 23:41:34 +01:00
Thomas Mueller
e560cba76b adding a ajax call to get the current file storage stats like free space 
logic to call it every 5 minutes
make use of visibility API/jquery-visibility to perform the ajax call only if the browser is visible/in use
 2013-01-11 16:47:28 +01:00
Thomas Mueller
23896a7290 Merge branch 'master' into fixing-784-master 
Conflicts:
	apps/files/js/files.js
 2013-01-11 09:53:12 +01:00
Jörn Friedrich Dreyer
a40c95242f more translations 2013-01-09 12:48:57 +01:00
Robin Appelman
e8d08d4930 merge master into filesystem 2013-01-07 00:16:10 +01:00
Thomas Mueller
a0d6f0e127 fixing undefined $eventSource 2013-01-06 23:36:31 +01:00
Thomas Mueller
bae1755184 Merge branch 'master' into fixing-784-master 
Conflicts:
	apps/files/ajax/upload.php
	apps/files/js/files.js
	lib/helper.php
 2013-01-06 22:40:35 +01:00
Robin Appelman
a5dcbc3d8a Files: prevent people from renaming files to '.' 2013-01-05 03:30:05 +01:00
Robin Appelman
e40be93e87 merge master into filesystem 2013-01-03 15:59:17 +01:00
Jörn Friedrich Dreyer
fc64e8ec58 fix error when wrong dir was specified 2013-01-03 13:34:56 +01:00
Jörn Friedrich Dreyer
f19787f84c move $l to top 2013-01-03 12:00:07 +01:00
Jörn Friedrich Dreyer
ea732e5b29 also translate 'No file was uploaded. Unknown error' 2013-01-03 11:57:17 +01:00
Thomas Mueller
3ea9432d43 fixing undefined variable $l 2013-01-02 22:15:43 +01:00
Jörn Friedrich Dreyer
0405edc798 add translation call for 'Not enough space available' upload error 2013-01-02 21:00:50 +01:00
Robin Appelman
7e36f730ec merge master into filesystem 2012-12-25 14:29:29 +01:00
Thomas Müller
39d874cd90 the maximum upload size is now part of the response of the upload and delete operation. 
the maximum upload size is updated within the browser once an upload or delete operation has been finished
 2012-12-20 17:16:53 +01:00
Thomas Müller
7d811e57e6 setting the timezone is now part of the login process and true part of the core. 2012-12-20 11:10:45 +01:00
Robin Appelman
946d58eaa8 merge master into filesystem 2012-12-15 02:21:26 +01:00
Robin Appelman
6a2b41e5e8 use json encoding when deleting multiply files instead of using ; as delimiter 2012-12-13 18:11:00 +01:00
Robin Appelman
72b6faa69d merge master into filesystem 2012-12-02 03:03:48 +01:00
Jörn Friedrich Dreyer
3b83fe1530 fix checkstyle for files app 2012-11-29 18:33:15 +01:00
Arthur Schiwon
74cf3b5dfb use normalizePath to have a proper target path 2012-11-26 14:35:13 +01:00
Arthur Schiwon
fdc7a8b204 make sure path starts with / 2012-11-26 14:34:09 +01:00
Michael Gapczynski
c47bf9bbce Add checks for storage object 2012-11-24 16:42:54 -05:00
Robin Appelman
555dec2d92 merge master into filesystem 2012-11-23 16:20:56 +01:00
Thomas Müller
db2be74b4d Merge pull request #479 from owncloud/fix_438 
Do the url encoding once, only in breadcrumbs template
 2012-11-23 03:07:02 -08:00
Robin Appelman
8fb4dfd2ea use background scanner 2012-11-23 00:20:46 +01:00
Robin Appelman
a922eb756e merge master into filesystem 2012-11-18 14:07:52 +01:00
Bart Visscher
20c24f234f Do the url encoding once, only in breadcrumbs template 
fixes issue #438
 2012-11-16 16:12:28 +01:00
Thomas Mueller
2b192a75c4 normalize the path once in upload.php is enough - THX Robin for this hint 2012-11-16 11:50:57 +01:00
Thomas Mueller
7af4cf48c9 refs #461 - drag'n'drop upload to a sub folder is working now 2012-11-16 10:23:40 +01:00
Robin Appelman
d4858527c2 fix rename parameter order 2012-11-08 21:35:30 +01:00
Robin Appelman
4b940955dd merge master into filesystem 2012-11-04 21:12:18 +01:00
Felix Moeller
30d7993e01 Checkstyle fixes: NoSpaceAfterComma 2012-11-04 11:10:46 +01:00
Felix Moeller
f8d1d7787e Checkstyle fixes for SpaceBeforeOpenBrace 2012-11-04 10:46:32 +01:00
Robin Appelman
6e9e263497 merge master into filesystem 2012-10-30 22:59:55 +01:00
denis-b
2aa5a185d4 Update apps/files/ajax/move.php 
fix moving dirs containing "+"
 2012-10-29 16:46:22 +01:00
Bart Visscher
ab4ade0d24 Remove fixme, problem is solved already 2012-10-29 15:04:55 +01:00
Georg Ehrke
4fd0514f0a don't move file into subdirectory if a file with the same name already exists (fixes #92) 2012-10-28 15:23:40 +01:00
Robin Appelman
dea0d20a9a fix delete and sort files 2012-10-27 12:18:01 +02:00
Robin Appelman
6db81afab9 move some stuff to the new api 2012-10-26 23:05:02 +02:00
Robin Appelman
7bc49d2a57 merge master into filesystem 2012-10-25 18:26:08 +02:00
Bart Visscher
43ac43d7af dir in newfile has to start with / 2012-10-25 08:37:13 +02:00
Robin Appelman
5a3d6805a2 cleanup OC_Files a bit 2012-10-24 15:52:30 +02:00
Björn Schießle
07e08d5928 urldecode target directory 2012-10-24 15:37:51 +02:00
Robin Appelman
7b150dfa96 merge master into filesystem 2012-10-24 15:32:29 +02:00
Lukas Reschke
73f85c3b81 Merge pull request #62 from fmms/master 
More Checkstyle warnings
 2012-10-23 08:07:01 -07:00
Robin Appelman
7424f3aef6 merge master into filesystem 2012-10-23 16:16:46 +02:00
icewind1991
ab944094e2 Merge pull request #12 from scambra/fixes 
check free space using folder's owner
 2012-10-23 07:02:21 -07:00
Felix Moeller
6a00a6b9ed Make Jenkins more happy. 
This is NoSpaceAfterComma
 2012-10-23 00:28:12 +02:00
Robin Appelman
aaa1b73364 don't use depricated OC_Filesystem 2012-10-10 13:18:36 +02:00
Björn Schießle
277dd2b0a9 remove debug output 2012-10-08 17:32:04 +02:00
Björn Schießle
2923d24921 add data-id directly after upload/creation to the file list (bugfix for #1917) 2012-10-08 17:30:35 +02:00
Björn Schießle
f4136854b6 stripsplashes doesn't work if the slash is the only character -> creating file in root dir leads to "//filename" 2012-10-05 11:15:32 +02:00
Robin Appelman
cfbca40fbe fix sharing for newly uploaded or created files 2012-09-26 13:25:11 +02:00
scambra
1b411df83e use post to delete files, get has a limit and fails with many files 2012-09-20 08:28:35 +02:00
scambra
2b5133a1c4 check free space using folder's owner 2012-09-19 21:31:29 +02:00
Robin Appelman
7da3492ab5 show the size of new files when using New->From Url 2012-09-16 17:05:08 +02:00
Michael Gapczynski
87b7a23648 Don't get metadata directly from the 'cached' file cache after upload 2012-09-12 17:00:46 -04:00
Thomas Mueller
3829460ab8 adding space between) and { 2012-09-07 15:22:01 +02:00
Bart Visscher
0e58800016 Whitespace fixes in apps 2012-08-29 20:29:43 +02:00
Thomas Mueller
b64229a89e apply coding style 2012-08-29 01:39:42 +02:00
Thomas Mueller
fe49cbafc7 apply coding style 2012-08-29 00:50:12 +02:00
Thomas Mueller
f301bfd8c9 apply coding style 2012-08-29 00:36:27 +02:00
Bart Visscher
10cfcd4ff0 Remove useless setting of RUNTIME_NOAPPS 2012-08-08 22:42:50 +02:00
Robin Appelman
b1010160b3 CSRF protection for eventsource 2012-07-22 16:37:49 +02:00
Robin Appelman
a49c07cf88 progressbar for New->From Url 2012-07-22 03:56:51 +02:00
Robin Appelman
59ab8b14c7 cache fileid's in oc_cache 2012-07-22 03:24:34 +02:00
Jörn Friedrich Dreyer
e59a1806cf remove superfluous ?> at the end of .php files (left out apps/*/templates) 2012-07-09 16:51:16 +02:00
Lukas Reschke
0abcf0a421 CSRF checks 2012-07-07 15:58:11 +02:00
Robin Appelman
bf2062b09d write_close the session when scanning files or music 2012-06-16 01:35:39 +02:00
Robin Appelman
f06c08a637 cleanup oc_filecache, splitting it in several parts and using the new hasUpdated 2012-06-15 19:56:15 +02:00
Lukas Reschke
2b22c538c8 Make some apps compatible 2012-06-11 19:07:51 +02:00
Bjoern Schiessle
c960e42a17 fixed var name, $filename should be $foldername 2012-06-06 18:08:51 +02:00
Robin Appelman
e6c4e53486 prevent creating files with a / the name 2012-06-06 00:02:51 +02:00
Frank Karlitschek
83c6714c72 don´t start a session here. I don´t think it´s needed. Let´s see if it breaks something 2012-06-01 11:12:50 +02:00
Brice Maron
9c2a6fb551 Add HEAD request management for files ajax/download.php 2012-05-24 22:48:10 +00:00
Thomas Mueller
583dce5276 removing executable bit - again 2012-05-15 00:52:00 +02:00
Bartek Przybylski
ab9927d5fc oc-627, calling base function instead of loading too much useless functions 2012-05-12 13:25:04 +02:00
Frank Karlitschek
1945cd6946 ported the oc_template class 2012-05-06 23:00:36 +02:00
Robin Appelman
d875191777 only emit the filesystem hooks once when creating a new file 2012-05-05 16:49:48 +02:00
Frank Karlitschek
97a8af7f25 ported oc_db 2012-05-03 13:06:08 +02:00
Frank Karlitschek
43caa3b3b9 ported oc_json 2012-05-03 12:23:29 +02:00
Frank Karlitschek
8c7f854671 move all the files stuff into a files class 2012-05-02 12:54:31 +02:00
Frank Karlitschek
93b63cf375 ported the rest of the OC_Helper calls 2012-05-02 00:20:45 +02:00
Frank Karlitschek
31e32e3c10 ported checkLoggedIn and checkAdmin 2012-05-01 22:59:38 +02:00
Frank Karlitschek
e2fb094693 some more porting 2012-05-01 21:07:08 +02:00
Thomas Tanghus
9c520c70a8 Various file path fixes. 2012-04-30 01:48:01 +02:00
Bartek Przybylski
72c0d6968e fix duplicated entries on upload 2012-04-27 22:48:27 +02:00
Georg Ehrke
2b10371bde fix merge conflicts 2012-04-26 18:08:49 +02:00
Georg Ehrke
c3d78cf77a remove require once lib base in files scan.php 2012-04-20 22:34:13 +02:00
Georg Ehrke
45de7ad221 move files to app folder 2012-04-18 17:27:34 +02:00