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

414 commits

Author SHA1 Message Date
Jörn Friedrich Dreyer
8899543b7f use !== comparison 2013-10-07 11:14:10 +02:00
Vincent Petry
ba0f2f10a7 Merge pull request #4933 from owncloud/1376-filesappplussigninurlbug 
Replace plus sign with space in files app URL #4932
 2013-10-04 05:30:30 -07: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
Vincent Petry
1962bed261 Replace plus sign with space in files app URL #4932 
Some apps create URLs to the files app and encode the spaces of a
directory using plus signs.

This fix ensures that plus signs are properly converted back to spaces
when parsing the URL on the JS side.
 2013-09-20 22:08:57 +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
bd5cb1d801 Merge pull request #4900 from owncloud/fixing-4488-master 
File permissions are part of the ajax response of file upload
 2013-09-19 07:46:37 -07:00
Jörn Friedrich Dreyer
9f9eb1b08f Merge pull request #4263 from owncloud/search_scrollto 
initial scrollto implementation
 2013-09-19 05:49:45 -07:00
Jörn Friedrich Dreyer
98ff847830 fix race condition in lazy preview loading 2013-09-19 14:46:33 +02:00
Thomas Müller
4344c62f7e Merge branch 'master' into fixing-4488-master 2013-09-19 11:43:38 +02:00
Jörn Friedrich Dreyer
1bba800e47 Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core into fix_3728_with_file_exists_dialog 2013-09-19 11:33:34 +02:00
Jörn Friedrich Dreyer
ae97fad632 fix double translation of error message 2013-09-19 11:32:56 +02:00
Thomas Müller
eea02cee2f Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core into fix_3728_with_file_exists_dialog 
Conflicts:
	apps/files/js/file-upload.js
 2013-09-19 11:15:20 +02:00
Thomas Müller
c30c153ea5 fixing typos and l10n 2013-09-19 11:13:11 +02:00
Jörn Friedrich Dreyer
89ed0007c0 jsdoc types should go into {} 2013-09-19 11:11:22 +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
Thomas Müller
3c0e93e220 no file actions during upload 2013-09-18 23:06:48 +02:00
Jörn Friedrich Dreyer
715846626e hide excessive logging with a trace flag 2013-09-18 14:39:39 +02:00
Jörn Friedrich Dreyer
17337b22af Merge branch 'master' into fix_3728_with_file_exists_dialog 
Conflicts:
	apps/files/js/file-upload.js
 2013-09-18 14:19:58 +02:00
Thomas Müller
20a43d1982 remove file action elements before recreating them 2013-09-18 13:09:47 +02:00
Thomas Müller
6ed2df11fc store the permissions retrieved via ajax within the dom element 2013-09-18 13:09:04 +02:00
Jörn Friedrich Dreyer
86c4c83b86 use exists 2013-09-17 19:11:18 +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
Jörn Friedrich Dreyer
d41e722629 refactor upload progress 2013-09-16 14:14:46 +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
Thomas Müller
46f59b165e Merge pull request #4838 from owncloud/refactor_upload_js 
refactor upload js & html to always use only js to fill form data
 2013-09-16 01:06:24 -07:00
Vincent Petry
30a2f2f352 Use hash part of URL for IE8 in files app 
Before this fix, the URL wasn't updated in IE8 when navigating into
folders.

This fix makes use of the hash part of URLs to make this work in IE8,
since IE8 doesn't support the history API nor changing the URL without
redirecting.

From now, both the regular query URL "?dir=somedir" and "#?dir=somedir"
will work in both IE8 and non-IE8 browsers.

In IE8, query based URLs are automatically converted to hash URLs upon
page load. The conversion is done on the server side by redirecting the
user to the updated URL.

When loading a page directly using a hash URL in the form
"#?dir=somedir" in IE8, the server doesn't get the hash, so it will not
return any results in that case and rely on ajax to load the first page.
 2013-09-13 20:48:35 +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
Vincent Petry
364e7991a4 Fixed ajax support to also update the current dir permissions 2013-09-13 19:59:15 +02:00
Thomas Müller
4ab5e58e02 update file summary on ajax file list load 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
Thomas Müller
ef955bae56 calling replaceSVG() to display breadcrumb images correctly on IE8 2013-09-13 19:59:15 +02:00
Thomas Müller
e6f21927d6 fixing no-repeat for IE8 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
Jörn Friedrich Dreyer
7854cf04ee refactor upload js & html to always use only js to fill form data 2013-09-13 17:07:52 +02:00
Jörn Friedrich Dreyer
cec932f292 Merge branch 'master' into fix_3728_with_file_exists_dialog 
Conflicts:
	apps/files/js/file-upload.js
 2013-09-10 16:54:48 +02:00
Thomas Müller
956a2335ad Merge pull request #4647 from owncloud/fix_4619 
Workaround for IE 9 & 10 for clicking filelist after adding new item
 2013-09-10 01:22:25 -07:00
Jörn Friedrich Dreyer
03c90e968f whitespace and indentation fixes 2013-09-08 17:29:43 +02:00
Jörn Friedrich Dreyer
577e3f22b2 remove unused hooks 2013-09-08 10:43:52 +02:00
Jörn Friedrich Dreyer
8828fafd36 cleanup comments 2013-09-08 10:41:20 +02:00
Jörn Friedrich Dreyer
ce03501646 fine ie8 compatability 2013-09-06 23:44:40 +02:00
Jörn Friedrich Dreyer
673e0c01a7 fix page leaving checks 2013-09-06 22:40:10 +02:00
Jörn Friedrich Dreyer
796e137e82 fix upload to folder 2013-09-06 18:51:27 +02:00
Jörn Friedrich Dreyer
e2c0fe8296 fix upload of multiple files 2013-09-06 18:16:40 +02:00
Jörn Friedrich Dreyer
238d92b11c refactor replace and autorename resolution in upload.php 2013-09-06 17:53:58 +02:00
Bjoern Schiessle
fb462e83cc no longer enforce log out, but provide useful errors/warnings instead 2013-09-06 12:27:40 +02:00