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

1457 commits

Author SHA1 Message Date
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
Jenkins for ownCloud
e89f080f09 [tx-robot] updated from transifex 2013-11-03 14:39:28 -05:00
Jenkins for ownCloud
07e540613e [tx-robot] updated from transifex 2013-11-03 12:44:12 -05:00
Morris Jobke
be07e828ef Merge pull request #5648 from owncloud/files-fixhidecontrolsinviewermode 
Corretly hide "no permissions" message in controls in viewer mode
 2013-10-31 08:08:04 -07:00
Jörn Friedrich Dreyer
adb5de4a88 prefer closest over parent 
closest will search up the tree
 2013-10-31 15:56:02 +01:00
Vincent Petry
35dd568f8f Added missing comma to make the next diff cleaner 2013-10-31 15:12:26 +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
1be1c57bc8 Corretly hide "no permissions" message in controls in viewer mode 
Fixes #5622
 2013-10-31 12:34:15 +01:00
VicDeo
257084444b Merge pull request #5628 from owncloud/files-fixsummary 
Fixed summary visibility check
 2013-10-30 12:11:01 -07:00
Vincent Petry
19eeb618ff Prevent closing the create dropdown when right clicking in Firefox 
Firefox sends a click event on the document when right clicking which
makes pasting with right click into the field impossible.

Fixes #5498
 2013-10-30 17:55:41 +01:00
Vincent Petry
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
Vincent Petry
4c7ef85252 Merge pull request #5616 from owncloud/fixing-l10n-master 
Fixing l10n master
 2013-10-30 02:44:54 -07:00
Thomas Müller
a90cefcea2 avoid usage of brand name 'ownCloud' 2013-10-28 21:42:48 +01:00
Vincent Petry
71cf83b314 Added fix to correctly parse non-array error messages 
Some apps like the antivirus app return messages in a non-array format.
 2013-10-29 16:00:34 +01:00
Jenkins for ownCloud
b0b76fe064 [tx-robot] updated from transifex 2013-10-29 07:31:51 -04: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
Jenkins for ownCloud
8df8211225 [tx-robot] updated from transifex 2013-10-27 07:27:22 -04:00
Andreas Fischer
eb2d66d1a0 Fix double not in newfile/newfolder language. 2013-10-27 11:53:14 +01:00
Jenkins for ownCloud
119ecc6f34 [tx-robot] updated from transifex 2013-10-27 02:32:11 -04:00
Thomas Müller
222f1b8da2 Merge pull request #5494 from owncloud/fixing-3593-master 
introducing new dav property {xmlns:oc="http://owncloud.org/ns}id
 2013-10-24 09:41:56 -07:00
Thomas Müller
535bc7b664 Merge pull request #5477 from owncloud/prevent_user_from_creating_or_renaming_to_an_existing_filename 
prevent user from creating or renaming sth. to an existing filename
 2013-10-23 13:45:27 -07:00
Thomas Müller
e95ad29d90 Merge pull request #5435 from owncloud/share-improvements 
Share improvements
 2013-10-23 09:56:24 -07:00
Jörn Friedrich Dreyer
4991a7bd06 fix translations 2013-10-23 17:02:41 +02:00
Thomas Müller
b60ae11db8 introducing new dav property {xmlns:oc="http://owncloud.org/ns}id 2013-10-23 16:03:57 +02: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
8ed73e5ced use a more descriptive error message when the user tries to create '/Shared' 2013-10-23 11:08:30 +02:00
Jörn Friedrich Dreyer
a9735c8a6f cleanup array value assignment 2013-10-23 11:01:05 +02:00
Jörn Friedrich Dreyer
af7ec3169b cleanup precondition checking when creating new files / folders 
- use i18n
- use trim when checking for empty file / folder name
- use more verbose error descriptions
 2013-10-23 10:59:01 +02:00
Jörn Friedrich Dreyer
bc0faa1c4e use correct filename in error result json 2013-10-23 10:59:01 +02:00
Christopher Schäpers
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
Thomas Müller
cea1f80c1a Merge pull request #5466 from owncloud/files-thumbnailloadingdelaystyle 
Fixed ugly white space while loading file thumbnail
 2013-10-22 14:20:48 -07:00
Thomas Müller
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
Thomas Müller
ca3771f8fd fixing js syntax error 2013-10-22 22:39:28 +02:00
Thomas Müller
bf46e0c317 fixing undefined variable $newname 2013-10-22 22:38:48 +02:00
Thomas Müller
0283589a19 adding PHPDoc comments 2013-10-22 22:38:05 +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
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
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
Vincent Petry
d1c27e08e5 Fixed empty content logic 
- Remove obsolete code that used another approach for hiding emptycontent
- Fixed logic for the showing of the empty content message
 2013-10-21 22:18:10 +02:00
kondou
732e7db319 Fix mind-boggling emptycontent logic 2013-10-21 19:49:27 +02:00
kondou
7864a3bf07 Fix shared folder still showing fileheader 2013-10-21 17:59:51 +02:00
Vincent Petry
f8717bc260 Fixed share with link checkbox missing as regular user 
Instead of loading the app config setting "shareapi_allow_links" using a
synchronous ajax call that fails when the user is not an admin, this fix
puts the flag directly in the template so it doesn't need to be loaded
afterwards.

Fixes #5440
 2013-10-21 11:29:40 +02:00
kondou
40cc57ab3e Improve updateEmptyContent logic 2013-10-20 22:55:49 +02:00
kondou
60b25a2e97 Create FileList.updateEmptyContent() and fix not showing emptycontent after deletion 2013-10-20 22:47:44 +02:00
Jan-Christoph Borchardt
cbb42aae11 improve wording of permission notice 2013-10-20 23:46:01 +03:00
Jan-Christoph Borchardt
dbcfb1b830 beautify 'you dont have write permissions' notice, fix #2770 2013-10-20 23:15:58 +03:00
Jenkins for ownCloud
6aee83cadf [tx-robot] updated from transifex 2013-10-19 08:27:13 -04: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
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
Morris Jobke
ea4f6e2431 Merge pull request #5378 from owncloud/files-permissionsafteruploadfix 
Fixed upload permissions distinction between public and logged in upload
 2013-10-17 03:50:26 -07:00
Vincent Petry
9cfb438ff7 Fixed upload permissions distinction between public and logged in upload 
Fixes #5370
 2013-10-17 10:46:55 +02:00
Frank Karlitschek
d70a6c3f98 Merge pull request #4935 from owncloud/webdav-depth-fix-master 
WebDAV depth infinity support - the dirty way
 2013-10-17 01:37:38 -07:00
Morris Jobke
a132144eca Merge pull request #5262 from owncloud/files-ie8-conflictdialogbrokenfix 
Fixed conflict dialog in IE8
 2013-10-16 12:52:41 -07:00
Morris Jobke
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
Jenkins for ownCloud
630be99ddf [tx-robot] updated from transifex 2013-10-16 00:31:48 -04:00
Morris Jobke
04ea419f50 Merge pull request #5334 from owncloud/files-sharing-actionsafterupload 
Files sharing actions + navigation fixes
 2013-10-15 08:11:17 -07:00
Vincent Petry
c6f14001bb Fixed drag and drop upload to breadcrumb 2013-10-15 16:14:23 +02:00
Vincent Petry
92e646413a Fixed drag and drop onto folders 
Fixes #5351
 2013-10-15 15:59:45 +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
09b084dfed Fixed file permissions after public upload 
Fixes #5328
 2013-10-14 17:28:53 +02:00
Vincent Petry
e79d853867 Removed extra bkg color on file actions when row is selected/hovered on 2013-10-14 17:05:24 +02:00
Jenkins for ownCloud
f3336f8877 [tx-robot] updated from transifex 2013-10-13 20:33:30 -04:00
kondou
f828b51ede Hide files list header, when theres no files to see 2013-10-12 17:28:20 +02:00
Morris Jobke
22bb9762fd Merge pull request #5304 from owncloud/files-deleteiconpositionfix 
Fixed position of "delete" icon in files app
 2013-10-11 12:39:33 -07:00
Thomas Müller
dc58195c7f Merge pull request #5207 from owncloud/fixing-4011-part2-master 
[OC6] file upload exception handling
 2013-10-11 10:35:17 -07:00
Vincent Petry
a4a52733f9 Fixed position of "delete" icon in files app 
There was an issue where only Chrome allows setting position: relative
on a td element.

This fix now works in IE8, Firefox and Chrome.

Fixes #5056
 2013-10-11 18:01:15 +02:00
Vincent Petry
067475a907 Merge pull request #5302 from owncloud/files-missingfileactionsafteradd 
File actions are now updated after create/upload file
 2013-10-11 08:45:42 -07:00
Vincent Petry
b2986e1994 Merge pull request #5274 from owncloud/files-ie8-deletecheckbox 
Fixed delete icon alignment in IE8
 2013-10-11 08:24:57 -07:00
Vincent Petry
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
Vincent Petry
2b2a548610 Fixed IE8 misaligned date 
Removed display: block to let the element be displayed inline and let
itself aligned by vertical-align: middle of the parent

This works in IE8 and other browsers.

Fixes #5288
 2013-10-11 14:23:37 +02:00
Vincent Petry
39b150921d Moved IE8 inline styles in files.css 2013-10-11 14:10:00 +02:00
Jenkins for ownCloud
44a5b0bad0 [tx-robot] updated from transifex 2013-10-10 22:30:58 -04:00
Vincent Petry
75629a1f00 Fixed delete icon alignment in IE8 
Removed old inline CSS that forced every td to have position:static in
the files app. (#5056)
 2013-10-11 00:16:41 +02:00
Vincent Petry
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
Vincent Petry
bf00ccd1d6 Fixed files view regular file actions in IE8 
Fixes #5256

A missing closing span broken the container in IE8 which prevented the
file actions to be appended properly.
 2013-10-10 12:21:02 +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
Vincent Petry
cddb85c588 Added filesApp flag as input field for files app detection 
Since the files app can be reached under multiple URLs, either root,
files.php or public.php, a flag has been added to the DOM to help apps
(like file viewers) to detect whether they are currently in the files
app.
 2013-10-08 17:19:58 +02:00
Thomas Müller
7c6ed6ab33 catch exceptions while uploading and pass on the error message 2013-10-08 15:03:24 +02:00
VicDeo
372a73d43a Merge pull request #5184 from owncloud/fix-trash-bin-button 
Fix trash bin button
 2013-10-07 10:58:47 -07:00
Jenkins for ownCloud
c655eec3d1 [tx-robot] updated from transifex 2013-10-07 12:21:38 -04:00
Morris Jobke
980fc9cc7e Fix trash bin button 2013-10-07 18:15:23 +02: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
Jörn Friedrich Dreyer
0683372200 canceling individual uploads is currently impossible because there is no placeholder 2013-10-07 11:14:11 +02:00
Jörn Friedrich Dreyer
3be8e3f8d3 remove obsolete comment 2013-10-07 11:14:11 +02:00
Jörn Friedrich Dreyer
8899543b7f use !== comparison 2013-10-07 11:14:10 +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
Jenkins for ownCloud
3613e79e10 [tx-robot] updated from transifex 2013-10-06 19:16:10 -04:00
Morris Jobke
e1e16ec3b0 Merge pull request #5088 from owncloud/fix_trashbin_button 
trash bin button needs to be an input field
 2013-10-06 14:51:08 -07:00
Jan-Christoph Borchardt
2b521327c0 more elegant style for Personal and Admin settings 2013-10-05 11:23:49 +02:00
Morris Jobke
cc1e69c190 Merge pull request #5136 from owncloud/design-fixes 
Design fixes
 2013-10-04 14:56:09 -07:00
Jan-Christoph Borchardt
fcb9b49d1f increase font size of file actions for better readability 2013-10-04 20:25:18 +03: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
Jan-Christoph Borchardt
da0db7bcb2 fix multiselect bar opacity, webroot 2013-10-04 17:32:06 +03:00
Jan-Christoph Borchardt
041837de2c merge master into input-simplify 2013-10-04 17:08:34 +03: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