| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Added filesApp flag as input field for files app detection | Vincent Petry | 2013-10-08 | 1 | -0/+1 |
| | | | | | | | | Since the files app can be reached under multiple URLs, either root, files.php or public.php, a flag has been added to the DOM to help apps (like file viewers) to detect whether they are currently in the files app. | ||||
| * | remove obsolete comment | Jörn Friedrich Dreyer | 2013-10-07 | 1 | -2/+0 |
| | | |||||
| * | Merge pull request #5088 from owncloud/fix_trashbin_button | Morris Jobke | 2013-10-06 | 1 | -3/+1 |
| |\ | | | | | trash bin button needs to be an input field | ||||
| | * | trash bin button needs to be an input field | Bjoern Schiessle | 2013-10-02 | 1 | -3/+1 |
| | | | |||||
| * | | more elegant style for Personal and Admin settings | Jan-Christoph Borchardt | 2013-10-05 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' into sharing_mail_notification_master | Bjoern Schiessle | 2013-10-04 | 1 | -0/+1 |
| |\ \ | | | | | | | | | | | | | | | | Conflicts: apps/files/index.php apps/files/templates/index.php | ||||
| | * \ | Merge pull request #4691 from owncloud/encryption_improved_error_messages_4617 | Björn Schießle | 2013-10-04 | 1 | -0/+1 |
| | |\ \ | | | | | | | | | Encryption improved error messages | ||||
| | | * | | fix hidden fieled name | Bjoern Schiessle | 2013-10-04 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | Merge branch 'master' into encryption_improved_error_messages_4617 | Bjoern Schiessle | 2013-09-30 | 1 | -1/+1 |
| | | |\| | |||||
| | | * | | Merge branch 'master' into encryption_improved_error_messages_4617 | Bjoern Schiessle | 2013-09-23 | 1 | -0/+26 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: settings/ajax/changepassword.php | ||||
| | | * \ \ | Merge branch 'master' into encryption_improved_error_messages_4617 | Bjoern Schiessle | 2013-09-16 | 2 | -46/+20 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/index.php | ||||
| | | * | | | | no longer enforce log out, but provide useful errors/warnings instead | Bjoern Schiessle | 2013-09-06 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' into sharing_mail_notification_master | Thomas Müller | 2013-10-02 | 2 | -9/+8 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: core/css/share.css | ||||
| | * | | | | | Merge pull request #5093 from owncloud/file-actions | Jan-Christoph Borchardt | 2013-10-02 | 1 | -8/+7 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | File Selected on Click instead of download. | ||||
| | | * | | | | | Takes nametext inside the anchor tag to fix the issue completely. | raghunayyar | 2013-10-02 | 1 | -8/+5 |
| | | | | | | | | |||||
| | | * | | | | | Closes Label inside the a tag for not hiding the fileactions. | raghunayyar | 2013-10-02 | 1 | -1/+3 |
| | | | | | | | | |||||
| | | * | | | | | File Selected on Click instead of download. | raghunayyar | 2013-10-02 | 1 | -1/+1 |
| | | | |_|_|/ | | |/| | | | |||||
| | * / | | | | simplify From Link icon in New menu | Jan-Christoph Borchardt | 2013-10-02 | 1 | -1/+1 |
| | |/ / / / | |||||
| * | | | | | Merge branch 'master' into sharing_mail_notification_master | Bjoern Schiessle | 2013-10-02 | 1 | -1/+1 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/private/util.php | ||||
| | * | | | | Fix not displaying "Upload something!" message | kondou | 2013-09-23 | 1 | -1/+1 |
| | | |_|/ | |/| | | | | | | | | | | Fix #4940 | ||||
| * | | | | Merge branch 'master' into sharing_mail_notification_master | Bjoern Schiessle | 2013-09-23 | 1 | -0/+26 |
| |\| | | | | | | | | | | | | | | | | | | | Conflicts: lib/public/share.php | ||||
| | * | | | simplify conflict template handling, fix reopen after ESC | Jörn Friedrich Dreyer | 2013-09-18 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Merge branch 'master' into fix_3728_with_file_exists_dialog | Jörn Friedrich Dreyer | 2013-09-17 | 2 | -44/+18 |
| | |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | | | refactor dialog creation | Jörn Friedrich Dreyer | 2013-09-04 | 1 | -0/+26 |
| | | | | | |||||
| * | | | | Merge branch 'master' into sharing_mail_notification_master | Bjoern Schiessle | 2013-09-16 | 2 | -44/+18 |
| |\ \ \ \ | | |/ / | |/| | | | | | | | | | | Conflicts: apps/files/index.php | ||||
| | * | | | Merge pull request #4838 from owncloud/refactor_upload_js | Thomas Müller | 2013-09-16 | 1 | -10/+2 |
| | |\ \ \ | | | | | | | | | | | refactor upload js & html to always use only js to fill form data | ||||
| | | * | | | refactor upload js & html to always use only js to fill form data | Jörn Friedrich Dreyer | 2013-09-13 | 1 | -10/+2 |
| | | | | | | |||||
| | * | | | | Use hash part of URL for IE8 in files app | Vincent Petry | 2013-09-13 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this fix, the URL wasn't updated in IE8 when navigating into folders. This fix makes use of the hash part of URLs to make this work in IE8, since IE8 doesn't support the history API nor changing the URL without redirecting. From now, both the regular query URL "?dir=somedir" and "#?dir=somedir" will work in both IE8 and non-IE8 browsers. In IE8, query based URLs are automatically converted to hash URLs upon page load. The conversion is done on the server side by redirecting the user to the updated URL. When loading a page directly using a hash URL in the form "#?dir=somedir" in IE8, the server doesn't get the hash, so it will not return any results in that case and rely on ajax to load the first page. | ||||
| | * | | | | Fixed ajax support to also update the current dir permissions | Vincent Petry | 2013-09-13 | 1 | -6/+4 |
| | | | | | | |||||
| | * | | | | fixing breadcrumbs on ajax loading of files | Thomas Müller | 2013-09-13 | 1 | -1/+3 |
| | | | | | | |||||
| | * | | | | Ajax calls for "files" and "files_trashbin" apps | Vincent Petry | 2013-09-13 | 2 | -6/+8 |
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | | | remove unused $relativePath | Thomas Müller | 2013-09-12 | 1 | -2/+0 |
| | | | | | |||||
| | * | | | move icon generation logic out of the template | Thomas Müller | 2013-09-12 | 1 | -20/+1 |
| | |/ / | |||||
| * | | | Merge branch 'master' into sharing_mail_notification_master | Bjoern Schiessle | 2013-09-05 | 1 | -1/+1 |
| |\| | | | | | | | | | | | | | | | | | | | | increased version number to trigger db update Conflicts: lib/util.php | ||||
| | * | | Merge pull request #4473 from owncloud/texteditor_polishing | Jörn Friedrich Dreyer | 2013-09-03 | 1 | -1/+1 |
| | |\ \ | | |/ | |/| | Texteditor polishing | ||||
| | | * | Revert "remove editor div in filelist", add "is deprecated" comment | Jörn Friedrich Dreyer | 2013-09-03 | 1 | -0/+1 |
| | | | | | | | | | | | | | This reverts commit 64d09452f55c0c73fe0d55a70f82d8ad7a386d7c. | ||||
| | | * | remove editor div in filelist | Jörn Friedrich Dreyer | 2013-08-16 | 1 | -1/+0 |
| | | | | |||||
| * | | | Merge branch 'master' into sharing_mail_notification_master | Bjoern Schiessle | 2013-09-02 | 2 | -18/+45 |
| |\| | | | | | | | | | | | | | | Conflicts: lib/util.php | ||||
| | * | | text centered horizontally and vertically in emptycontent div | Alessandro Cosentino | 2013-08-31 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge master into oc_preview | Georg Ehrke | 2013-08-29 | 1 | -39/+1 |
| | |\ \ | |||||
| | * | | | move isMimeSupported out of template files | Georg Ehrke | 2013-08-21 | 1 | -3/+3 |
| | | | | | |||||
| | * | | | style fixes for preview lib | Georg Ehrke | 2013-08-19 | 1 | -1/+2 |
| | | | | | |||||
| | * | | | Merge master into oc_preview | Georg Ehrke | 2013-08-19 | 1 | -0/+1 |
| | |\ \ \ | |||||
| | * | | | | checkstyle double quotes in HTML | Jan-Christoph Borchardt | 2013-08-15 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | Merge branch 'oc_preview' of github.com:owncloud/core into oc_preview | Jan-Christoph Borchardt | 2013-08-14 | 1 | -2/+6 |
| | |\ \ \ \ | |||||
| | | * | | | | fix adding preview-icon to clss attribute | Georg Ehrke | 2013-08-14 | 1 | -2/+6 |
| | | | | | | | |||||
| | * | | | | | increase row height to 50px, properly position everything, checkboxes, ↵ | Jan-Christoph Borchardt | 2013-08-14 | 2 | -12/+18 |
| | |/ / / / | | | | | | | | | | | | | | | | actions etc | ||||
| | * | | | | fix breaking error due to ... a wrong icon link. Seriously? | Jan-Christoph Borchardt | 2013-08-14 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | use web.svg instead of web.png | Georg Ehrke | 2013-08-14 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | don't use hardcoded size for preview | Georg Ehrke | 2013-08-14 | 1 | -1/+1 |
| | | | | | | |||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |