0be9de5df5
Files, trashbin, public apps use ajax/JSON for the file list
...
Files app:
- removed file list template, now rendering list from JSON response
- FileList.addFile/addDir is now FileList.add() and takes a JS map with all required
arguments instead of having a long number of function arguments
- added unit tests for many FileList operations
- fixed newfile.php, newfolder.php and rename.php to return the file's
full JSON on success
- removed obsolete/unused undo code
- removed download_url / loading options, now using
Files.getDownloadUrl() for that
- server side now uses Helper::getFileInfo() to prepare file JSON response
- previews are now client-side only
Breadcrumbs are now JS only:
- Added BreadCrumb class to handle breadcrumb rendering and events
- Added unit test for BreadCrumb class
- Moved all relevant JS functions to the BreadCrumb class
Public page now uses ajax to load the file list:
- Added Helper class in sharing app to make it easier to authenticate
and retrieve the file's real path
- Added ajax/list.php to retrieve the file list
- Fixed FileActions and FileList to work with the ajax list
Core:
- Fixed file picker dialog to use the same list format as files app
2014-04-02 15:33:47 +02:00
f88b24d532
enable SVG->PNG fallback for newly uploaded files and folders
2014-03-27 14:48:35 +01:00
32b29c9d73
Merge branch 'master' into fix-7307
...
Conflicts:
core/js/router.js
settings/js/admin.js
2014-03-06 00:15:08 +01:00
1785c0c9b9
Merge pull request #7575 from owncloud/issue/7571
...
Do not set #dir when on public.php
2014-03-05 19:57:25 +01:00
1ab10cb4f7
Do not set #dir when on public.php
...
Fix #7571
2014-03-05 18:46:55 +01:00
2e73c957e5
don't allow to create a file or folder named 'Shared' in the root folder, also exclude all combinations of lower and upper case letters
2014-03-05 13:16:25 +01:00
9f087a2070
fixing download url in files app
2014-03-02 23:41:14 +01:00
1291303c5a
Replace OC.Router.generate() with OC.generateUrl()
2014-03-02 22:30:24 +01:00
5fb1374b0f
Merge pull request #7285 from owncloud/mimeicons-svg
...
Show svg mime icons when no preview is available
2014-02-24 14:12:10 +01:00
b22d82f941
code style: else on same line
2014-02-21 09:42:19 +01:00
089052b13a
Fixed issue with drag and drop not in the root directory, for folders and files
2014-02-20 20:18:27 +00:00
0624476aa1
Merge branch 'master' into mimeicons-svg
2014-02-20 16:55:18 +01:00
658758c3f7
fix intendation
2014-02-20 15:36:52 +01:00
44441b56d6
Fixed trashbin title
2014-02-20 15:16:45 +01:00
476444ab1a
Fixed title format
2014-02-20 14:56:28 +01:00
6cf83de60e
Merge branch 'patch-1' of github.com:GuillaumeAmat/core into GuillaumeAmat-patch-1
2014-02-20 14:49:54 +01:00
577559458d
Uses OC.basename instead of custom code
2014-02-19 22:50:49 +01:00
b01492fecd
Feature Added : Ability to drag and drop in Chrome
2014-02-19 21:28:32 +00:00
79a6d89bcc
Feature Added : Ability to drag and drop in Chrome
2014-02-19 21:23:39 +00:00
609a91a9b1
Show svg mime icons when no preview is available
2014-02-19 14:47:29 +01:00
d5397d813c
Do not send file list for select all on Download/delete
...
- When all files are selected, do not send the whole file list
- Download will trigger download for the parent folder, also works
with root
- Delete will send "allfiles" to the server that will find the file
list or the passed directory by itself
2014-02-13 20:28:52 +01:00
01dc7c5482
Gets the page title from oc_defaults in Files app
2014-02-13 10:48:01 +01:00
a62b393d02
Update page title when navigating through directories
2014-02-12 00:54:35 +01:00
6b5a7035ee
Merge pull request #7126 from nickvergessen/issue/6683
...
Only add files to file list when uploading to current directory
2014-02-10 12:14:05 +01:00
13fa0e2a9d
Fix implied evals and doubled definition of variable
...
fixes #7119
fixes #7120
fixes #7121
fixes #7122
2014-02-07 17:47:42 +01:00
af7366cd30
Only add files to file list when uploading to current directory
...
Fix Issue #6683
2014-02-07 13:06:50 +01:00
b0692af29a
Merge pull request #7064 from owncloud/files-scrolltopafterupdate
...
Scroll to the top after switching dir
2014-02-05 16:13:55 +01:00
6d3b61f388
Merge pull request #7011 from owncloud/jshint
...
Added .jshintrc
2014-02-04 12:11:32 -08:00
fe2a63ffd4
Scroll to the top after switching dir
...
Fixes #7061
2014-02-04 18:59:43 +01:00
d36a2ff9ee
Added .jshintrc
...
- Also fixes a few JSHint warnings in files app
- Added "global" comment on top of files app to suppress warning and
also inform devs about what globals are use
2014-01-30 13:40:01 +01:00
85e67be0aa
Rename action now appears as pencil icon
2014-01-30 10:07:08 +01:00
c6695bbd76
Fixed download URL in public page
...
- Refactored download URL building to make it overridable
- Added download URL override in public page
- Added JS unit tests for download URL
- Added OC.redirect() method to facilitate unit testing
2014-01-24 13:38:39 +01:00
f88360eba3
Merge pull request #6827 from rnveach/fix_6730
...
Fix 6730
2014-01-20 01:44:34 -08:00
a41440436c
added trigger to redo selection text on a directory change
2014-01-17 11:49:00 -05:00
8135828b2e
Fix to not destroy draggable when no draggable was set
...
When a dir has no delete permission, the draggable isn't initialized on
files. This fix makes sure we don't try to destroy a draggable when it
wasn't inited in the first place.
Fixes #6254
2014-01-14 19:17:23 +01:00
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
f723bf744a
Merge pull request #6090 from ganomi/summaryfix
...
Fix filellist/rename/summary problem
2013-11-28 08:00:41 -08:00
68f610a90e
Update file list entry on rename
...
Whenever a file is renamed, if the extension changes, the mime type and
preview might change. This fix passes the updated info to the client
that updates it.
2013-11-27 21:35:00 +01:00
f94180a996
Fix filellist/rename/summary problem
...
Fixes #6055
This contribution is MIT licensed!
2013-11-27 19:09:49 +01:00
31d0ba0344
Merge pull request #5641 from owncloud/filestrash-emptytrash
...
Deleting all files in trash now only sends a single flag
2013-11-25 05:24:11 -08:00
a7962faa56
Fixed delete action to show error message as notification
2013-11-19 15:05:11 +01:00
5da2929180
fix filtering number like filenames in filelist
...
forward port of 847ad6c40b
2013-11-18 17:18:31 +01:00
5bdfccfc47
Fixed total dirs/files message hiding condition
...
Fixes #5829
2013-11-13 10:53:16 +01:00
80c8666d3a
Deleting all files in trash now only sends a single flag
...
To prevent having to send the list of all files for deletion, only set a
flag "allfiles". This should make it a bit smoother when deleting 5000+
files.
Also fixes some "empty trash" message issues.
2013-11-11 17:58:33 +01:00
4998faf343
Added JS event for when the user changes the directory
...
This enables apps to detect directory changes which might be caused by
the user using the browser back button.
2013-11-08 13:16:28 +01:00
bdc75e497b
Fixed totalDirs JS error
2013-11-07 10:11:18 +01:00
a0ee6aef29
Merge pull request #5399 from frisco82/fixDownloadOverQuota
...
Do not count the size of shared folder on total
2013-11-06 13:59:27 -08:00
b49530f80b
Do not count the size of shared folder on total
...
Changed all array access to dot notation
Split comment in a second line
2013-11-06 13:47:03 +01:00
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
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
3488202f67
Merge pull request #5582 from owncloud/files-previewcaching
...
Append file etag to preview URLs
2013-11-05 01:21:51 -08:00
1be1c57bc8
Corretly hide "no permissions" message in controls in viewer mode
...
Fixes #5622
2013-10-31 12:34:15 +01:00
aeac3186ee
Fixed summary visibility check
...
Now using the integer values to check whether to show the summary parts
instead of trying to parse the html code.
2013-10-30 16:14:08 +01:00
e62ca4ea4f
Append file etag to preview URLs
...
Fixes #5534
2013-10-28 14:14:55 +01:00
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
8ed73e5ced
use a more descriptive error message when the user tries to create '/Shared'
2013-10-23 11:08:30 +02:00
70c0d7d6bc
Merge pull request #5310 from owncloud/hide_filestable-header_when_empty
...
Hide files list header, when theres no files to see
2013-10-22 14:39:14 -07:00
9019ad550f
Merge branch 'master' into prevent_user_from_creating_or_renaming_to_an_existing_filename
...
Conflicts:
apps/files/js/filelist.js
2013-10-22 23:06:53 +02:00
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
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
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
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
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
8899543b7f
use !== comparison
2013-10-07 11:14:10 +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
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
6ed2df11fc
store the permissions retrieved via ajax within the dom element
2013-09-18 13:09:04 +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
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
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
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
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
bbf8acb383
separate uploading code from progress code, add progress capability detection
2013-09-05 10:19:54 +02: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
b10a646bc8
rename emptyfolder to emptycontent
2013-08-31 11:25:11 -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
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
13e34649bf
move path generation for previews to dedicated function
2013-08-23 23:19:21 +02:00
bf04daff82
architecture too complex
2013-08-21 14:58:28 +02:00
f2702ff1ca
Merge master into oc_preview
2013-08-19 11:24:17 +02:00
7e4dcd268f
vertically center rename input box
2013-08-17 10:46:03 +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
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
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
9549bd3e68
Use plural translations
2013-08-09 20:37:18 +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
a00cff7c05
disable "deleted files" button if trash bin is empty
2013-07-26 11:14:29 +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
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
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
ddb0ff346d
Public upload feature
2013-06-25 12:24:14 +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
591b383f2d
peselect filename without extension on rename
2013-05-13 15:54:45 +02:00
802a5a331b
Fix displaying spinner on delete
2013-04-19 13:46:11 +02:00
e31d74037a
use local variable to walk DOM only once
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
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
dbf2bfc8cd
delete table row if file was deleted instead of just hide it
2013-02-25 16:32:54 +01:00
bb75dfc021
Whitespace fixes
2013-02-22 19:05:36 +01:00
3b9d9eea09
replaced for in loops with normal enumerating loops to fix #1803
2013-02-20 21:57:50 +01:00
676f89bbdb
extract common code
2013-02-09 14:42:03 +01:00
2137bbe330
remove code properly
2013-02-09 12:38:40 +01: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
ed1dc3e064
Fix files router download links
2013-02-08 22:05:13 +01:00
1d3c1328fa
remove undefined function FileList.finishDelete
2013-02-08 15:51:28 +01: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
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
d10e137939
icons added; empty trash bin message added
2013-01-29 10:03:04 +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
16ae902e31
no undo notification for deleted file, we use the trash bin instead
2013-01-22 17:43:46 +01:00
364b1cd391
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/js/files.js
2013-01-11 10:00:12 +01:00
cbb118d4a3
adapt to isFileNameValid, whitespace cleanup
2013-01-07 10:39:35 +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
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
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
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
fda7d932ef
remove unneeded line
2012-12-13 22:12:27 +01:00
6a2b41e5e8
use json encoding when deleting multiply files instead of using ; as delimiter
2012-12-13 18:11:00 +01:00
810e02099e
upload button HTML, CSS & JS cleanup
2012-12-07 15:32:24 +01:00
a81d7cd79f
introduce Files.containsInvalidCharacters(), use when creating or renaming files
2012-11-22 13:03:17 +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
66dfe270c6
Merge pull request #319 from owncloud/fileactions_newfile
...
Add fileactions to new files and folders
2012-11-12 14:57:06 -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
bb0164c9fc
fix file delete in opera - fixes #188
2012-11-05 18:42:44 +01:00
0120f3fd62
Merge branch 'routing'
...
Conflicts:
core/lostpassword/index.php
core/lostpassword/resetpassword.php
2012-10-27 11:58:02 +02: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
4af5b016cc
Whitespace cleanup
2012-10-14 21:04:08 +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
92b37119e3
remove textbox after pressing "enter" even if the name is the same
2012-10-02 18:38:17 +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
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
1b411df83e
use post to delete files, get has a limit and fails with many files
2012-09-20 08:28:35 +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
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
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
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
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
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
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
24a207a8fa
Fixes a bug where if one tries to delete a file, then clicks undo, and then tries to delete the file again, no questions or undo options were presented.
...
Essentially, just set FileLists.lastAction = null when one clicks undo.
2012-08-22 16:56:00 -04:00
ef3eebfd3e
Fix deletion for browser that do not support onBeforeUnload, fixes oc-1534.
2012-08-20 17:24:10 +02:00
ddfb9de147
Fix linkTo calls for new routing
2012-08-15 18:16:06 +02:00
dfae77dec1
Add notifications and undo support for replacing files when renaming
2012-07-30 12:22:11 -04:00
e18639551d
Tweak appearance of undo delete notification
2012-07-29 18:02:08 -04:00
Vincent Petry
Jan-Christoph Borchardt
Thomas Müller
Joas Schilling
Bjoern Schiessle
Morris Jobke
Luke Policinski
Robin Appelman
Guillaume AMAT
raghunayyar
rnveach
ganomi
Björn Schießle
Jörn Friedrich Dreyer
Ramiro Aparicio
Christopher Schäpers
Vincent Petry
Alessandro Cosentino
Georg Ehrke
Victor Dubiniuk
Roman Geber
Bart Visscher
Michael Gapczynski
Georg Ehrke
Bernhard Posselt
icewind1991
Georg Ehrke
scambra
Lukas Reschke
Tom Needham
Juan Carlos Cornejo
Arthur Schiwon