263f8bebfe
Added FileList.setViewerMode to hide controls
...
Some files app embed themselves under the controls (like the text
editor). The new method FileList.setViewerMode() makes it possible to
properly show/hide the control buttons using the correct permissions.
Apps using this approach must call setViewerMode(true) when starting and
setViewerMode(false) upon closing to restore the controls.
This is needed for #5284
2013-10-22 16:44:57 +02:00
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
732e7db319
Fix mind-boggling emptycontent logic
2013-10-21 19:49:27 +02:00
7864a3bf07
Fix shared folder still showing fileheader
2013-10-21 17:59:51 +02:00
40cc57ab3e
Improve updateEmptyContent logic
2013-10-20 22:55:49 +02:00
60b25a2e97
Create FileList.updateEmptyContent() and fix not showing emptycontent after deletion
2013-10-20 22:47:44 +02:00
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
467f864db4
Fixed sharing status update for new/uploaded files
...
Creating new files, folders or uploading files now have their sharing
icon updated accordingly.
For this, the global share status list that is cached in
OC.Share.statuses is reused for new files.
Performance should improve as the sharing list is now only loaded once
per navigation session.
In OC.Share, split loadIcons into loadIcons + updateIcons.
Fixes #4977
2013-10-17 12:55:10 +02:00
a132144eca
Merge pull request #5262 from owncloud/files-ie8-conflictdialogbrokenfix
...
Fixed conflict dialog in IE8
2013-10-16 12:52:41 -07:00
db31541fe1
Merge pull request #5353 from owncloud/files-dndtodirbroken
...
Fixed drag and drop to subfolder and breadcrumb
2013-10-16 04:52:35 -07:00
c6f14001bb
Fixed drag and drop upload to breadcrumb
2013-10-15 16:14:23 +02:00
92e646413a
Fixed drag and drop onto folders
...
Fixes #5351
2013-10-15 15:59:45 +02:00
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
f828b51ede
Hide files list header, when theres no files to see
2013-10-12 17:28:20 +02:00
dc58195c7f
Merge pull request #5207 from owncloud/fixing-4011-part2-master
...
[OC6] file upload exception handling
2013-10-11 10:35:17 -07:00
e98ea06890
File actions are now updated after create/upload file
...
The file actions must explicitly be updated by calling
FileActions.display() on the file element after creating or uploading a
file.
Fixes #4971 and #4993
2013-10-11 17:07:48 +02:00
e2a4417079
Fixed conflict dialog in IE8
...
- Fixed JS error that prevent the conflict dialog to open #5060
- Fixed JS error that prevented the overwrite case to run
2013-10-10 15:54:00 +02:00
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
7c6ed6ab33
catch exceptions while uploading and pass on the error message
2013-10-08 15:03:24 +02:00
d8b7e42fc1
Merge pull request #4921 from owncloud/file_conflicts_dialog_fixes
...
File conflicts dialog fixes
2013-10-07 08:19:40 -07:00
4ccbace68d
remove double uri encoding
2013-10-07 11:15:58 +02:00
0683372200
canceling individual uploads is currently impossible because there is no placeholder
2013-10-07 11:14:11 +02:00
8899543b7f
use !== comparison
2013-10-07 11:14:10 +02:00
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
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
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
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
4d79e7e673
Merge branch 'master' into encryption_improved_error_messages_4617
2013-09-30 15:08:53 +02:00
8a1618bce5
implement previews for public upload
2013-09-23 12:27:05 +02:00
f6e8a388a9
Merge branch 'master' into encryption_improved_error_messages_4617
...
Conflicts:
settings/ajax/changepassword.php
2013-09-23 10:39:12 +02:00
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
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
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
9f9eb1b08f
Merge pull request #4263 from owncloud/search_scrollto
...
initial scrollto implementation
2013-09-19 05:49:45 -07:00
98ff847830
fix race condition in lazy preview loading
2013-09-19 14:46:33 +02:00
4344c62f7e
Merge branch 'master' into fixing-4488-master
2013-09-19 11:43:38 +02:00
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
ae97fad632
fix double translation of error message
2013-09-19 11:32:56 +02:00
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
c30c153ea5
fixing typos and l10n
2013-09-19 11:13:11 +02:00
89ed0007c0
jsdoc types should go into {}
2013-09-19 11:11:22 +02:00
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
3c0e93e220
no file actions during upload
2013-09-18 23:06:48 +02:00
715846626e
hide excessive logging with a trace flag
2013-09-18 14:39:39 +02:00
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
20a43d1982
remove file action elements before recreating them
2013-09-18 13:09:47 +02:00
6ed2df11fc
store the permissions retrieved via ajax within the dom element
2013-09-18 13:09:04 +02:00
86c4c83b86
use exists
2013-09-17 19:11:18 +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
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
d41e722629
refactor upload progress
2013-09-16 14:14:46 +02:00
82cbbb8ab8
Merge branch 'master' into encryption_improved_error_messages_4617
...
Conflicts:
apps/files/index.php
2013-09-16 10:42:37 +02:00
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
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
611075bf20
Fixed JS error in trashbin app
2013-09-13 19:59:15 +02:00
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
364e7991a4
Fixed ajax support to also update the current dir permissions
2013-09-13 19:59:15 +02:00
4ab5e58e02
update file summary on ajax file list load
2013-09-13 19:59:15 +02:00
4e751cbb47
fixing breadcrumbs on ajax loading of files
2013-09-13 19:59:15 +02:00
ef955bae56
calling replaceSVG() to display breadcrumb images correctly on IE8
2013-09-13 19:59:15 +02:00
e6f21927d6
fixing no-repeat for IE8
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
7854cf04ee
refactor upload js & html to always use only js to fill form data
2013-09-13 17:07:52 +02:00
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
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
03c90e968f
whitespace and indentation fixes
2013-09-08 17:29:43 +02:00
577e3f22b2
remove unused hooks
2013-09-08 10:43:52 +02:00
8828fafd36
cleanup comments
2013-09-08 10:41:20 +02:00
ce03501646
fine ie8 compatability
2013-09-06 23:44:40 +02:00
673e0c01a7
fix page leaving checks
2013-09-06 22:40:10 +02:00
796e137e82
fix upload to folder
2013-09-06 18:51:27 +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
fb462e83cc
no longer enforce log out, but provide useful errors/warnings instead
2013-09-06 12:27:40 +02:00
8a7e26b268
cleanup dead code
2013-09-05 17:46:19 +02:00
03ddf8da80
Merge branch 'master' into fix_3728_with_file_exists_dialog
...
Conflicts:
apps/files/js/file-upload.js
2013-09-05 10:31:43 +02:00
bbf8acb383
separate uploading code from progress code, add progress capability detection
2013-09-05 10:19:54 +02:00
3b25babe35
Merge pull request #4683 from owncloud/publicuploadjserror
...
Fixed public upload error that prevents upload
2013-09-04 11:50:38 -07:00
49fd7e9f1e
refactor dialog creation
2013-09-04 16:42:18 +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
307b673b79
Fixed public upload error that prevents upload
...
Public upload is broken because the file_upload_param variable expected
to exist by public.js didn't.
This fix sets the variable scope to the window to make it accessible
outside.
2013-09-01 16:14:46 +02:00
b10a646bc8
rename emptyfolder to emptycontent
2013-08-31 11:25:11 -04:00
f4ec5182bd
Workaround for IE 9 & 10 for clicking filelist after adding new item
2013-08-29 12:06:07 -04:00
b7758d0f8d
Merge master into oc_preview
2013-08-29 10:50:55 +02:00
6bd0f3cba7
Reimplement filesummary in JS
...
Fix #993
2013-08-28 15:10:17 +02:00
3eed060ec9
backport of #4357 to master
2013-08-27 23:53:04 +02:00
b16a018da9
use random string as id for checkbox
2013-08-26 16:33:51 +02:00
d538a566ac
fix background size in filelist.js
2013-08-26 14:36:18 +02:00
6f0c1e8d45
Merge master into oc_preview
2013-08-26 12:24:33 +02:00
46cbd7cd3b
fix preview issue when uploading a file with parentheses
2013-08-26 12:16:51 +02:00
13e34649bf
move path generation for previews to dedicated function
2013-08-23 23:19:21 +02:00
6ffa2a28d0
Merge branch 'master' into oc_preview
2013-08-23 23:10:37 +02:00
7c9d999243
reduced complexity, added listing conflicts to dialog
2013-08-22 14:29:00 +02:00
101cfa2359
remove duplicate code
2013-08-22 00:09:43 +02:00
bf04daff82
architecture too complex
2013-08-21 14:58:28 +02:00
90da518e3e
Merge pull request #4262 from owncloud/fix_jslint_kondou
...
Fix some JSLint warnings
2013-08-20 12:45:10 -07:00
f2702ff1ca
Merge master into oc_preview
2013-08-19 11:24:17 +02:00
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
9e8a6b704d
Add _many_ newlines at the end of files
2013-08-18 11:06:59 +02:00
edd92e4c09
Merge branch 'master' into fix_jslint_kondou
...
Conflicts:
apps/files/js/file-upload.js
2013-08-18 00:38:52 +02:00
12f4494de0
Merge pull request #4339 from owncloud/mimetype-defaults
...
Add the option to provide templates for newly created files
2013-08-17 08:42:49 -07:00
cabe92ef12
Merge branch 'master' into decrypt_files_again
...
Conflicts:
apps/files_encryption/tests/keymanager.php
2013-08-17 13:15:22 +02:00
7e4dcd268f
vertically center rename input box
2013-08-17 10:46:03 +02:00
164502477d
use jQuery.get instead of jQuery.ajax
2013-08-16 17:25:38 +02:00
f94e603698
progress fixes
2013-08-16 11:40:55 +02:00
d2767faf61
Merge pull request #4113 from owncloud/delete-fix
...
Delete icon fix
2013-08-15 15:31:42 -07:00
57f7ff2dbd
communicate size of newly created file back and update UI
2013-08-16 00:31:27 +02:00
bd1895bdf8
Merge pull request #4354 from owncloud/fix_2711_shared_icon_disappears_on_firefox
...
fix #2711 using a custom event, also use css selectors over filterAttr
2013-08-15 14:08:01 -07:00
7adfc27caf
remove whitespaces and some leftover code from testing
2013-08-15 13:13:16 +02:00
2fd5178a00
adjust New file dialog for new styles
2013-08-15 12:50:26 +02:00
4b5fb08c2c
Merge master into oc_preview
2013-08-14 20:56:44 +02:00
cba0f69622
increase row height to 50px, properly position everything, checkboxes, actions etc
2013-08-14 20:41:20 +02:00
9da49264ea
change filelist ui updates
2013-08-14 17:49:45 +02:00
4f525c864d
lazy load preview icons
2013-08-14 13:27:01 +02:00
3cbbe395eb
don't use hardcoded size for preview
2013-08-14 11:38:52 +02:00
e1927d5bee
fix whitespace, check selected files before starting upload
2013-08-14 10:55:12 +02:00
4002491947
Reword a phrase
2013-08-14 06:29:19 +02:00
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
9549bd3e68
Use plural translations
2013-08-09 20:37:18 +02:00
ff67f115d4
fix #2711 using a custom event, also use css selectors over filterAttr
2013-08-08 13:50:04 +02:00
1348330c7d
Fix a syntax error & have if-conds in an own line
2013-08-01 18:44:01 +02:00
aaf0fec9f5
Fix some JSLint warnings
2013-07-31 21:21:02 +02:00
ac6a3133ec
style fixes
2013-07-30 12:33:54 +02:00
1a1c100719
fix loading.gif size for both upload and deletion, force visiblity
2013-07-30 10:44:01 +02:00
7425efade7
Merge branch 'master' into oc_preview
...
Conflicts:
3rdparty
lib/template.php
2013-07-30 00:34:36 +02:00
33fe24dc3d
Replace delete icon with spinner
2013-07-29 19:27:11 +03:00
4a9f5f64da
remove whitespaces
2013-07-29 17:15:20 +02:00
a00cff7c05
disable "deleted files" button if trash bin is empty
2013-07-26 11:14:29 +02:00
2a42021815
Merge branch 'master' into delete-fix
...
Conflicts:
core/css/styles.css
2013-07-23 16:24:34 +02:00
48948ccf5f
finally remove the file size obfuscation as it had more disadvantages. I was wrong, sorry.
2013-07-18 22:15:26 +02:00
4bfd61fb7f
use new delete icon for deleted files as well
2013-07-18 18:46:37 +02:00
8a25d1ad06
remove unnecessary tipsy for Files delete
2013-07-18 18:41:01 +02:00
197c979d26
use background image instead of img for Files delete icon
2013-07-18 18:40:09 +02:00
cb81ceb31d
add new file above summary if it is the first file in the list
2013-07-12 10:40:24 +02:00
a357e5b284
merge conflicts ...
2013-07-10 12:41:53 +02:00
cf449d42e8
properly encode path
2013-07-10 12:30:20 +02:00
d332b1d4a2
implement preview loading after upload
2013-07-02 11:13:22 +02:00
5fff4e0d08
Merge pull request #3903 from owncloud/nonpublic-uploading
...
Fix upload regressions
2013-07-01 12:35:32 -07:00
492c0571a0
fix detection of public upload in filelist.js
2013-07-01 15:47:40 +02:00
b19033b353
Merge pull request #3223 from owncloud/fix-2820
...
if rename of file fails, the rename is undone in the view - fix 2820
2013-07-01 01:28:17 -07:00
e3df2b8c87
Merge pull request #1044 from owncloud/fix_extra_slash
...
Remove duplicate / for first folder in root
2013-06-28 12:00:35 -07:00
89dc8be9f5
update to !==
2013-06-28 21:00:09 +02:00
da0caadf4e
Added file-upload to GIT repo
...
Optimized CSS identifiers
2013-06-26 22:51:38 +02:00
ddb0ff346d
Public upload feature
2013-06-25 12:24:14 +02:00
6778a45d45
use json to encode user list
2013-06-19 15:02:18 +02:00
85585ede02
allow scanning files for multiple users
2013-06-19 01:26:08 +02:00
e0547a25ab
if rename of file fails, the rename is undone in the view - #fix 2820
...
Changes:
* OC.dialog -> OC.Notification
* Added test
* Fixed OC.Notification.show() issue for queued items
* Highlight failed item and show notification
2013-06-15 09:58:27 +02:00
0872f641dd
darker low threshold color for file size and age fading, better contrast
2013-06-11 14:30:13 +02:00
56006ea852
small typo fix: added 2 whitespaces
2013-05-24 14:31:06 +02:00
591b383f2d
peselect filename without extension on rename
2013-05-13 15:54:45 +02:00
3de40f7cfb
Files: set the proper mimetype when creating a new text file
2013-05-06 17:55:22 +02:00
3a6e39b990
It's a class
2013-04-28 23:28:41 +02:00
6cf6103ed2
Move onclick handler
2013-04-28 23:25:58 +02:00
1ee224d8cb
Merge pull request #3108 from owncloud/fileactions-order
...
Files: fix the order fileactions are computed for a file
2013-04-24 10:55:38 -07:00
637dd685db
fix wrong shared icon description
...
fix #2928
translation of string "Shared" has to be marked as located in "files" for the translation extractor
2013-04-24 16:13:17 +02:00
ab7fcebeb3
Files: fix the order fileactions are computed for a file
2013-04-24 15:26:36 +02:00
1507d1ef26
Files: Fix XSS when creating dropshadow
2013-04-22 21:55:54 +02:00
802a5a331b
Fix displaying spinner on delete
2013-04-19 13:46:11 +02:00
6d6dfffea7
Merge pull request #2279 from owncloud/refactor_upload_js
...
Refactor upload js
2013-04-06 15:44:08 -07:00
de2e546617
Translate 'Error' in core
2013-04-06 16:52:55 +02:00
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
7ecbaef16c
use css browser switch instead of deprecated jquery browser detection
2013-03-28 19:13:37 +01:00
dac875eb9c
'#upload' is actually '#uploadprogresswrapper', fix css and js to show cancel button correctly
2013-03-28 18:50:49 +01:00
e31d74037a
use local variable to walk DOM only once
2013-03-28 18:20:03 +01:00
868d7b956d
use === to compare empty string ''
2013-03-28 18:20:03 +01:00
831b7ca803
don't update progress bar in ie < 10
2013-03-28 18:20:03 +01:00
c1a944a655
return created table row, use as context in fileupload events
2013-03-28 18:17:18 +01:00
4dd4167f80
refactor files.js, make proper use of fileupload events
2013-03-28 18:17:18 +01:00
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
586a47b186
fixes #1463 - file size is now displayed correctly in IE8
2013-03-26 21:28:01 +01:00
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
e0e5cb73bf
fixes #1461
2013-03-26 14:14:30 +01:00
d121180d46
Merge pull request #2270 from owncloud/fix_json_encoded_pubic_download
...
let public link download handle json encoded file lists [master]
2013-03-26 01:56:47 -07:00
e5f40ddaae
only prevent shared action for the Shared folder in the root dir
2013-03-13 11:33:20 +01:00
f971ce0b66
let public link download handle json encoded file lists
2013-03-13 11:15:17 +01:00
b2da2f769a
don't add share action to the Shared folder
2013-03-12 17:28:36 +01:00
4a4f705adc
json encode list of files
2013-03-07 14:15:02 +01:00
0488968443
Merge pull request #2034 from owncloud/fix_bug47
...
Fix #47 - Duplicate files create a (2) when multiples are uploaded
2013-03-03 11:49:04 -08:00
ff9476b3e3
fix oc#47
2013-03-01 18:30:25 +01:00
1d83d76b45
fixed bug that prevented a newly created file to be opened with registered files actions
2013-02-25 17:50:17 +01:00
3ef8c0bda3
Merge pull request #1892 from owncloud/files_remove_row_on_delete
...
delete table row if file was deleted instead of just hide it
2013-02-25 07:44:35 -08:00
dbf2bfc8cd
delete table row if file was deleted instead of just hide it
2013-02-25 16:32:54 +01:00
664e7a3fc2
use distance option to delay dragging in sane browsers
2013-02-25 15:08:14 +01:00
7c30c1a2e8
Merge pull request #1833 from owncloud/fix_1465
...
Fix 1465
2013-02-25 04:34:13 -08:00
bb75dfc021
Whitespace fixes
2013-02-22 19:05:36 +01:00
0dd7fd0599
IE8 does not support window.onclick
2013-02-21 17:38:25 +01:00
3b9d9eea09
replaced for in loops with normal enumerating loops to fix #1803
2013-02-20 21:57:50 +01:00
fde0a8b520
Add Ability to the app to detect more details on the file
2013-02-18 13:22:43 +03:00
a03d70209f
fixing undefined originalEvent
2013-02-14 12:19:50 +01:00
37ea784294
Files: always show share action at the right
...
Fixes #1619
2013-02-11 16:09:04 +01:00
855c9480b7
only encodeURIComponent once
2013-02-09 13:07:52 +01:00
e928a342c4
Check if extra / is necessary for the folder URL
2013-02-09 13:07:52 +01:00
ab4ae2b952
Merge pull request #1560 from owncloud/fix_replacing
...
remove (comment out) old code to fix replacing of files
2013-02-09 03:28:40 -08:00
ca243f3fac
Merge pull request #1521 from schiesbn/label_fixed
...
don't call the delete button unshare, unshare operation no longer available
2013-02-09 03:14:25 -08:00
8961e675c7
remove (comment out) old code to fix replacing of files
2013-02-09 11:28:13 +01:00
5a15221910
Merge pull request #1550 from owncloud/fix-files-download-links
...
Fix files router download links
2013-02-09 01:28:25 -08:00
bf4a073dca
count divs in actions instead of action div itself (is set to 100%)
2013-02-10 12:38:16 +01:00
676f89bbdb
extract common code
2013-02-09 14:42:03 +01:00
0c73cae77b
Merge pull request #1565 from owncloud/fix_replacing
...
remove code properly to make @DeepDiver1975 happy ;)
2013-02-09 03:58:06 -08:00
2137bbe330
remove code properly
2013-02-09 12:38:40 +01:00
ed1dc3e064
Fix files router download links
2013-02-08 22:05:13 +01:00
ce8fc20e0b
remove unused code
2013-02-08 18:04:27 +01:00
1d3c1328fa
remove undefined function FileList.finishDelete
2013-02-08 15:51:28 +01:00
c72537cd85
don't call the delete button unshare, unshare operation no longer available
2013-02-07 12:42:09 +01:00
e2516a2b65
allow to delete single files from the trash bin permanently
2013-02-06 16:23:22 +01:00
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
b1da1db0eb
Merge branch 'master' into from_live_to_on
...
Conflicts:
apps/files_external/js/google.js
2013-01-31 23:34:12 +01:00
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
5417e44b2a
Files: fix moving files by DnD
2013-01-31 17:56:44 +01:00
54eeb8b8fc
fix merge conflict
2013-01-31 10:55:59 +01:00
207aa22d12
merge master into filesystem
2013-01-30 19:24:24 +01:00
263c3f3a42
attach on to filelist instead of individual td elements for file link behaviour
2013-01-30 17:10:40 +01:00
22812c5f0d
replace live() with on() in core js
2013-01-30 17:00:54 +01:00
9ca0a93847
make spinner title translatable
2013-01-30 16:20:13 +01:00
1592764a60
show a spinner instead of the delete button while moving files to the trash bin
2013-01-30 14:32:20 +01:00
81a398c22c
use $.trim() for IE8
2013-01-30 13:29:24 +01:00
99dfaee1f6
reset checkbox after getting selected files instead of ofter dragging, speed up revert
2013-01-30 12:59:35 +01:00
1d0ee61f3a
use post instead of get
2013-01-30 12:59:35 +01:00
0089b17749
add multselect dnd
2013-01-30 12:59:34 +01:00
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
d10e137939
icons added; empty trash bin message added
2013-01-29 10:03:04 +01:00
74f6f85628
merge master into filesystem
2013-01-28 19:37:58 +01:00
320233ec3d
merge conflict fixed
2013-01-28 15:10:00 +01:00
8067a1394e
fix merge conflicts
2013-01-28 11:18:04 +01:00
930b9b9cd0
merge master into filesystem
2013-01-26 18:49:45 +01:00
2e42c6f54f
Use HTML5 data attribute + fix undefined variable
2013-01-26 14:07:35 +01:00
276d98b9dd
Merge pull request #1059 from owncloud/fixing-998-master
...
Fixing 998 master
2013-01-26 04:15:40 -08:00
367aadb3b7
rename 'publicListView' switch to 'disableSharing' because this is not only used for the public list view
2013-01-22 18:34:59 +01:00
16ae902e31
no undo notification for deleted file, we use the trash bin instead
2013-01-22 17:43:46 +01:00
1817c7895b
allow to look into deleted directories
2013-01-22 15:33:54 +01:00
8259768732
introduce option to disable download action
2013-01-22 15:33:53 +01:00
dfab3d3d7f
call the trash bin view
2013-01-22 15:33:53 +01:00
9d77317de8
add trash button to web interface
2013-01-22 15:32:57 +01:00
8223117569
Remove closing tag
2013-01-21 22:29:27 +01:00
0d02caa684
No inline JS in apps
2013-01-21 20:34:28 +01:00
83d6221322
merge master into filesytem
2013-01-20 03:11:04 +01:00
5d6c1d52bd
replace #notification with OC.Notification call
2013-01-19 21:37:05 +01:00
b8318e6df4
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/js/files.js
2013-01-19 15:58:15 +01:00
ae244972cb
Merge pull request #1228 from owncloud/generating_zip_message
...
Make the ZIP download information friendlier
2013-01-19 04:33:39 -08:00
02bd8dd45a
Change the second part of the notification
2013-01-19 13:12:27 +01:00
1dd70ac506
update used space percent after each ajax call and display the notification
2013-01-19 00:31:49 +01:00
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
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
ad57db3e87
Make the message friendlier
2013-01-18 22:35:26 +01:00
5e16510a53
hide upload progress bar and cancel action in IE < 10
2013-01-18 22:06:42 +01:00
5ff29b4348
fixing indent
2013-01-18 20:09:03 +01:00
5445b94416
merge master into filesystem
2013-01-16 19:04:50 +01:00
5bfe4adbaa
Whitespace cleanup
2013-01-16 18:09:16 +01:00
94068e5d08
Cache: show upgrade progress
2013-01-15 18:13:50 +01:00
9bf367e7f8
merge master into filesystem
2013-01-15 14:57:23 +01:00
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
362860c5b5
adding jquery-visibility
...
https://github.com/mathiasbynens/jquery-visibility
MIT and GPL licensed
2013-01-11 16:44:25 +01:00
3d33e8f845
fixing indent - sorryy wrong setting on the IDE :-(
...
replace missing calls to OC.Notification.show
2013-01-11 15:02:34 +01:00
9afdc14d40
adding accidentally removed line - THX @bartv2
2013-01-11 14:55:49 +01:00
364b1cd391
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/js/files.js
2013-01-11 10:00:12 +01:00
23896a7290
Merge branch 'master' into fixing-784-master
...
Conflicts:
apps/files/js/files.js
2013-01-11 09:53:12 +01:00
780fb37758
allow default click behaviour
2013-01-09 15:21:55 +01:00
7b9e6d2f2c
fixing string concatenation in javascript
...
refs ae54364d7c
2013-01-08 00:32:41 +01:00
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
da442b024c
remove aborted uploads
2013-01-07 11:11:21 +01:00
cbb118d4a3
adapt to isFileNameValid, whitespace cleanup
2013-01-07 10:39:35 +01:00
e8d08d4930
merge master into filesystem
2013-01-07 00:16:10 +01:00
9671ace32e
Merge branch 'master' into fix_minor_files_annoyances
...
Conflicts:
apps/files/js/files.js
2013-01-06 22:46:40 +01:00
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
07b3b23a39
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/js/files.js
2013-01-06 22:28:21 +01:00
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
a5dcbc3d8a
Files: prevent people from renaming files to '.'
2013-01-05 03:30:05 +01:00
ba475d4862
javascript notification functions have been moved to js.js for common use
2013-01-04 23:34:09 +01:00
03b8a065cf
input/form switching cleanup
2013-01-02 17:03:16 +01:00
a6733ff012
abort rename on ESC keyup
2013-01-02 16:17:30 +01:00
740b6623aa
show notification when renaming a file to ''
2013-01-02 16:17:30 +01:00
32c2b0d50e
enable enter in ie by using .submit()+form instead of .change(), use notifications when name is empty
2013-01-02 16:17:30 +01:00
8148c187a3
whitespace cleanup
2013-01-02 16:07:10 +01:00
48f6dccdb7
notifications are now shown/hidden using the js functions hideNotification and showNotification.
...
storage warnings are displayed in a notification.
as soon as a notification is hidden the storage warning will come back.
2013-01-02 15:09:40 +01:00
7e36f730ec
merge master into filesystem
2012-12-25 14:29:29 +01:00
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
bdc8d0098a
Merge pull request #869 from owncloud/files-styles
...
Files styles
2012-12-20 05:39:09 -08:00
373b69d835
Merge pull request #974 from owncloud/fixing-120-master
...
setting the timezone is now part of the login process
2012-12-20 04:02:22 -08:00
8e44404ae0
Merge pull request #925 from owncloud/fix_issue_918
...
Trigger the last action before continuing with a file upload
2012-12-20 03:30:50 -08:00
a1bf6b54e6
remove timezone.js
2012-12-20 11:14:21 +01:00
5107ccbeda
move CSS from JS to CSS
2012-12-20 10:53:50 +01:00
d085fdf8ea
Merge pull request #842 from owncloud/restrict_keyboard_shortcuts
...
prevent keyboardshortcuts from catching events outside the main doc - e....
2012-12-17 07:38:53 -08:00
915126cae8
Trigger last action before continuing with creating a new file/folder/from link
2012-12-16 16:25:08 -05:00
2607c565b0
Trigger the last action before continuing with a file upload, fixes issue #918
2012-12-16 16:19:51 -05:00
946d58eaa8
merge master into filesystem
2012-12-15 02:21:26 +01:00
6ff38624a7
Merge pull request #875 from owncloud/multiplefiles_json
...
use json when deleting multiply files instead of using ; as delimiter
2012-12-14 16:26:09 -08:00
1443d6c3ef
fix mimetype icons for new files
2012-12-13 22:31:43 +01:00
fda7d932ef
remove unneeded line
2012-12-13 22:12:27 +01:00
e0ada2c24f
bring back fixed multiselect bar so it’s visible when scrolled down, fix #746
2012-12-13 19:44:55 +01:00
6a2b41e5e8
use json encoding when deleting multiply files instead of using ; as delimiter
2012-12-13 18:11:00 +01:00
e8897c2b7e
prevent keyboardshortcuts from catching events outside the main doc - e.g. the share popup
2012-12-12 12:55:29 +01:00
7969d6e646
Merge branch 'master' into filesystem
2012-12-11 23:57:59 +01:00
80d8ca24ec
fix svg -> png replacement for android, cleanup and remove obsolete css
2012-12-07 17:21:26 +01:00
8cf1e560bb
add IE9 CSS checkbox fixes
2012-12-07 17:21:26 +01:00
810e02099e
upload button HTML, CSS & JS cleanup
2012-12-07 15:32:24 +01:00
380db4a29e
Merge pull request #640 from esthepiking/master
...
Keyboard Shortcuts
2012-12-06 13:42:14 -08:00
f0213735fc
Code clean up
2012-12-05 08:23:28 -07:00
93208d0fe9
Remove rename
2012-12-04 09:40:17 -07:00
47fa3a8fe0
event.ctrlKey
2012-11-30 10:11:25 -07:00
5d13b0533d
event.ctrlKey
2012-11-30 10:10:00 -07:00
2160663309
ctrl issue fix
2012-11-30 08:43:24 -07:00
6060d063a9
Cleanup
2012-11-29 16:52:41 -07:00
d33f697a5f
merge master into filesystem
2012-11-30 00:18:42 +01:00
b6e3460871
documentation
2012-11-29 10:21:20 -07:00
fd4aecf525
cleanup
2012-11-29 10:18:34 -07:00
dafe028c11
Rename
2012-11-28 21:00:11 -07:00
a73a263543
Enter
2012-11-28 19:58:42 -07:00
8802dac02a
Arrow key navigation
2012-11-28 17:32:05 -07:00
8722d3751c
Keys array
2012-11-28 10:36:54 -07:00
b78dc3f48a
keycode naming
2012-11-28 10:22:20 -07:00
0c6b53c25e
no message
2012-11-28 09:55:38 -07:00
fa858d7149
initial setup
2012-11-28 09:50:54 -07:00
ccb9bb4be0
initial setup
2012-11-28 09:50:49 -07:00
9a441d3e3a
show drag shadow in firefox by using helper:'clone'
2012-11-27 17:38:21 +01:00
776be8d9f7
all but the first parameter are introduced by &
2012-11-26 14:34:28 +01:00
555dec2d92
merge master into filesystem
2012-11-23 16:20:56 +01:00
b5b7a67f8a
Merge pull request #480 from owncloud/fix_435_and_437
...
Also reject names with \ in the name
2012-11-23 03:05:52 -08:00
97ed467224
Merge pull request #418 from libasys/Fix-IE8-fileactions-binding
...
Fixes two issues if you using IE8. IE8 has problems with .bind actions a...
2012-11-23 02:16:21 -08:00
95057e727d
merge master into filesystem
2012-11-23 00:40:58 +01:00
8fb4dfd2ea
use background scanner
2012-11-23 00:20:46 +01:00
a81d7cd79f
introduce Files.containsInvalidCharacters(), use when creating or renaming files
2012-11-22 13:03:17 +01:00
cd495bf9ba
some more invalid characters have been added
2012-11-22 11:52:05 +01:00
1793e85a52
Also reject names with \ in the name
...
fixes issues #435 and #437
2012-11-22 11:52:05 +01:00
d4ec77e08b
Merge pull request #482 from eMerzh/fix_prevent_shared_folder
...
Show error message to prevent adding a shared folder in the root dir fix...
2012-11-22 02:40:23 -08:00
02bc440900
Show error message to prevent adding a shared folder in the root dir fix #468
2012-11-16 14:59:14 +00:00
4a3b5125cf
adding comments on the form array indexes
2012-11-16 11:58:33 +01:00
7af4cf48c9
refs #461 - drag'n'drop upload to a sub folder is working now
2012-11-16 10:23:40 +01:00
8a93cc14f6
port of approved pull request #442 - 'Always set renaming to false, also if renaming was aborted, to finalize the operation and show the file actions again.'
2012-11-15 17:16:18 +01:00
eda9ce4cf8
Fixes two issues if you using IE8. IE8 has problems with .bind actions and since jquery 1.7.2 using .bind is old school style for event delegation. the new and better way is using .on() function. The second is using $.each instead of for() to walkthrough an array! Now it works perfect, the events after uploads are triggered.
2012-11-14 16:05:24 +01:00
66dfe270c6
Merge pull request #319 from owncloud/fileactions_newfile
...
Add fileactions to new files and folders
2012-11-12 14:57:06 -08:00
bbef5b377e
add i18n for cancel button
2012-11-12 10:52:28 +01:00
84084b9430
Merge pull request #261 from owncloud/fix_opera_file_delete
...
fix file delete in opera - fixes #188
2012-11-08 08:55:19 -08:00
37fe9800b6
add actions to newly created files and folders
...
closes #231
2012-11-07 22:13:52 +01:00
42935c5564
reuse jquery object when adding files to the file list
2012-11-07 22:06:05 +01:00
e14054610f
Revert "fix blocking drag & drop upload of folders"
...
Fixes #150
This reverts commit 5b2f3c7f72
2012-11-07 21:59:18 +01:00
7b51a4e5f9
Merge pull request #306 from owncloud/crumb_drop_fix
...
extract the right file name for drag&drop.
2012-11-07 05:46:18 -08:00
168a2c7b6b
get the right file name for drag&drop. This was necessary after the switch to css to show/hide file actions, otherwise the actions where part of the extracted file name.
2012-11-07 14:10:10 +01:00
50dbb30eb9
Moved relative_modified_date from file/js to core/js
2012-11-06 10:56:42 -05:00
bb0164c9fc
fix file delete in opera - fixes #188
2012-11-05 18:42:44 +01:00
34fee8afaa
remove debug statements
2012-11-05 13:52:02 +01:00
4f32f49fb1
this line shouldn't be here
2012-11-04 21:00:36 +01:00
f187aa6c93
some more code reuse for fileactions
...
also fixes an issue where some fileactions always worked on the last file in the list
2012-11-04 20:48:38 +01:00
60e5054ae8
Fix shared status icons
2012-10-28 16:02:05 -04:00
0fbb99690b
properly replace fileaction icons with pngs when needed
2012-10-28 16:03:52 +01:00
fe6b987b3d
use css to show/hide fileactions
2012-10-28 12:47:42 +01:00
d9ef6da2e4
code style
2012-10-28 12:47:42 +01:00
939b51e46f
Fix download url generation
2012-10-27 15:10:21 +02:00
0120f3fd62
Merge branch 'routing'
...
Conflicts:
core/lostpassword/index.php
core/lostpassword/resetpassword.php
2012-10-27 11:58:02 +02:00
e4c0bb59e5
Merge pull request #39 from scambra/date-l10n-fixes
...
Date l10n fixes
2012-10-18 08:09:58 -07:00
e307bf31c8
fix oc-605
2012-10-18 14:19:34 +02:00
6081bfa2bc
Merge branch 'master' into routing
...
Conflicts:
lib/search/provider/file.php
settings/ajax/changepassword.php
settings/settings.php
2012-10-17 16:38:11 +02:00
c814a7a841
use interpolation for some translations in js
2012-10-16 20:53:31 +02:00
5ecce8bfb7
Translate modification date when file is created/uploaded, use same strings as lib/template.php
2012-10-16 20:25:11 +02:00
4af5b016cc
Whitespace cleanup
2012-10-14 21:04:08 +02:00
5b2f3c7f72
fix blocking drag & drop upload of folders
2012-10-12 15:30:16 +02:00
e5f2d46c6f
Sanitize user input
2012-10-12 14:10:05 +02:00
32e2d7ef8f
check if ID was assigned
2012-10-08 17:47:02 +02:00
2923d24921
add data-id directly after upload/creation to the file list (bugfix for #1917 )
2012-10-08 17:30:35 +02:00
4dba91838f
add ID to upload form and check if ID exist to avoid loading invalid javascript code for read-only views.
2012-10-08 10:28:29 +02:00
4b446f3edd
Revert part of 5beca59b, fixes file upload bug oc-1926
2012-10-07 17:17:37 -04:00
5e2bce24b4
enable user to download selected files from publically shared directory
2012-10-05 16:12:04 +02:00
5beca59b9c
check if element really exists before calling it. (e.g. for public shared files view, elements like "navigation" doesn't exist)
2012-10-05 10:32:38 +02:00
92b37119e3
remove textbox after pressing "enter" even if the name is the same
2012-10-02 18:38:17 +02:00
c9317b5a68
Merge branch 'master' into routing
2012-09-28 21:41:21 +02:00
4e2f575938
Correctly fix oc-1016 and fix downloading of files
2012-09-28 21:18:20 +02:00
bf1057143c
Merge branch 'master' into routing
...
Conflicts:
apps/files/js/filelist.js
core/js/js.js
lib/ocs.php
2012-09-28 15:38:49 +02:00
cfbca40fbe
fix sharing for newly uploaded or created files
2012-09-26 13:25:11 +02:00
a22a5d6807
some js style fixes
2012-09-23 03:16:52 +02:00
d5055639b2
Merge pull request #15 from scambra/delete-fixes
...
use post to delete files, get has a limit and fails with many files
2012-09-21 16:11:11 -07:00
107b641708
translate rename and history actions
2012-09-21 12:30:13 +02:00
4ea128ee43
Merge pull request #13 from scambra/safari-fixes
...
fix js success callback on safari when uploading files
2012-09-20 02:24:27 -07:00
1b411df83e
use post to delete files, get has a limit and fails with many files
2012-09-20 08:28:35 +02:00
aee8949c92
fix js success callback on safari when uploading files
2012-09-20 08:02:55 +02:00
223bf3e47c
fix for bug #1752 (Renaming of folders in files view does not work correctly in firefox 15)
2012-09-19 14:05:09 +02:00
c199c4ad67
Merge branch 'master' of github.com:owncloud/core
2012-09-19 12:03:58 +02:00
6596094a28
add generated unique file name to the uploadingFiles list instead of the original name
2012-09-19 12:02:36 +02:00
1e880feab1
execute lastAction() before add new one
2012-09-19 11:56:31 +02:00
8a74a39c42
Fix oc-1769, renaming folders with extensions
2012-09-18 22:08:34 +00:00
597fed4fde
Fix oc-1726, cannot delete multiple files one by one without refresh
2012-09-17 15:29:15 +00:00
21bffbfb69
Enhanced space handling - thx fmms
2012-09-17 11:14:44 +03:00
7a7d2a06b3
Adding a few more string to translation
2012-09-17 10:54:06 +03:00
7da3492ab5
show the size of new files when using New->From Url
2012-09-16 17:05:08 +02:00
5eba579827
Merge branch 'master' into routing
...
Conflicts:
apps/files/js/fileactions.js
lib/base.php
lib/helper.php
lib/ocs.php
2012-09-07 15:51:44 +02:00
73d726d1b2
Support for unshare from self, with a bunch of temporary fixes to overcome configuration problems with file actions
2012-09-07 00:02:22 -04:00
d936590f77
Don't pass content for a new text file from UI, fixes bug oc-1660
2012-09-06 16:01:51 -04:00
837eb1871d
Don't delete the file anymore to replace it in the UI, just overwrite it
2012-09-05 22:13:50 -04:00
a5211e31bc
Add permissions to new files/folders, bug fix for oc-1649
2012-09-05 21:47:09 -04:00
9329af921d
Add missing ; to js code
2012-09-05 22:26:09 +02:00
a26ea6d65c
Implement support for replacing files during upload with the actions: replace, suggest name, and cancel
2012-09-05 00:12:25 -04:00
f188f6cc2f
Fix some jslint warnings
2012-09-04 21:27:37 +02:00
73d0a2b8f7
use OC.PERMISSION_X to filter selected drag'n'drop elements
2012-08-31 01:11:10 +02:00
ca8120e9f4
unify permissions (3/3): remove old PERMISSION_X from FileActions & OC.Share
2012-08-31 01:11:10 +02:00
3ba27e624f
unify permissions (2/3): change apps to use OC::PERMISSION_X
2012-08-31 01:11:10 +02:00
077e988136
oc-1548: prevent user from leaving the page while a file upload is in progress
2012-08-31 00:45:03 +02:00
26ef012418
use permissions to quickfix drag selections
2012-08-31 00:13:02 +02:00
b483f2aab8
Merge branch 'master' into routing
...
Conflicts:
apps/contacts/js/contacts.js
apps/contacts/lib/search.php
apps/files_archive/js/archive.js
apps/gallery/lib/tiles.php
apps/gallery/templates/index.php
lib/ocs.php
2012-08-30 21:49:28 +02:00
0e58800016
Whitespace fixes in apps
2012-08-29 20:29:43 +02:00
cbaf858dea
Merge remote-tracking branch 'gitorious/master' into routing
...
Conflicts:
apps/files/js/fileactions.js
apps/files_archive/js/archive.js
2012-08-29 20:16:39 +02:00
0c4575db7a
Temporary fix to prevent rename action in root of Shared directory
2012-08-24 15:12:16 -04:00
0944b4455b
Moves the lastAction=null outside the if so it can include the undo requests from replace
2012-08-22 17:08:10 -04:00
Vincent Petry
kondou
Bjoern Schiessle
Morris Jobke
Thomas Müller
VicDeo
Jörn Friedrich Dreyer
Georg Ehrke
Vincent Petry
Alessandro Cosentino
ringmaster
Björn Schießle
Jan-Christoph Borchardt
Victor Dubiniuk
Robin Appelman
Bart Visscher
Roman Geber
davidak
Lukas Reschke
Michael Gapczynski
Georg Ehrke
Bernhard Posselt
Erik Sargent
Arthur Schiwon
Brice Maron
libasys
icewind1991
Georg Ehrke
scambra
Tom Needham
Juan Carlos Cornejo