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

335 commits

Author SHA1 Message Date
Morris Jobke
1fe60e435e Merge pull request #6184 from owncloud/6051-ux-files-Move-File-Spinner 
#6051 [ux][files] Move File Spinner
 2014-01-24 06:53:53 -08:00
Thomas Müller
f950ce82ae Merge branch 'master' into mobile-style 
Conflicts:
	apps/files/js/files.js
	apps/files_sharing/css/public.css
	apps/files_sharing/js/public.js
	apps/files_sharing/templates/public.php
 2014-01-23 00:39:11 +01:00
Morris Jobke
cf6e79cda8 Merge pull request #6719 from tripflex/fix_pubup_progbar 
Fix public upload progress bar
 2014-01-22 02:28:28 -08:00
Myles McNamara
9555305565 change publicUploadButtonMock to public_upload 
Changed jQuery selector for public preview to public_upload to correctly show preview
 2014-01-20 11:58:01 -05:00
Morris Jobke
f88360eba3 Merge pull request #6827 from rnveach/fix_6730 
Fix 6730
 2014-01-20 01:44:34 -08:00
rnveach
90a41ef26a fixed selector string and removed all checkbox if it was selected 2014-01-17 11:46:44 -05:00
Thomas Müller
6c76b4ba12 fixing preview generation 2014-01-15 15:07:24 +01:00
Vincent Petry
1042733634 Fixed various file name escaping issues in core apps 
- Refactored file tr lookup into FileList.findFileEl that uses
  filterAttr to avoid escaping issues in jQuery selectors
- Fixed versions and sharing app to properly escape file names in
  attributes
 2014-01-10 15:02:26 +01:00
Pellaeon Lin
0aa38165a4 Update #free_space on getstoragestats AJAX call 2013-12-11 12:18:18 +08:00
zombiehugs
8fb4ab097d Fixed indention. 
As per @kabum request, indention on line 694 has been fixed.
 2013-12-04 12:30:06 -06:00
zombiehugs
be0197a29a #6051 [ux][files] Move File Spinner 
Added spinner to file icon when moving to new folder or out of folder.

Commit is related to #6051
 2013-12-04 11:27:24 -06:00
Vincent Petry
e285e84e18 Selection summary is now displayed properly 
Fixes #5775
 2013-11-11 17:14:40 +01:00
Vincent Petry
31181e4348 Fixed storage stats to be based on current directory 
Previously, the storage statistics were always for the root dir.
This means that the upload button would always show the limit for the
root dir, even when uploading to a shared dir or external storage.

This fix adds a "dir" argument to getstoragestats.php.
 2013-11-06 10:55:19 +01:00
Vincent Petry
5d9ab6e7ac Update quota value in client after scan and upload 
After uploading, the quota value wasn't refreshed.
This fix refreshes the quota value after files have been scanned or
uploaded.
 2013-11-06 10:15:05 +01:00
Thomas Müller
b869fb2a09 calling getstoragestats.php only if a user is logged in because this call requires a user to be logged in 2013-11-05 12:18:25 +01:00
Thomas Müller
3488202f67 Merge pull request #5582 from owncloud/files-previewcaching 
Append file etag to preview URLs
 2013-11-05 01:21:51 -08:00
Jörn Friedrich Dreyer
adb5de4a88 prefer closest over parent 
closest will search up the tree
 2013-10-31 15:56:02 +01:00
Jörn Friedrich Dreyer
a4be1ebeb8 use data-file to retrieve filename 
forward port of https://github.com/owncloud/core/pull/5647#discussion-diff-7341163
trust me, I know what I'm doing
 2013-10-31 14:31:57 +01:00
Vincent Petry
efbd79198b Fixed preview URL + size while dragging an existing file 2013-10-28 15:41:52 +01:00
Vincent Petry
e62ca4ea4f Append file etag to preview URLs 
Fixes #5534
 2013-10-28 14:14:55 +01:00
Jörn Friedrich Dreyer
3121dc8cb5 Merge branch 'master' into prevent_user_from_creating_or_renaming_to_an_existing_filename 
Conflicts:
	apps/files/js/filelist.js
 2013-10-23 12:02:06 +02:00
Jörn Friedrich Dreyer
45e6d96702 prevent user from creating or renaming sth. to an existing filename 
- show tooltip when violating naming constraints while typing
- when target filename exists on server fallback to dialog to interrupt the users flow because something unexpected went wrong
- fixes #5062
- also fixes some whitespace and codestyle issues in files js
- uses css selector over filterAttr in touched js files
 2013-10-22 18:11:03 +02:00
Vincent Petry
3bb7cf939e Fixed ugly white space while loading file thumbnail 
Preview images are now pre-loaded before being set on the file element.

This fixes #5135 and prevents a white space to be displayed while the
thumbnails is being loaded.
 2013-10-22 12:08:05 +02:00
Bjoern Schiessle
1c611a3dfb give getSelectedFilesTrash() a unique name for the trash.js to avoid confusions with the same function in files.js 2013-10-18 10:57:10 +02:00
Vincent Petry
fab4102c51 Disabled ajax mode for public files view 
Ajax loading is not supported yet for public files view.
This fix disabled the history API, ajax loading and ajax directory
switch in public mode until it is implemented properly.
 2013-10-14 17:47:38 +02:00
Vincent Petry
3a3819b303 Merge pull request #5134 from owncloud/trashbin-homeiconbroken 
Do not call changeDirectory() when no dir set on breadcrumb
 2013-10-09 09:01:43 -07:00
VicDeo
d8b7e42fc1 Merge pull request #4921 from owncloud/file_conflicts_dialog_fixes 
File conflicts dialog fixes
 2013-10-07 08:19:40 -07:00
Jörn Friedrich Dreyer
4ccbace68d remove double uri encoding 2013-10-07 11:15:58 +02:00
Vincent Petry
6a4563f203 Fix breadcrumb to reinit dnd after ajax nav #5064 
Now correctly reinitializing the breadcrumb drop zone after ajax
navigation.

This also fixes dropping onto the "files" app icon.
 2013-10-07 11:07:33 +02:00
Vincent Petry
0736bfb43a Do not call changeDirectory() when no dir set on breadcrumb 
Some apps like the files_trashbin app do not set a directory on its
"home" breadcrumb link.

This fix makes sure that the click event doesn't do anything in that
case and lets the browser open the link.

This fixes the "home" icon in the trashbin app which now correctly
reopens the files app.
 2013-10-04 17:49:42 +02:00
Vincent Petry
9d2595a7c5 Shortened notification message that was too long 
The message for invalid private key was too long and didn't fit in the
notification box. This fix reduces the message to fit properly by
removing the extra information.
 2013-10-04 11:11:24 +02:00
Bjoern Schiessle
4d79e7e673 Merge branch 'master' into encryption_improved_error_messages_4617 2013-09-30 15:08:53 +02:00
Georg Ehrke
8a1618bce5 implement previews for public upload 2013-09-23 12:27:05 +02:00
Bjoern Schiessle
f6e8a388a9 Merge branch 'master' into encryption_improved_error_messages_4617 
Conflicts:
	settings/ajax/changepassword.php
 2013-09-23 10:39:12 +02:00
Jörn Friedrich Dreyer
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
Jörn Friedrich Dreyer
98ff847830 fix race condition in lazy preview loading 2013-09-19 14:46:33 +02:00
Thomas Müller
c30c153ea5 fixing typos and l10n 2013-09-19 11:13:11 +02:00
Jörn Friedrich Dreyer
0d81a53e12 use 96x96 as 64x64 thumbnails in conflicts dialog, 64x64 looks very blocky ... maybe something is wrong there 2013-09-19 10:00:42 +02:00
Jörn Friedrich Dreyer
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
Jörn Friedrich Dreyer
b40925ae17 initial scrollto implementation: 
use places/folder icon,
move link construction to JS,
only show icon on hover,
use 'searchresult' as css class name,
add filter/unfilter methods,
highlight searched files in current filelist
only filter when correct FileList is present
 2013-09-17 18:40:51 +02:00
Bjoern Schiessle
82cbbb8ab8 Merge branch 'master' into encryption_improved_error_messages_4617 
Conflicts:
	apps/files/index.php
 2013-09-16 10:42:37 +02:00
Vincent Petry
611075bf20 Fixed JS error in trashbin app 2013-09-13 19:59:15 +02:00
Vincent Petry
3cf0820d35 Changed breadcrumb event handling to not use delegate 
Using delegate might break apps that embed themselves in the files
container. When an app embeds itself and the user clicks a breadcrumb,
it will simply reload the whole browser page.
 2013-09-13 19:59:15 +02:00
Thomas Müller
4e751cbb47 fixing breadcrumbs on ajax loading of files 2013-09-13 19:59:15 +02:00
Vincent Petry
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
Bjoern Schiessle
fb462e83cc no longer enforce log out, but provide useful errors/warnings instead 2013-09-06 12:27:40 +02:00
Jörn Friedrich Dreyer
bbf8acb383 separate uploading code from progress code, add progress capability detection 2013-09-05 10:19:54 +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
6f0c1e8d45 Merge master into oc_preview 2013-08-26 12:24:33 +02:00
Georg Ehrke
46cbd7cd3b fix preview issue when uploading a file with parentheses 2013-08-26 12:16:51 +02:00
Georg Ehrke
13e34649bf move path generation for previews to dedicated function 2013-08-23 23:19:21 +02:00
Thomas Müller
101cfa2359 remove duplicate code 2013-08-22 00:09:43 +02:00
Jörn Friedrich Dreyer
bf04daff82 architecture too complex 2013-08-21 14:58:28 +02:00
Georg Ehrke
f2702ff1ca Merge master into oc_preview 2013-08-19 11:24:17 +02:00
Björn Schießle
9be836814c Merge pull request #4239 from owncloud/decrypt_files_again 
Enable user to decrypt files again after encryption app was disabled
 2013-08-18 09:51:48 -07:00
Bjoern Schiessle
cabe92ef12 Merge branch 'master' into decrypt_files_again 
Conflicts:
	apps/files_encryption/tests/keymanager.php
 2013-08-17 13:15:22 +02:00
Georg Ehrke
164502477d use jQuery.get instead of jQuery.ajax 2013-08-16 17:25:38 +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
Bjoern Schiessle
7adfc27caf remove whitespaces and some leftover code from testing 2013-08-15 13:13:16 +02:00
Georg Ehrke
4b5fb08c2c Merge master into oc_preview 2013-08-14 20:56:44 +02:00
Georg Ehrke
4f525c864d lazy load preview icons 2013-08-14 13:27:01 +02:00
Georg Ehrke
3cbbe395eb don't use hardcoded size for preview 2013-08-14 11:38:52 +02:00
Bjoern Schiessle
53bb89824d check if some encrypted files are left after the app was disabled and warn the user 2013-08-12 17:25:27 +02:00
kondou
9549bd3e68 Use plural translations 2013-08-09 20:37:18 +02:00
Georg Ehrke
ac6a3133ec style fixes 2013-07-30 12:33:54 +02:00
Thomas Müller
7425efade7 Merge branch 'master' into oc_preview 
Conflicts:
	3rdparty
	lib/template.php
 2013-07-30 00:34:36 +02:00
Bjoern Schiessle
4a9f5f64da remove whitespaces 2013-07-29 17:15:20 +02:00
Björn Schießle
a00cff7c05 disable "deleted files" button if trash bin is empty 2013-07-26 11:14:29 +02:00
Jan-Christoph Borchardt
48948ccf5f finally remove the file size obfuscation as it had more disadvantages. I was wrong, sorry. 2013-07-18 22:15:26 +02:00
Georg Ehrke
a357e5b284 merge conflicts ... 2013-07-10 12:41:53 +02:00
Georg Ehrke
cf449d42e8 properly encode path 2013-07-10 12:30:20 +02:00
Georg Ehrke
d332b1d4a2 implement preview loading after upload 2013-07-02 11:13:22 +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
davidak
56006ea852 small typo fix: added 2 whitespaces 2013-05-24 14:31:06 +02:00
Robin Appelman
3de40f7cfb Files: set the proper mimetype when creating a new text file 2013-05-06 17:55:22 +02:00
Lukas Reschke
3a6e39b990 It's a class 2013-04-28 23:28:41 +02:00
Lukas Reschke
6cf6103ed2 Move onclick handler 2013-04-28 23:25:58 +02:00
Robin Appelman
1507d1ef26 Files: Fix XSS when creating dropshadow 2013-04-22 21:55:54 +02:00
Bart Visscher
6d6dfffea7 Merge pull request #2279 from owncloud/refactor_upload_js 
Refactor upload js
 2013-04-06 15:44:08 -07:00
kondou
de2e546617 Translate 'Error' in core 2013-04-06 16:52:55 +02:00
root
74b02db337 Fixed things in alert-messages 
Two parameters for OC.dialogs.alert, otherwise one will be "undefined".

Also fixed missing translation.
 2013-04-05 01:56:32 +02:00
Jörn Friedrich Dreyer
7ecbaef16c use css browser switch instead of deprecated jquery browser detection 2013-03-28 19:13:37 +01:00
Jörn Friedrich Dreyer
dac875eb9c '#upload' is actually '#uploadprogresswrapper', fix css and js to show cancel button correctly 2013-03-28 18:50:49 +01:00
Jörn Friedrich Dreyer
868d7b956d use === to compare empty string '' 2013-03-28 18:20:03 +01:00
Jörn Friedrich Dreyer
831b7ca803 don't update progress bar in ie < 10 2013-03-28 18:20:03 +01:00
Jörn Friedrich Dreyer
4dd4167f80 refactor files.js, make proper use of fileupload events 2013-03-28 18:17:18 +01:00
Jörn Friedrich Dreyer
df31ee5a90 Merge pull request #2575 from owncloud/fixing-1461-master 
Fix upload progressbar in IE8 and IE9
 2013-03-28 10:01:39 -07:00
Thomas Mueller
586a47b186 fixes #1463 - file size is now displayed correctly in IE8 2013-03-26 21:28:01 +01:00
Thomas Mueller
cf50e67e1b prevent to fire delete ajax a second time. 
Before the click on a single file delete icon fired two different handlers - one of them is for multiple deletion only
 2013-03-26 16:27:56 +01:00
Thomas Mueller
e0e5cb73bf fixes #1461 2013-03-26 14:14:30 +01:00
Björn Schießle
f971ce0b66 let public link download handle json encoded file lists 2013-03-13 11:15:17 +01:00
Björn Schießle
4a4f705adc json encode list of files 2013-03-07 14:15:02 +01:00
Bernhard Posselt
1d83d76b45 fixed bug that prevented a newly created file to be opened with registered files actions 2013-02-25 17:50:17 +01:00
Jörn Friedrich Dreyer
664e7a3fc2 use distance option to delay dragging in sane browsers 2013-02-25 15:08:14 +01:00
Thomas Müller
7c30c1a2e8 Merge pull request #1833 from owncloud/fix_1465 
Fix 1465
 2013-02-25 04:34:13 -08:00
Bart Visscher
bb75dfc021 Whitespace fixes 2013-02-22 19:05:36 +01:00
Jörn Friedrich Dreyer
0dd7fd0599 IE8 does not support window.onclick 2013-02-21 17:38:25 +01:00
VicDeo
fde0a8b520 Add Ability to the app to detect more details on the file 2013-02-18 13:22:43 +03:00
Jörn Friedrich Dreyer
bf4a073dca count divs in actions instead of action div itself (is set to 100%) 2013-02-10 12:38:16 +01:00
Thomas Müller
ce8fc20e0b remove unused code 2013-02-08 18:04:27 +01:00
Thomas Müller
04b97a1906 Merge pull request #1229 from owncloud/from_live_to_on 
replace live() with on() in core js
 2013-02-03 21:55:54 -08:00
Thomas Mueller
b1da1db0eb Merge branch 'master' into from_live_to_on 
Conflicts:
	apps/files_external/js/google.js
 2013-01-31 23:34:12 +01:00
Thomas Mueller
c1072d0c09 call ajax scan only if a user is logged in - otherwise we'll get a 500 2013-01-31 23:26:40 +01:00
Björn Schießle
54eeb8b8fc fix merge conflict 2013-01-31 10:55:59 +01:00
Robin Appelman
207aa22d12 merge master into filesystem 2013-01-30 19:24:24 +01:00
Jörn Friedrich Dreyer
263c3f3a42 attach on to filelist instead of individual td elements for file link behaviour 2013-01-30 17:10:40 +01:00
Jörn Friedrich Dreyer
22812c5f0d replace live() with on() in core js 2013-01-30 17:00:54 +01:00
Jörn Friedrich Dreyer
81a398c22c use $.trim() for IE8 2013-01-30 13:29:24 +01:00
Jörn Friedrich Dreyer
99dfaee1f6 reset checkbox after getting selected files instead of ofter dragging, speed up revert 2013-01-30 12:59:35 +01:00
Jörn Friedrich Dreyer
1d0ee61f3a use post instead of get 2013-01-30 12:59:35 +01:00
Jörn Friedrich Dreyer
0089b17749 add multselect dnd 2013-01-30 12:59:34 +01:00
Thomas Müller
5761bd771f Merge pull request #1227 from owncloud/hideuploadprogresscancelinielt10 
hide upload progress bar and cancel action in IE < 10
 2013-01-30 02:48:12 -08:00
Björn Schießle
8067a1394e fix merge conflicts 2013-01-28 11:18:04 +01:00
Robin Appelman
930b9b9cd0 merge master into filesystem 2013-01-26 18:49:45 +01:00
Björn Schießle
dfab3d3d7f call the trash bin view 2013-01-22 15:33:53 +01:00
Björn Schießle
9d77317de8 add trash button to web interface 2013-01-22 15:32:57 +01:00
Robin Appelman
83d6221322 merge master into filesytem 2013-01-20 03:11:04 +01:00
Thomas Mueller
5d6c1d52bd replace #notification with OC.Notification call 2013-01-19 21:37:05 +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
Jan-Christoph Borchardt
ae244972cb Merge pull request #1228 from owncloud/generating_zip_message 
Make the ZIP download information friendlier
 2013-01-19 04:33:39 -08:00
Lukas Reschke
02bd8dd45a Change the second part of the notification 2013-01-19 13:12:27 +01:00
Thomas Mueller
1dd70ac506 update used space percent after each ajax call and display the notification 2013-01-19 00:31:49 +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
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
Lukas Reschke
ad57db3e87 Make the message friendlier 2013-01-18 22:35:26 +01:00
Jörn Friedrich Dreyer
5e16510a53 hide upload progress bar and cancel action in IE < 10 2013-01-18 22:06:42 +01:00
Thomas Mueller
5ff29b4348 fixing indent 2013-01-18 20:09:03 +01:00
Robin Appelman
5445b94416 merge master into filesystem 2013-01-16 19:04:50 +01:00
Bart Visscher
5bfe4adbaa Whitespace cleanup 2013-01-16 18:09:16 +01:00
Robin Appelman
9bf367e7f8 merge master into filesystem 2013-01-15 14:57:23 +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
3d33e8f845 fixing indent - sorryy wrong setting on the IDE :-( 
replace missing calls to OC.Notification.show
 2013-01-11 15:02:34 +01:00
Thomas Mueller
9afdc14d40 adding accidentally removed line - THX @bartv2 2013-01-11 14:55:49 +01:00
Thomas Mueller
364b1cd391 Merge branch 'master' into fixing-998-master 
Conflicts:
	apps/files/js/files.js
 2013-01-11 10:00:12 +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
780fb37758 allow default click behaviour 2013-01-09 15:21:55 +01:00
Thomas Mueller
7b9e6d2f2c fixing string concatenation in javascript 
refs ae54364d7c
 2013-01-08 00:32:41 +01:00
Jörn Friedrich Dreyer
3bb7ee521f attach max upload tipsy to div instead of a to fix tooltip not showing due to new z-index 2013-01-07 12:23:29 +01:00
Jörn Friedrich Dreyer
da442b024c remove aborted uploads 2013-01-07 11:11:21 +01:00
Jörn Friedrich Dreyer
cbb118d4a3 adapt to isFileNameValid, whitespace cleanup 2013-01-07 10:39:35 +01:00
Robin Appelman
e8d08d4930 merge master into filesystem 2013-01-07 00:16:10 +01:00
Thomas Mueller
9671ace32e Merge branch 'master' into fix_minor_files_annoyances 
Conflicts:
	apps/files/js/files.js
 2013-01-06 22:46:40 +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
Thomas Mueller
07b3b23a39 Merge branch 'master' into fixing-998-master 
Conflicts:
	apps/files/js/files.js
 2013-01-06 22:28:21 +01:00
Thomas Mueller
b4191b7da5 rename containsInvalidCharacters() to isFileNameValid() - NOTE: semantic has changed! 
adding file name checks and notifications to isFileNameValid() for . and empty file name
 2013-01-06 12:52:00 +01:00
Thomas Mueller
ba475d4862 javascript notification functions have been moved to js.js for common use 2013-01-04 23:34:09 +01:00
Jörn Friedrich Dreyer
03b8a065cf input/form switching cleanup 2013-01-02 17:03:16 +01:00