| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Shortened notification message that was too long | Vincent Petry | 2013-10-04 | 1 | -1/+1 |
| | | | | | | | The message for invalid private key was too long and didn't fit in the notification box. This fix reduces the message to fit properly by removing the extra information. | ||||
| * | Merge branch 'master' into encryption_improved_error_messages_4617 | Bjoern Schiessle | 2013-09-30 | 1 | -1/+5 |
| |\ | |||||
| | * | implement previews for public upload | Georg Ehrke | 2013-09-23 | 1 | -1/+5 |
| | | | |||||
| * | | Merge branch 'master' into encryption_improved_error_messages_4617 | Bjoern Schiessle | 2013-09-23 | 1 | -39/+28 |
| |\| | | | | | | | | | Conflicts: settings/ajax/changepassword.php | ||||
| | * | Merge branch 'master' into fix_3728_with_file_exists_dialog | Jörn Friedrich Dreyer | 2013-09-19 | 1 | -0/+5 |
| | |\ | | | | | | | | | | | | | Conflicts: apps/files/js/filelist.js | ||||
| | | * | initial scrollto implementation: | Jörn Friedrich Dreyer | 2013-09-17 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use places/folder icon, move link construction to JS, only show icon on hover, use 'searchresult' as css class name, add filter/unfilter methods, highlight searched files in current filelist only filter when correct FileList is present | ||||
| | * | | fix race condition in lazy preview loading | Jörn Friedrich Dreyer | 2013-09-19 | 1 | -12/+18 |
| | | | | |||||
| | * | | fixing typos and l10n | Thomas Müller | 2013-09-19 | 1 | -2/+2 |
| | | | | |||||
| | * | | use 96x96 as 64x64 thumbnails in conflicts dialog, 64x64 looks very blocky ↵ | Jörn Friedrich Dreyer | 2013-09-19 | 1 | -4/+8 |
| | | | | | | | | | | | | | ... maybe something is wrong there | ||||
| | * | | Merge branch 'master' into fix_3728_with_file_exists_dialog | Jörn Friedrich Dreyer | 2013-09-17 | 1 | -93/+115 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/css/files.css apps/files/js/file-upload.js apps/files/js/filelist.js apps/files/js/files.js apps/files_sharing/js/public.js core/js/jquery.ocdialog.js core/js/oc-dialogs.js | ||||
| | * | | separate uploading code from progress code, add progress capability detection | Jörn Friedrich Dreyer | 2013-09-05 | 1 | -16/+16 |
| | | | | |||||
| | * | | Merge branch 'master' into fix_3728_with_file_exists_dialog | Jörn Friedrich Dreyer | 2013-09-04 | 1 | -203/+37 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/ajax/upload.php apps/files/js/file-upload.js apps/files/js/filelist.js apps/files/js/files.js apps/files/templates/part.list.php | ||||
| | * | | | architecture too complex | Jörn Friedrich Dreyer | 2013-08-21 | 1 | -7/+0 |
| | | | | | |||||
| | * | | | progress fixes | Jörn Friedrich Dreyer | 2013-08-16 | 1 | -27/+2 |
| | | | | | |||||
| * | | | | Merge branch 'master' into encryption_improved_error_messages_4617 | Bjoern Schiessle | 2013-09-16 | 1 | -81/+103 |
| |\ \ \ \ | | |_|/ | |/| | | | | | | | | | | Conflicts: apps/files/index.php | ||||
| | * | | | Fixed JS error in trashbin app | Vincent Petry | 2013-09-13 | 1 | -0/+4 |
| | | | | | |||||
| | * | | | Changed breadcrumb event handling to not use delegate | Vincent Petry | 2013-09-13 | 1 | -4/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Using delegate might break apps that embed themselves in the files container. When an app embeds itself and the user clicks a breadcrumb, it will simply reload the whole browser page. | ||||
| | * | | | fixing breadcrumbs on ajax loading of files | Thomas Müller | 2013-09-13 | 1 | -62/+71 |
| | | | | | |||||
| | * | | | Ajax calls for "files" and "files_trashbin" apps | Vincent Petry | 2013-09-13 | 1 | -19/+29 |
| | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Frontend: - The files app list now uses ajax calls to refresh the list. - Added support the browser back button (history API). - Added mask + spinner while loading file list Backend: - Added utility function in core JS for parsing query strings. - Moved file list + breadcrumb template data code to helper functions - Fixed some file paths in trashbin app to be similar to the files app | ||||
| * / | | no longer enforce log out, but provide useful errors/warnings instead | Bjoern Schiessle | 2013-09-06 | 1 | -0/+9 |
| |/ / | |||||
| * | | Merge master into oc_preview | Georg Ehrke | 2013-08-26 | 1 | -200/+0 |
| |\ \ | |||||
| | * | | remove duplicate code | Thomas Müller | 2013-08-22 | 1 | -198/+0 |
| | | | | |||||
| * | | | fix preview issue when uploading a file with parentheses | Georg Ehrke | 2013-08-26 | 1 | -1/+3 |
| | | | | |||||
| * | | | move path generation for previews to dedicated function | Georg Ehrke | 2013-08-23 | 1 | -2/+7 |
| | | | | |||||
| * | | | Merge master into oc_preview | Georg Ehrke | 2013-08-19 | 1 | -0/+16 |
| |\| | | |||||
| | * | | Merge pull request #4239 from owncloud/decrypt_files_again | Björn Schießle | 2013-08-18 | 1 | -0/+14 |
| | |\ \ | | | | | | | | | Enable user to decrypt files again after encryption app was disabled | ||||
| | | * \ | Merge branch 'master' into decrypt_files_again | Bjoern Schiessle | 2013-08-17 | 1 | -11/+11 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/tests/keymanager.php | ||||
| | | * | | | remove whitespaces and some leftover code from testing | Bjoern Schiessle | 2013-08-15 | 1 | -1/+1 |
| | | | | | | |||||
| | | * | | | check if some encrypted files are left after the app was disabled and warn ↵ | Bjoern Schiessle | 2013-08-12 | 1 | -0/+14 |
| | | | | | | | | | | | | | | | | | | | | | the user | ||||
| | * | | | | communicate size of newly created file back and update UI | Thomas Müller | 2013-08-16 | 1 | -0/+2 |
| | | |/ / | |/| | | |||||
| * | | | | use jQuery.get instead of jQuery.ajax | Georg Ehrke | 2013-08-16 | 1 | -6/+2 |
| | | | | | |||||
| * | | | | Merge master into oc_preview | Georg Ehrke | 2013-08-14 | 1 | -10/+2 |
| |\| | | | |||||
| | * | | | Use plural translations | kondou | 2013-08-09 | 1 | -11/+3 |
| | | |/ | |/| | |||||
| * | | | lazy load preview icons | Georg Ehrke | 2013-08-14 | 1 | -6/+14 |
| | | | | |||||
| * | | | don't use hardcoded size for preview | Georg Ehrke | 2013-08-14 | 1 | -1/+3 |
| | | | | |||||
| * | | | style fixes | Georg Ehrke | 2013-07-30 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'master' into oc_preview | Thomas Müller | 2013-07-30 | 1 | -4/+10 |
| |\| | | | | | | | | | | | | | | | | | Conflicts: 3rdparty lib/template.php | ||||
| | * | | remove whitespaces | Bjoern Schiessle | 2013-07-29 | 1 | -1/+1 |
| | | | | |||||
| | * | | disable "deleted files" button if trash bin is empty | Björn Schießle | 2013-07-26 | 1 | -2/+10 |
| | |/ | |||||
| | * | finally remove the file size obfuscation as it had more disadvantages. I was ↵ | Jan-Christoph Borchardt | 2013-07-18 | 1 | -3/+1 |
| | | | | | | | | | wrong, sorry. | ||||
| * | | merge conflicts ... | Georg Ehrke | 2013-07-10 | 1 | -150/+17 |
| |\| | |||||
| | * | Public upload feature | Roman Geber | 2013-06-25 | 1 | -148/+1 |
| | | | |||||
| | * | use json to encode user list | Robin Appelman | 2013-06-19 | 1 | -1/+1 |
| | | | |||||
| | * | allow scanning files for multiple users | Robin Appelman | 2013-06-19 | 1 | -2/+16 |
| | | | |||||
| * | | properly encode path | Georg Ehrke | 2013-07-10 | 1 | -1/+1 |
| | | | |||||
| * | | implement preview loading after upload | Georg Ehrke | 2013-07-02 | 1 | -6/+13 |
| |/ | |||||
| * | small typo fix: added 2 whitespaces | davidak | 2013-05-24 | 1 | -2/+2 |
| | | |||||
| * | Files: set the proper mimetype when creating a new text file | Robin Appelman | 2013-05-06 | 1 | -2/+2 |
| | | |||||
| * | It's a class | Lukas Reschke | 2013-04-28 | 1 | -1/+1 |
| | | |||||
| * | Move onclick handler | Lukas Reschke | 2013-04-28 | 1 | -0/+5 |
| | | |||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| aboutsummaryrefslogtreecommitdiffstats |