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

200 commits

Author SHA1 Message Date
Thomas Müller
32b29c9d73 Merge branch 'master' into fix-7307 
Conflicts:
	core/js/router.js
	settings/js/admin.js
 2014-03-06 00:15:08 +01:00
Vincent Petry
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
Joas Schilling
1ab10cb4f7 Do not set #dir when on public.php 
Fix #7571
 2014-03-05 18:46:55 +01:00
Bjoern Schiessle
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
Thomas Müller
9f087a2070 fixing download url in files app 2014-03-02 23:41:14 +01:00
Thomas Müller
1291303c5a Replace OC.Router.generate() with OC.generateUrl() 2014-03-02 22:30:24 +01:00
Morris Jobke
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
Jan-Christoph Borchardt
b22d82f941 code style: else on same line 2014-02-21 09:42:19 +01:00
Robin Appelman
0624476aa1 Merge branch 'master' into mimeicons-svg 2014-02-20 16:55:18 +01:00
Morris Jobke
658758c3f7 fix intendation 2014-02-20 15:36:52 +01:00
Vincent Petry
44441b56d6 Fixed trashbin title 2014-02-20 15:16:45 +01:00
Vincent Petry
476444ab1a Fixed title format 2014-02-20 14:56:28 +01:00
Vincent Petry
6cf83de60e Merge branch 'patch-1' of github.com:GuillaumeAmat/core into GuillaumeAmat-patch-1 2014-02-20 14:49:54 +01:00
Guillaume AMAT
577559458d Uses OC.basename instead of custom code 2014-02-19 22:50:49 +01:00
Robin Appelman
609a91a9b1 Show svg mime icons when no preview is available 2014-02-19 14:47:29 +01:00
Vincent Petry
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
Guillaume AMAT
01dc7c5482 Gets the page title from oc_defaults in Files app 2014-02-13 10:48:01 +01:00
Guillaume AMAT
a62b393d02 Update page title when navigating through directories 2014-02-12 00:54:35 +01:00
Vincent Petry
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
Morris Jobke
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
Joas Schilling
af7366cd30 Only add files to file list when uploading to current directory 
Fix Issue #6683
 2014-02-07 13:06:50 +01:00
Jan-Christoph Borchardt
b0692af29a Merge pull request #7064 from owncloud/files-scrolltopafterupdate 
Scroll to the top after switching dir
 2014-02-05 16:13:55 +01:00
Thomas Müller
6d3b61f388 Merge pull request #7011 from owncloud/jshint 
Added .jshintrc
 2014-02-04 12:11:32 -08:00
Vincent Petry
fe2a63ffd4 Scroll to the top after switching dir 
Fixes #7061
 2014-02-04 18:59:43 +01:00
Vincent Petry
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
raghunayyar
85e67be0aa Rename action now appears as pencil icon 2014-01-30 10:07:08 +01:00
Vincent Petry
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
Morris Jobke
f88360eba3 Merge pull request #6827 from rnveach/fix_6730 
Fix 6730
 2014-01-20 01:44:34 -08:00
rnveach
a41440436c added trigger to redo selection text on a directory change 2014-01-17 11:49:00 -05:00
Vincent Petry
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
Vincent Petry
1042733634 Fixed various file name escaping issues in core apps 
- Refactored file tr lookup into FileList.findFileEl that uses
  filterAttr to avoid escaping issues in jQuery selectors
- Fixed versions and sharing app to properly escape file names in
  attributes
 2014-01-10 15:02:26 +01:00
ganomi
f723bf744a Merge pull request #6090 from ganomi/summaryfix 
Fix filellist/rename/summary problem
 2013-11-28 08:00:41 -08:00
Vincent Petry
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
ganomi
f94180a996 Fix filellist/rename/summary problem 
Fixes #6055
This contribution is MIT licensed!
 2013-11-27 19:09:49 +01:00
Björn Schießle
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
Vincent Petry
a7962faa56 Fixed delete action to show error message as notification 2013-11-19 15:05:11 +01:00
Jörn Friedrich Dreyer
5da2929180 fix filtering number like filenames in filelist 
forward port of 847ad6c40b
 2013-11-18 17:18:31 +01:00
Vincent Petry
5bdfccfc47 Fixed total dirs/files message hiding condition 
Fixes #5829
 2013-11-13 10:53:16 +01:00
Vincent Petry
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
Vincent Petry
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
Vincent Petry
bdc75e497b Fixed totalDirs JS error 2013-11-07 10:11:18 +01:00
Morris Jobke
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
Ramiro Aparicio
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
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
3488202f67 Merge pull request #5582 from owncloud/files-previewcaching 
Append file etag to preview URLs
 2013-11-05 01:21:51 -08:00
Vincent Petry
1be1c57bc8 Corretly hide "no permissions" message in controls in viewer mode 
Fixes #5622
 2013-10-31 12:34:15 +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
e62ca4ea4f Append file etag to preview URLs 
Fixes #5534
 2013-10-28 14:14:55 +01:00
Jörn Friedrich Dreyer
3121dc8cb5 Merge branch 'master' into prevent_user_from_creating_or_renaming_to_an_existing_filename 
Conflicts:
	apps/files/js/filelist.js
 2013-10-23 12:02:06 +02:00