| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | fix merge conflict | Björn Schießle | 2013-01-31 | 1 | -46/+124 |
| |\ | |||||
| | * | merge master into filesystem | Robin Appelman | 2013-01-30 | 1 | -23/+109 |
| | |\ | |||||
| | | * | use $.trim() for IE8 | Jörn Friedrich Dreyer | 2013-01-30 | 1 | -2/+2 |
| | | | | |||||
| | | * | reset checkbox after getting selected files instead of ofter dragging, speed ↵ | Jörn Friedrich Dreyer | 2013-01-30 | 1 | -18/+13 |
| | | | | | | | | | | | | | up revert | ||||
| | | * | use post instead of get | Jörn Friedrich Dreyer | 2013-01-30 | 1 | -2/+2 |
| | | | | |||||
| | | * | add multselect dnd | Jörn Friedrich Dreyer | 2013-01-30 | 1 | -21/+108 |
| | | | | |||||
| | | * | Merge pull request #1227 from owncloud/hideuploadprogresscancelinielt10 | Thomas Müller | 2013-01-30 | 1 | -0/+4 |
| | | |\ | | | | | | | | | hide upload progress bar and cancel action in IE < 10 | ||||
| | | | * | hide upload progress bar and cancel action in IE < 10 | Jörn Friedrich Dreyer | 2013-01-18 | 1 | -0/+4 |
| | | | | | |||||
| | * | | | merge master into filesystem | Robin Appelman | 2013-01-26 | 1 | -33/+42 |
| | |\| | | |||||
| | * | | | merge master into filesytem | Robin Appelman | 2013-01-20 | 1 | -1/+49 |
| | |\ \ \ | |||||
| | * \ \ \ | merge master into filesystem | Robin Appelman | 2013-01-16 | 1 | -1/+1 |
| | |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | | merge master into filesystem | Robin Appelman | 2013-01-15 | 1 | -43/+60 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | merge master into filesystem | Robin Appelman | 2013-01-07 | 1 | -4/+16 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | merge master into filesystem | Robin Appelman | 2012-12-25 | 1 | -13/+11 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | merge master into filesystem | Robin Appelman | 2012-12-15 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' into filesystem | Robin Appelman | 2012-12-11 | 1 | -20/+9 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | merge master into filesystem | Robin Appelman | 2012-11-30 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | merge master into filesystem | Robin Appelman | 2012-11-23 | 1 | -3/+13 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | merge master into filesystem | Robin Appelman | 2012-11-23 | 1 | -0/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | use background scanner | Robin Appelman | 2012-11-23 | 1 | -23/+15 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | fix merge conflicts | Björn Schießle | 2013-01-28 | 1 | -33/+42 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | replace #notification with OC.Notification call | Thomas Mueller | 2013-01-19 | 1 | -2/+1 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Merge branch 'master' into fixing-998-master | Thomas Mueller | 2013-01-19 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/files.js | ||||
| | * | | | | | | | | | | | | update used space percent after each ajax call and display the notification | Thomas Mueller | 2013-01-19 | 1 | -2/+10 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Merge branch 'master' into fixing-998-master | Thomas Mueller | 2013-01-18 | 1 | -19/+68 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/ajax/upload.php apps/files/js/files.js | ||||
| | * | | | | | | | | | | | | | fixing indent - sorryy wrong setting on the IDE :-( | Thomas Mueller | 2013-01-11 | 1 | -17/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | replace missing calls to OC.Notification.show | ||||
| | * | | | | | | | | | | | | | adding accidentally removed line - THX @bartv2 | Thomas Mueller | 2013-01-11 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Merge branch 'master' into fixing-998-master | Thomas Mueller | 2013-01-11 | 1 | -39/+56 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/files.js | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into fixing-998-master | Thomas Mueller | 2013-01-06 | 1 | -4/+14 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/files.js | ||||
| | * | | | | | | | | | | | | | | javascript notification functions have been moved to js.js for common use | Thomas Mueller | 2013-01-04 | 1 | -33/+12 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | notifications are now shown/hidden using the js functions hideNotification ↵ | Thomas Mueller | 2013-01-02 | 1 | -20/+45 |
| | | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and showNotification. storage warnings are displayed in a notification. as soon as a notification is hidden the storage warning will come back. | ||||
| * | | | | | | | | | | | | | | call the trash bin view | Björn Schießle | 2013-01-22 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | add trash button to web interface | Björn Schießle | 2013-01-22 | 1 | -0/+5 |
| | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge pull request #1228 from owncloud/generating_zip_message | Jan-Christoph Borchardt | 2013-01-19 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | Make the ZIP download information friendlier | ||||
| | * | | | | | | | | | | | | Change the second part of the notification | Lukas Reschke | 2013-01-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Make the message friendlier | Lukas Reschke | 2013-01-18 | 1 | -1/+1 |
| | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge pull request #986 from owncloud/fixing-784-master | Thomas Müller | 2013-01-18 | 1 | -0/+48 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | the maximum upload size is now part of the response of the upload and de... | ||||
| | * | | | | | | | | | | | fixing indent | Thomas Mueller | 2013-01-18 | 1 | -23/+23 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | adding a ajax call to get the current file storage stats like free space | Thomas Mueller | 2013-01-11 | 1 | -0/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | | | | | | | | | | | Merge branch 'master' into fixing-784-master | Thomas Mueller | 2013-01-11 | 1 | -41/+57 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/files.js | ||||
| | * | | | | | | | | | | | Merge branch 'master' into fixing-784-master | Thomas Mueller | 2013-01-06 | 1 | -4/+16 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/ajax/upload.php apps/files/js/files.js lib/helper.php | ||||
| | * | | | | | | | | | | | the maximum upload size is now part of the response of the upload and delete ↵ | Thomas Müller | 2012-12-20 | 1 | -2/+24 |
| | | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | operation. the maximum upload size is updated within the browser once an upload or delete operation has been finished | ||||
| * | | | | | | | | | | | Whitespace cleanup | Bart Visscher | 2013-01-16 | 1 | -1/+1 |
| | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |||||
| * | | | | | | | | | | allow default click behaviour | Jörn Friedrich Dreyer | 2013-01-09 | 1 | -1/+2 |
| | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | | fixing string concatenation in javascript | Thomas Mueller | 2013-01-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refs https://github.com/owncloud/core/commit/ae54364d7c8baf5138d166855db6431190963886 | ||||
| * | | | | | | | | | attach max upload tipsy to div instead of a to fix tooltip not showing due ↵ | Jörn Friedrich Dreyer | 2013-01-07 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to new z-index | ||||
| * | | | | | | | | | remove aborted uploads | Jörn Friedrich Dreyer | 2013-01-07 | 1 | -0/+3 |
| | | | | | | | | | | |||||
| * | | | | | | | | | adapt to isFileNameValid, whitespace cleanup | Jörn Friedrich Dreyer | 2013-01-07 | 1 | -22/+18 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'master' into fix_minor_files_annoyances | Thomas Mueller | 2013-01-06 | 1 | -4/+16 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/files.js | ||||
| | * | | | | | | | | rename containsInvalidCharacters() to isFileNameValid() - NOTE: semantic has ↵ | Thomas Mueller | 2013-01-06 | 1 | -4/+16 |
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changed! adding file name checks and notifications to isFileNameValid() for . and empty file name | ||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| aboutsummaryrefslogtreecommitdiffstats |