feb7028a78
Remove require in rawlist.php
...
Thanks @tanghus for pointing out the unneccessity of it.
2013-10-02 12:45:30 +02:00
013e9c27d2
Fix require in apps/files/ajax/rawlist.php
2013-10-02 12:21:52 +02:00
db39fede97
Merge branch 'master' into appframework-master
...
Conflicts:
apps/files/lib/helper.php
apps/files_trashbin/lib/helper.php
2013-09-25 09:52:12 +02:00
4b3e56bcf9
remove unneccessary lib in namespace
2013-09-20 16:46:33 +02:00
9e39118b52
namespaces use upcasefirst parts
...
when _ is left in namespace and files are named after their classes the autoloader will also find classes in the lib folder of an app
its magic!
2013-09-20 16:37:07 +02:00
7e0631b3b8
Merge branch 'master' into fix_3728_with_file_exists_dialog
...
Conflicts:
apps/files/js/filelist.js
2013-09-19 17:00:54 +02:00
43a96621ea
adding comma to get cleaner diffs in the future
2013-09-18 23:42:36 +02:00
370ed814f7
add permissions of the file to the json response
2013-09-18 11:22:29 +02:00
b59ce403d8
Merge branch 'master' into fix_3728_with_file_exists_dialog
...
Conflicts:
apps/files/css/files.css
apps/files/js/file-upload.js
apps/files/js/filelist.js
apps/files/js/files.js
apps/files_sharing/js/public.js
core/js/jquery.ocdialog.js
core/js/oc-dialogs.js
2013-09-17 19:10:46 +02:00
9b420e8660
use \OC::$server->getPreviewManager() instead of \OCP\Preview
2013-09-17 13:33:47 +02:00
db7e1dd877
Merge pull request #4853 from owncloud/external-shared_mimetype-icons
...
Use external and shared icons in OC.Dialogs.filepicker()
2013-09-15 02:42:14 -07:00
c117e719da
Use external and shared icons in OC.Dialogs.filepicker()
2013-09-14 14:35:23 +02:00
364e7991a4
Fixed ajax support to also update the current dir permissions
2013-09-13 19:59:15 +02:00
1304b511e9
Ajax calls for "files" and "files_trashbin" apps
...
Frontend:
- The files app list now uses ajax calls to refresh the list.
- Added support the browser back button (history API).
- Added mask + spinner while loading file list
Backend:
- Added utility function in core JS for parsing query strings.
- Moved file list + breadcrumb template data code to helper
functions
- Fixed some file paths in trashbin app to be similar to the files app
2013-09-13 19:59:14 +02:00
c7ca86799b
Merge pull request #4816 from owncloud/fixing-723-master
...
Fixing 723 master
2013-09-12 07:48:00 -07:00
9d661eab23
adding calls to \OCA\files\lib\Helper::determineIcon($i) in files, trashbin and sharing
2013-09-12 00:40:35 +02:00
4d62f747fa
Clean up rawlist.php and fix non-array request
2013-09-12 00:21:01 +02:00
83d3df4111
Split some lines, use ===, avoid unnecessary operation
2013-09-11 12:12:40 +02:00
e2c0fe8296
fix upload of multiple files
2013-09-06 18:16:40 +02:00
238d92b11c
refactor replace and autorename resolution in upload.php
2013-09-06 17:53:58 +02:00
226c205631
Use usort() instead of uasort() to not maintain keys
2013-09-06 06:45:16 +02:00
85e41d9500
Sort files by name, not by mimetype
2013-09-05 23:17:53 +02:00
f84fe479a5
Only use mimetype_list and clean up a bit
2013-09-05 18:40:55 +02:00
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
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
40cee5639e
use gerMimeTypeDetector detectPath instead of getMimeType
2013-08-30 18:07:49 +02:00
3eed060ec9
backport of #4357 to master
2013-08-27 23:53:04 +02:00
7c9d999243
reduced complexity, added listing conflicts to dialog
2013-08-22 14:29:00 +02:00
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
eb97818519
Merge pull request #4483 from owncloud/compare-true-false
...
Compare result are already true/false
2013-08-18 03:26:35 -07:00
9e8a6b704d
Add _many_ newlines at the end of files
2013-08-18 11:06:59 +02:00
d38929fb10
Fix spacing of all touched lines.
2013-08-17 23:38:26 +02:00
29b6dd53a0
Compare result are already true/false
2013-08-17 12:58:10 +02:00
f94e603698
progress fixes
2013-08-16 11:40:55 +02:00
57f7ff2dbd
communicate size of newly created file back and update UI
2013-08-16 00:31:27 +02:00
7279a07ca2
Merge branch 'master' into mimetype-defaults
...
Conflicts:
apps/files/ajax/newfile.php
2013-08-16 00:13:10 +02:00
e1927d5bee
fix whitespace, check selected files before starting upload
2013-08-14 10:55:12 +02:00
beb27168de
Use multiple lines for the JSON data array.
2013-08-08 22:14:21 +02:00
0ab8850478
Adjust JSON code to stable5.
2013-08-08 22:14:21 +02:00
1ed049a682
Do not repeat JSON success code.
2013-08-08 22:14:21 +02:00
0718c92dc8
Do not repeat definition of $target.
2013-08-08 22:13:53 +02:00
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
9321eceed6
add the option to have templates for newly created files
2013-08-07 16:53:09 +02:00
2b89b7c880
Split scanning logic from ajax file
2013-07-19 16:44:47 +02:00
dad91c156f
Merge branch 'master' into fixing-3942-master
...
Conflicts:
apps/files/ajax/upload.php
2013-07-06 00:02:11 +02:00
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
352c1415be
proper fix for getting the shared item if no user is logged in
2013-07-05 13:45:21 +02:00
d1d6885585
php 5.3 compliant now
2013-07-05 13:22:38 +02:00
0c32f66899
get the real physical folder name for anonymous upload
2013-07-05 12:15:47 +02:00
11172db55b
handle anonymous upload to reshared folder
2013-07-05 09:58:41 +02:00
kondou
Thomas Müller
Jörn Friedrich Dreyer
Vincent Petry
Jan-Christoph Borchardt
Georg Ehrke
Bart Visscher
Andreas Fischer
Robin Appelman