mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
17,132 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

254 Commits

Author SHA1 Message Date
Bart Visscher 5bfe4adbaa Whitespace cleanup 2013-01-16 18:09:16 +01:00
Robin Appelman 9bf367e7f8 merge master into filesystem 2013-01-15 14:57:23 +01:00
Thomas Mueller 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
Thomas Mueller 3d33e8f845 fixing indent - sorryy wrong setting on the IDE :-( 
replace missing calls to OC.Notification.show
 2013-01-11 15:02:34 +01:00
Thomas Mueller 9afdc14d40 adding accidentally removed line - THX @bartv2 2013-01-11 14:55:49 +01:00
Thomas Mueller 364b1cd391 Merge branch 'master' into fixing-998-master 
Conflicts:
	apps/files/js/files.js
 2013-01-11 10:00:12 +01:00
Thomas Mueller 23896a7290 Merge branch 'master' into fixing-784-master 
Conflicts:
	apps/files/js/files.js
 2013-01-11 09:53:12 +01:00
Jörn Friedrich Dreyer 780fb37758 allow default click behaviour 2013-01-09 15:21:55 +01:00
Thomas Mueller 7b9e6d2f2c fixing string concatenation in javascript 
refs ae54364d7c
 2013-01-08 00:32:41 +01:00
Jörn Friedrich Dreyer 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
Jörn Friedrich Dreyer da442b024c remove aborted uploads 2013-01-07 11:11:21 +01:00
Jörn Friedrich Dreyer cbb118d4a3 adapt to isFileNameValid, whitespace cleanup 2013-01-07 10:39:35 +01:00
Robin Appelman e8d08d4930 merge master into filesystem 2013-01-07 00:16:10 +01:00
Thomas Mueller 9671ace32e Merge branch 'master' into fix_minor_files_annoyances 
Conflicts:
	apps/files/js/files.js
 2013-01-06 22:46:40 +01:00
Thomas Mueller 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
Thomas Mueller 07b3b23a39 Merge branch 'master' into fixing-998-master 
Conflicts:
	apps/files/js/files.js
 2013-01-06 22:28:21 +01:00
Thomas Mueller 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
Thomas Mueller ba475d4862 javascript notification functions have been moved to js.js for common use 2013-01-04 23:34:09 +01:00
Jörn Friedrich Dreyer 03b8a065cf input/form switching cleanup 2013-01-02 17:03:16 +01:00
Jörn Friedrich Dreyer 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
Jörn Friedrich Dreyer 8148c187a3 whitespace cleanup 2013-01-02 16:07:10 +01:00
Thomas Mueller 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
Robin Appelman 7e36f730ec merge master into filesystem 2012-12-25 14:29:29 +01:00
Thomas Müller 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
Jan-Christoph Borchardt bdc8d0098a Merge pull request #869 from owncloud/files-styles 
Files styles
 2012-12-20 05:39:09 -08:00
Jan-Christoph Borchardt 5107ccbeda move CSS from JS to CSS 2012-12-20 10:53:50 +01:00
Michael Gapczynski 915126cae8 Trigger last action before continuing with creating a new file/folder/from link 2012-12-16 16:25:08 -05:00
Michael Gapczynski 2607c565b0 Trigger the last action before continuing with a file upload, fixes issue #918 2012-12-16 16:19:51 -05:00
Robin Appelman 946d58eaa8 merge master into filesystem 2012-12-15 02:21:26 +01:00
Robin Appelman 1443d6c3ef fix mimetype icons for new files 2012-12-13 22:31:43 +01:00
Jan-Christoph Borchardt e0ada2c24f bring back fixed multiselect bar so it’s visible when scrolled down, fix #746 2012-12-13 19:44:55 +01:00
Robin Appelman 7969d6e646 Merge branch 'master' into filesystem 2012-12-11 23:57:59 +01:00
Jörn Friedrich Dreyer 80d8ca24ec fix svg -> png replacement for android, cleanup and remove obsolete css 2012-12-07 17:21:26 +01:00
Jörn Friedrich Dreyer 8cf1e560bb add IE9 CSS checkbox fixes 2012-12-07 17:21:26 +01:00
Jörn Friedrich Dreyer 810e02099e upload button HTML, CSS & JS cleanup 2012-12-07 15:32:24 +01:00
Thomas Müller 380db4a29e Merge pull request #640 from esthepiking/master 
Keyboard Shortcuts
 2012-12-06 13:42:14 -08:00
Robin Appelman d33f697a5f merge master into filesystem 2012-11-30 00:18:42 +01:00
Erik Sargent 0c6b53c25e no message 2012-11-28 09:55:38 -07:00
Erik Sargent ccb9bb4be0 initial setup 2012-11-28 09:50:49 -07:00
Jörn Friedrich Dreyer 9a441d3e3a show drag shadow in firefox by using helper:'clone' 2012-11-27 17:38:21 +01:00
Arthur Schiwon 776be8d9f7 all but the first parameter are introduced by & 2012-11-26 14:34:28 +01:00
Robin Appelman 555dec2d92 merge master into filesystem 2012-11-23 16:20:56 +01:00
Thomas Müller 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
Robin Appelman 95057e727d merge master into filesystem 2012-11-23 00:40:58 +01:00
Robin Appelman 8fb4dfd2ea use background scanner 2012-11-23 00:20:46 +01:00
Jörn Friedrich Dreyer a81d7cd79f introduce Files.containsInvalidCharacters(), use when creating or renaming files 2012-11-22 13:03:17 +01:00
Thomas Mueller cd495bf9ba some more invalid characters have been added 2012-11-22 11:52:05 +01:00
Bart Visscher 1793e85a52 Also reject names with \ in the name 
fixes issues #435 and #437
 2012-11-22 11:52:05 +01:00
blizzz 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
Brice Maron 02bc440900 Show error message to prevent adding a shared folder in the root dir fix #468 2012-11-16 14:59:14 +00:00
Thomas Mueller 4a3b5125cf adding comments on the form array indexes 2012-11-16 11:58:33 +01:00
Thomas Mueller 7af4cf48c9 refs #461 - drag'n'drop upload to a sub folder is working now 2012-11-16 10:23:40 +01:00
Jörn Friedrich Dreyer bbef5b377e add i18n for cancel button 2012-11-12 10:52:28 +01:00
Robin Appelman e14054610f Revert "fix blocking drag & drop upload of folders" 
Fixes #150

This reverts commit 5b2f3c7f72.
 2012-11-07 21:59:18 +01:00
Björn Schießle 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
Björn Schießle 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
Alessandro Cosentino 50dbb30eb9 Moved relative_modified_date from file/js to core/js 2012-11-06 10:56:42 -05:00
Robin Appelman fe6b987b3d use css to show/hide fileactions 2012-10-28 12:47:42 +01:00
Thomas Müller e4c0bb59e5 Merge pull request #39 from scambra/date-l10n-fixes 
Date l10n fixes
 2012-10-18 08:09:58 -07:00
scambra c814a7a841 use interpolation for some translations in js 2012-10-16 20:53:31 +02:00
scambra 5ecce8bfb7 Translate modification date when file is created/uploaded, use same strings as lib/template.php 2012-10-16 20:25:11 +02:00
Bart Visscher 4af5b016cc Whitespace cleanup 2012-10-14 21:04:08 +02:00
Robin Appelman 5b2f3c7f72 fix blocking drag & drop upload of folders 2012-10-12 15:30:16 +02:00
Björn Schießle 2923d24921 add data-id directly after upload/creation to the file list (bugfix for #1917) 2012-10-08 17:30:35 +02:00
Björn Schießle 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
Michael Gapczynski 4b446f3edd Revert part of 5beca59b, fixes file upload bug oc-1926 2012-10-07 17:17:37 -04:00
Björn Schießle 5e2bce24b4 enable user to download selected files from publically shared directory 2012-10-05 16:12:04 +02:00
Björn Schießle 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
Robin Appelman cfbca40fbe fix sharing for newly uploaded or created files 2012-09-26 13:25:11 +02:00
icewind1991 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
scambra aee8949c92 fix js success callback on safari when uploading files 2012-09-20 08:02:55 +02:00
Björn Schießle 6596094a28 add generated unique file name to the uploadingFiles list instead of the original name 2012-09-19 12:02:36 +02:00
Thomas Müller 21bffbfb69 Enhanced space handling - thx fmms 2012-09-17 11:14:44 +03:00
Thomas Müller 7a7d2a06b3 Adding a few more string to translation 2012-09-17 10:54:06 +03:00
Robin Appelman 7da3492ab5 show the size of new files when using New->From Url 2012-09-16 17:05:08 +02:00
Michael Gapczynski d936590f77 Don't pass content for a new text file from UI, fixes bug oc-1660 2012-09-06 16:01:51 -04:00
Bart Visscher 9329af921d Add missing ; to js code 2012-09-05 22:26:09 +02:00
Michael Gapczynski a26ea6d65c Implement support for replacing files during upload with the actions: replace, suggest name, and cancel 2012-09-05 00:12:25 -04:00
Jörn Friedrich Dreyer 73d0a2b8f7 use OC.PERMISSION_X to filter selected drag'n'drop elements 2012-08-31 01:11:10 +02:00
Thomas Mueller 077e988136 oc-1548: prevent user from leaving the page while a file upload is in progress 2012-08-31 00:45:03 +02:00
Jörn Friedrich Dreyer 26ef012418 use permissions to quickfix drag selections 2012-08-31 00:13:02 +02:00
Bart Visscher 0e58800016 Whitespace fixes in apps 2012-08-29 20:29:43 +02:00
Michael Gapczynski 7c0a5d4a59 Check if New and Upload buttons exist before adding their width to the total breadcrumbs width 2012-08-06 17:35:22 -04:00
Michael Gapczynski ea23854328 Merge branch 'master' into share_api 
Conflicts:
	apps/contacts/lib/app.php
	apps/contacts/templates/part.chooseaddressbook.rowfields.php
 2012-08-06 13:49:54 -04:00
Michael Gapczynski 086397d8a1 Fix condition checking for resizing breadcrumbs 2012-08-04 15:57:49 -04:00
Michael Gapczynski 207ca3ec06 Dynamically resize breadcrumbs, fix for bug oc-468 2012-08-04 15:50:32 -04:00
Michael Gapczynski 30b58f5677 Merge branch 'master' into share_api 
Conflicts:
	apps/calendar/js/loader.js
	apps/contacts/index.php
	apps/contacts/js/loader.js
	apps/files/js/files.js
	apps/files_sharing/sharedstorage.php
	lib/filesystemview.php
 2012-07-25 17:08:18 -04:00
Michael Gapczynski 4d17ed2f71 Make file actions permissions aware 2012-07-25 16:33:08 -04:00
Michael Gapczynski b58e72cdb2 Alert user of errors when creating new files or folders 2012-07-23 22:35:34 -04:00
Robin Appelman a49c07cf88 progressbar for New->From Url 2012-07-22 03:56:51 +02:00
Bjoern Schiessle b95996c02c - when creating a new text file or directory which name already exist use the same pattern as for file uploads in such a case (add a (N) to the name) 
- don't allow renaming if a file/directory with the name already exists
 2012-06-29 15:23:04 +02:00
Bjoern Schiessle f6e7c633a0 block slashes only for new files and new folders but not for file upload from url (bug #964) 2012-06-12 14:11:28 +02:00
Robin Appelman e6c4e53486 prevent creating files with a / the name 2012-06-06 00:02:51 +02:00
Bjoern Schiessle 2d80c148ba Don't allow user to delete, rename and re-share the "Shared" directory 2012-06-04 10:42:09 +02:00
Brice Maron 5fa14806c8 Add translation for error message 2012-05-24 19:16:00 +00:00
Brice Maron 2c9311cf48 Add error message when uploading folder or null files. ref oc-739 2012-05-24 18:47:34 +00:00
Brice Maron f00a50c76a Add pending line in file list before trying to upload. Correct indentation 2012-05-24 16:56:19 +00:00
Michael Gapczynski 568b6a7f56 Make only writable files draggable 2012-05-14 20:41:06 -04:00
Brice Maron de6aa0f88c Use a clean uri param constructor to get files 2012-05-09 21:35:59 +00:00
Brice Maron fae1ce4ea7 Correct file move by dropping on folder 2012-05-08 22:07:14 +00:00
Georg Ehrke 2b10371bde fix merge conflicts 2012-04-26 18:08:49 +02:00
Georg Ehrke 40f95ffdf3 fix security check for the path of the requested file 2012-04-26 17:55:00 +02:00
Georg Ehrke 0249a72cab fix downloading of files in files app 2012-04-26 17:35:12 +02:00
Georg Ehrke 45de7ad221 move files to app folder 2012-04-18 17:27:34 +02:00