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

1717 commits

Author SHA1 Message Date
Vincent Petry
0dcac65aa1 Fixed upload issue when free space is not known 2014-03-06 13:53:55 +01:00
Vincent Petry
07f78c8248 Added unit tests for "add()" method for file upload 
- Added OC.Upload.init() to make the code testable
- Added unit tests for the add() method of the uploader with some error
  cases
 2014-03-06 13:53:34 +01:00
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
Björn Schießle
9111af0478 Merge pull request #7531 from owncloud/dont_create_shared_folder 
don't allow to create a file or folder named 'Shared' in the root folder
 2014-03-05 18:13:31 +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
Thomas Müller
15d1df055b Merge branch 'master' into display-share-owner-master 
Conflicts:
	apps/files_sharing/lib/cache.php
 2014-02-28 14:54:10 +01:00
Robin Appelman
7c92e2e3ad Update rawlist to work with new fileinfo object 2014-02-27 14:04:19 +01:00
Robin Appelman
bc49c6be04 Manually triger the filecache update hooks before any other hook 2014-02-26 14:29:13 +01:00
Jan-Christoph Borchardt
2b423e5a44 coding style fixes, cut long lines, comments not on same lines, curly braces 2014-02-26 10:16:54 +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
Morris Jobke
8d17f6d675 Merge pull request #7320 from owncloud/GuillaumeAmat-patch-1 
Update page title when navigating through directories (local)
 2014-02-24 13:34:07 +01:00
Robin Appelman
7c4f81bd78 rename url parameter 2014-02-24 13:24:10 +01:00
Jan-Christoph Borchardt
6f56fd99a6 fix too much distance between text and icon 2014-02-21 14:10:13 +01:00
Jan-Christoph Borchardt
877cfb963a use SVG icons from icons.css for New file menu 2014-02-21 14:07:25 +01:00
Robin Appelman
4715fb12c8 Add url parameter to control whether previews should return 404 when the mimetype is unsupported 2014-02-21 14:06:15 +01:00
Jan-Christoph Borchardt
b22d82f941 code style: else on same line 2014-02-21 09:42:19 +01:00
Luke Policinski
089052b13a Fixed issue with drag and drop not in the root directory, for folders and files 2014-02-20 20:18:27 +00:00
Thomas Müller
d6e89a9a28 store the share owner in a data-attribute instead of a separate span 2014-02-20 18:24:42 +01:00
Thomas Müller
7c68025010 adding share owner information to the file list 2014-02-20 18:24:42 +01:00
Robin Appelman
f710205ee7 Make unit tests expect the svg icons 2014-02-20 16:56:09 +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
Lukas Reschke
719f1111b6 Merge pull request #6714 from owncloud/files-newfileinvalidcharsfix 
Added extra checks for invalid file chars in newfile.php and newfolder.php
 2014-02-20 11:53:58 +01:00
Guillaume AMAT
577559458d Uses OC.basename instead of custom code 2014-02-19 22:50:49 +01:00
Luke Policinski
b01492fecd Feature Added : Ability to drag and drop in Chrome 2014-02-19 21:28:32 +00:00
Luke Policinski
79a6d89bcc Feature Added : Ability to drag and drop in Chrome 2014-02-19 21:23:39 +00:00
Robin Appelman
f33d35cd07 Fix svg icons for public shares and external/shared files 2014-02-19 15:08:05 +01:00
Robin Appelman
609a91a9b1 Show svg mime icons when no preview is available 2014-02-19 14:47:29 +01:00
Vincent Petry
952584e9c7 Merge pull request #7195 from owncloud/files-selectall 
Do not send file list for select all on Download/delete
 2014-02-19 14:33:24 +01:00
Jan-Christoph Borchardt
7330f61a94 Merge pull request #4799 from owncloud/tune_legacy_cache_webdav_properties_prefixing_master 
Concatenate string in SQL instead of PHP
 2014-02-19 11:58:48 +01:00
Vincent Petry
e517e642be Merge pull request #7257 from owncloud/filelist-fileinfo 
use a FileInfo object of the directory when generting the filelist
 2014-02-19 09:40:11 +01:00
Thomas Müller
1e84d6b14b Merge pull request #7190 from owncloud/appconfig-legacy-apps 
Remove usage of legacy OC_Appconfig
 2014-02-18 18:10:22 +01:00
Vincent Petry
797e0a614c Added extra checks for invalid file chars in newfile.php and newfolder.php 
- added PHP utility function to check for file name validity
- fixes issue where a user can create a file called ".." from the files UI
- added extra checks to make sure newfile.php and newfolder.php also
  check for invalid characters
 2014-02-18 17:54:32 +01:00
Robin Appelman
d18b9f6ea4 use a FileInfo object of the directory when generting the filelist 2014-02-18 15:39:35 +01:00
David
a282afcbbb small change for compatibility 2014-02-17 13:27:07 -03:00
Thomas Müller
595b908b74 Merge pull request #7183 from owncloud/remove-force-lowercase 
remove forced lowercase from extension, fix #4747
 2014-02-14 13:58:42 +01:00
Vincent Petry
afe133d5d1 Merge pull request #7168 from owncloud/issue/7152 
Send correct path on file upload when using public app
 2014-02-14 12:25:20 +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
Robin Appelman
181bbd4325 Remove usage of legacy OC_Appconfig 2014-02-13 16:28:49 +01:00
Guillaume AMAT
01dc7c5482 Gets the page title from oc_defaults in Files app 2014-02-13 10:48:01 +01:00
Jan-Christoph Borchardt
6e17d71a0d remove forced lowercase from extension, fix #4747, also coding style fixes 2014-02-13 10:39:38 +01:00
Joas Schilling
9619459e37 Send correct path on file upload when using public app 
Fix issue #7152
 2014-02-12 15:49:09 +01:00
icewind1991
7af456730e Merge pull request #6964 from owncloud/storagestatistics-reuse 
Reuse the calculated free_space in buildFileStorageStatistics
 2014-02-12 15:48:14 +01:00
Guillaume AMAT
a62b393d02 Update page title when navigating through directories 2014-02-12 00:54:35 +01:00
Thomas Müller
3699728a3a Merge pull request #7085 from owncloud/quick-fix-7019-master 
Load authentication apps to get users from all backends
 2014-02-11 18:41:08 +01:00
Robin Appelman
753af3a3ff Merge branch 'master' into storagestatistics-reuse 2014-02-10 14:01:32 +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
Thomas Müller
79fc4f3126 Within OC:init() the minimum set of apps is loaded - which is filesystem, authentication and logging 2014-02-06 11:34:27 +01:00
Thomas Müller
21207c6a73 remove superfluous $RUNTIME_APPTYPES 2014-02-06 09:50:11 +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
Robin Appelman
1e79369338 merge master into storagestatistics-reuse 2014-02-05 13:36:55 +01:00
Thomas Müller
9d9f360b77 Load authentication apps to get users from all backends - fixes #7019 2014-02-05 12:54:31 +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
Jan-Christoph Borchardt
0609f30d1c Merge pull request #6235 from NCTU-NBA/pr-exceed_upload_limit_msg 
Change misleading message when file size exceeds upload limit
 2014-02-04 08:04:19 -08:00
Jan-Christoph Borchardt
b56dbbe0e5 fix misalignment of modified dates, shift to right 2014-02-03 17:26:49 +01:00
Jan-Christoph Borchardt
6d7d3c16d0 ellipsize long modified dates to make room for showing delete button, fix #7040 2014-02-03 17:24:44 +01:00
raghunayyar
5ccb395ec6 Makes Rename Icon Width 44px for touch sourfaces. 2014-01-31 12:33:00 +05:30
Pellaeon Lin
099b71c712 Merge branch 'master' into pr-exceed_upload_limit_msg 
Conflicts:
	apps/files/templates/index.php
	apps/files_sharing/templates/public.php
 2014-01-30 22:50:20 +08:00
Vincent Petry
ba1b9df8a9 Fixed file name validation unit test + added newline 
- fixed file name validation unit test
- added "\n" as forbidden character in isFileNameValid()
 2014-01-30 13:40:01 +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
Vincent Petry
bc598f1919 Updated unit tests for rename action 
- rename action is now checked inside of ".nametext" element
- added test to ensure that display() correctly resets all actions
  including the rename one
 2014-01-30 10:07:08 +01:00
raghunayyar
85e67be0aa Rename action now appears as pencil icon 2014-01-30 10:07:08 +01:00
Jan-Christoph Borchardt
271088a7a2 Merge pull request #6777 from owncloud/mobile-style 
Mobile style for public links: files, folders, picture sets
 2014-01-29 09:17:02 -08:00
Pellaeon Lin
929c930b0a Use $storageInfo['free'] 2014-01-29 21:24:31 +08:00
Vincent Petry
58c7042e70 Added error message for when target folder was removed 
Whent trying to upload/rename/create files in a folder that was removed
or rename, the correct error message is now shown.

In the case of upload of multiple files, the upload is cancelled.

This situation can happen if the target folder was renamed or removed
from another browser window or client.
 2014-01-29 12:46:11 +01:00
Jan-Christoph Borchardt
d310df505c permanently show download action on mobile, only icon 2014-01-29 11:43:34 +01:00
Jan-Christoph Borchardt
13ed59c1cf merge master into mobile-style 2014-01-29 10:55:44 +01:00
Vincent Petry
e6f93fc841 Fix warnings in logs when renaming over the web UI 
The determineIcon() method was expecting attributes to be set which
caused warnings about undefined indices in the error log.

This fix pre-initializes the array with 'directory' and
'isPreviewAvailable' to make them disappear.
 2014-01-29 10:43:13 +01:00
Morris Jobke
cf2c061f1f Merge pull request #6929 from owncloud/sharing-fixfiledownloadlink 
Sharing fixfiledownloadlink
 2014-01-29 00:39:14 -08:00
VicDeo
0a77d41178 Merge pull request #6965 from owncloud/unused-free-space 
Remove unused $freeSpace
 2014-01-27 10:27:51 -08:00
Robin Appelman
b590f019f6 Remove unused $freeSpace 2014-01-27 16:51:32 +01:00
Thomas Müller
ab9ddda8f2 Merge pull request #6907 from owncloud/webdav-logexceptions 
Added exception logger plugin for sabre connector
 2014-01-27 07:48:40 -08:00
Robin Appelman
3c1ab66eda Reuse the calculated free_space in buildFileStorageStatistics 2014-01-27 15:56:57 +01:00
Morris Jobke
0a1708ba11 Merge pull request #6912 from owncloud/replace-webroot-in-css 
Remove %webroot% from CSS
 2014-01-27 04:11:15 -08:00
Vincent Petry
11ef12a106 Added exception logger plugin for sabre connector 
Whenever an exception occurs in the sabre connector code or code called
by it, it will be logged.

This plugin approach is needed because Sabre already catches exceptions
to return them to the client in the XML response, so they don't appear
logged in the web server log.

This will make it much easier to debug syncing issues.
 2014-01-27 11:40:17 +01:00
Jan-Christoph Borchardt
6fbc73e673 Merge pull request #5152 from owncloud/files-em-to-px 
Converts em to px values for styles in Files.
 2014-01-27 02:28:01 -08:00
Jan-Christoph Borchardt
c767ebcc03 fix multiselect bar being too short on big displays 2014-01-24 18:20:52 +01:00
Morris Jobke
dff2675efa Merge pull request #6923 from owncloud/files-maxuploadfieldstylefix 
Fixed max upload size input field style
 2014-01-24 07:05:50 -08:00
Pellaeon Lin
19675c2c9d Fix variable name 2014-01-24 22:54:16 +08:00
Morris Jobke
1fe60e435e Merge pull request #6184 from owncloud/6051-ux-files-Move-File-Spinner 
#6051 [ux][files] Move File Spinner
 2014-01-24 06:53:53 -08: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
Vincent Petry
0671c58e36 Fixed filelist unit tests hidden params 
Also added dummy table
 2014-01-24 13:19:44 +01:00
Thomas Müller
9fa788c452 Merge pull request #6736 from owncloud/tests-jsunittests 
Added Javascript unit tests
 2014-01-23 12:43:05 -08:00
Vincent Petry
4734146580 Fixed max upload size input field style 
Added "type=text" makes it look like nice like all other fields
 2014-01-23 20:50:09 +01:00
Jan-Christoph Borchardt
799e744ad7 remove background and width from multiselect bar, fix Download button not showing on mobile 2014-01-23 15:35:30 +01:00
Jan-Christoph Borchardt
809fb8482d remove %webroot% from files app 2014-01-23 13:11:08 +01:00
Thomas Müller
f950ce82ae Merge branch 'master' into mobile-style 
Conflicts:
	apps/files/js/files.js
	apps/files_sharing/css/public.css
	apps/files_sharing/js/public.js
	apps/files_sharing/templates/public.php
 2014-01-23 00:39:11 +01:00
Morris Jobke
cf6e79cda8 Merge pull request #6719 from tripflex/fix_pubup_progbar 
Fix public upload progress bar
 2014-01-22 02:28:28 -08:00
Thomas Müller
23a4d0d44e OC_Util::setupFS($user) will create a data dir for the given string - no matter if the user really exists - OCP\JSON::checkUserExists($owner); introduces a ready to use check which will bail out with an JSON error 2014-01-21 11:32:30 +01:00
Myles McNamara
9555305565 change publicUploadButtonMock to public_upload 
Changed jQuery selector for public preview to public_upload to correctly show preview
 2014-01-20 11:58:01 -05:00
Morris Jobke
f88360eba3 Merge pull request #6827 from rnveach/fix_6730 
Fix 6730
 2014-01-20 01:44:34 -08:00
raghunayyar
9edbd142a2 Removes Bogus Styles. 2014-01-18 00:46:06 +05:30
rnveach
a41440436c added trigger to redo selection text on a directory change 2014-01-17 11:49:00 -05:00
rnveach
90a41ef26a fixed selector string and removed all checkbox if it was selected 2014-01-17 11:46:44 -05:00
Morris Jobke
f0a5007e9a fix input element closing tag 2014-01-17 16:32:01 +01:00
Jan-Christoph Borchardt
b291fb9cd7 make sure there's enough room for the file actions 2014-01-17 15:47:26 +01:00
Vincent Petry
f4c198b907 Fixed isPreviewAvailable warnings in log 
isPreviewAvailable wasn't always set as the files formatting code is
slightly different than the one from the files app.

Fixes #6423
 2014-01-17 14:22:05 +01:00
Vincent Petry
350214c609 Added Javascript unit tests 
- added karma utility to run jasmine unit tests
- added Sinon library (for stubs/mocks/fakeserver)
- added a few unit tests for core and files
- added autotest-js.sh script
 2014-01-16 17:12:29 +01:00
Morris Jobke
16033c8123 Merge pull request #6264 from owncloud/files-draggabledestroy 
Fix to not destroy draggable when no draggable was set
 2014-01-16 05:52:43 -08:00
Pellaeon Lin
6ec50e4b0c Comments to clarify 2014-01-16 19:48:46 +08:00
Vincent Petry
2233aa2a04 Fixed files row height in Firefox/KDE 
Firefox is using native checkboxes and in KDE the checkboxes have a
bigger height which caused the row height to increase and be misaligned
with the date column.

This fix makes the checkbox absolute to prevent it to influence the row
height.
 2014-01-16 12:05:05 +01:00
Pellaeon Lin
cd6ab29313 Use t() 's native method 2014-01-16 17:51:00 +08:00
raghunayyar
f975fd5499 Fixes Trashbin and Files Style Conflicts, more em to px conversions post rebase 2014-01-16 14:23:39 +05:30
Jan-Christoph Borchardt
db837bf696 improvements to public files mobile view 2014-01-15 15:48:42 +01:00
Thomas Müller
ce231c406d no new menu on public upload 2014-01-15 15:07:52 +01:00
Thomas Müller
6c76b4ba12 fixing preview generation 2014-01-15 15:07:24 +01:00
Thomas Müller
807b885a0e reuse file upload as used within files app - remove public upload button 2014-01-15 14:36:18 +01:00
Robin Appelman
d279ddd9a2 Show the name of the shared folder in the breadcrumb when viewing a publicly shared folder 2014-01-15 13:36:14 +01:00
raghunayyar
d8eac2b9bc Merge branch 'master' into files-em-to-px 
Conflicts:
	apps/files/css/files.css
 2014-01-15 14:59:50 +05:30
Pellaeon Lin
dbbbfee7de Fix namespace 2014-01-15 12:36:27 +08:00
Jan-Christoph Borchardt
072ef7f010 remove min-width rule to fix mobile views 2014-01-14 22:14:46 +01: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
Thomas Müller
92969052d7 remove ru_RU - it has bee removed from transifex 2014-01-13 16:41:10 +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
Thomas Müller
2d5427efa9 Merge pull request #6290 from owncloud/files-androidcontentdisposition 
Files androidcontentdisposition
 2014-01-07 11:06:20 -08:00
Jenkins for ownCloud
d2f2645a6a [tx-robot] updated from transifex 2014-01-07 01:56:11 -05:00
Jenkins for ownCloud
0e843b9d7d [tx-robot] updated from transifex 2014-01-06 01:55:59 -05:00
Jenkins for ownCloud
e4616199df [tx-robot] updated from transifex 2014-01-05 01:55:53 -05:00
Jenkins for ownCloud
aaa48576ee [tx-robot] updated from transifex 2014-01-04 01:55:57 -05:00
Jenkins for ownCloud
095f9b8ee0 [tx-robot] updated from transifex 2014-01-02 01:56:21 -05:00
Jenkins for ownCloud
9ea9638490 [tx-robot] updated from transifex 2013-12-30 01:55:38 -05:00
Jenkins for ownCloud
e345f3f511 [tx-robot] updated from transifex 2013-12-29 01:55:36 -05:00
Jenkins for ownCloud
71c829f92a [tx-robot] updated from transifex 2013-12-28 01:55:35 -05:00
Jenkins for ownCloud
64a001edab [tx-robot] updated from transifex 2013-12-27 01:55:35 -05:00
Jenkins for ownCloud
dbbd99db09 [tx-robot] updated from transifex 2013-12-24 01:55:40 -05:00
Jenkins for ownCloud
f60ecfc7fd [tx-robot] updated from transifex 2013-12-22 01:56:05 -05:00
Jenkins for ownCloud
cd26631a6d [tx-robot] updated from transifex 2013-12-21 01:56:13 -05:00
Jenkins for ownCloud
371a476eb5 [tx-robot] updated from transifex 2013-12-20 01:57:49 -05:00
Thomas Müller
277ae28171 Merge pull request #6295 from owncloud/files-fromlinkerrormessagefixes 
Fixed download file from URL error messages
 2013-12-18 06:03:50 -08:00
Jenkins for ownCloud
6488ff2c75 [tx-robot] updated from transifex 2013-12-17 16:43:17 -05:00
Jenkins for ownCloud
a99dd3183c [tx-robot] updated from transifex 2013-12-17 06:46:52 -05:00
Frank Karlitschek
753525c57f Merge pull request #6386 from owncloud/trash_always_show_deleted_files_breadcrumb 
always show 'Deleted Files' breadcrumb
 2013-12-17 00:25:06 -08:00
Bjoern Schiessle
3e17fbe30d always show home breadcrumb in files view 2013-12-16 17:40:35 +01:00
Jenkins for ownCloud
77b68505c2 [tx-robot] updated from transifex 2013-12-13 14:44:31 -05:00
Vincent Petry
335b2f40a6 Fixed download file from URL error messages 
- L10N now converted to string to make them work with json_encode
- Added specific error message when server doesn't allow fopen on URLs
- Fixed client side to correctly show error message in a notification
- Added OCP\JSON::encode() method to encode JSON with support for the
  OC_L10N_String values
 2013-12-12 10:38:12 +01:00
Jenkins for ownCloud
7b20212c0a [tx-robot] updated from transifex 2013-12-11 13:32:13 -05:00
Pellaeon Lin
5ddd85ff9c Contextual upload error message 2013-12-11 15:40:58 +08:00
Pellaeon Lin
4b081be956 #max_upload is needed after all 2013-12-11 12:21:39 +08:00
Pellaeon Lin
0aa38165a4 Update #free_space on getstoragestats AJAX call 2013-12-11 12:18:18 +08:00
Vincent Petry
409b510889 Moved content disposition code+workarounds to OCP\Response 
Added new OC\Response API called setContentDispositionHeader() that
contains the needed workarounds for UTF8 and IE.

Refactored download code to use the new API.

Removed unused trashbin download file.
 2013-12-10 12:42:26 +01:00