Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Merge pull request #4691 from owncloud/encryption_improved_error_messages_4617 | Björn Schießle | 2013-10-04 | 1 | -0/+1 | |
| |\ \ | ||||||
| | * | | 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 | |
| | |\ \ | ||||||
| | * \ \ | Merge branch 'master' into encryption_improved_error_messages_4617 | Bjoern Schiessle | 2013-09-16 | 2 | -46/+20 | |
| | |\ \ \ | ||||||
| | * | | | | 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 | |
|\| | | | | | ||||||
| * | | | | | Merge pull request #5093 from owncloud/file-actions | Jan-Christoph Borchardt | 2013-10-02 | 1 | -8/+7 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | 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 | |
|\| | | | | ||||||
| * | | | | Fix not displaying "Upload something!" message | kondou | 2013-09-23 | 1 | -1/+1 | |
| | |_|/ | |/| | | ||||||
* | | | | Merge branch 'master' into sharing_mail_notification_master | Bjoern Schiessle | 2013-09-23 | 1 | -0/+26 | |
|\| | | | ||||||
| * | | | 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 | |
| |\ \ \ | | | |/ | | |/| | ||||||
| * | | | 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 | |
|\ \ \ \ | | |/ / | |/| | | ||||||
| * | | | 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 | 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 | |
| * | | | | 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 | |
| |/ / / | ||||||
| * | | | 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 | |
|\| | | ||||||
| * | | Merge pull request #4473 from owncloud/texteditor_polishing | Jörn Friedrich Dreyer | 2013-09-03 | 1 | -1/+1 | |
| |\ \ | | |/ | |/| | ||||||
| | * | Revert "remove editor div in filelist", add "is deprecated" comment | Jörn Friedrich Dreyer | 2013-09-03 | 1 | -0/+1 | |
| | * | 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 | |
|\| | | ||||||
| * | | 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, action... | Jan-Christoph Borchardt | 2013-08-14 | 2 | -12/+18 | |
| |/ / / / | ||||||
| * | | | | 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 | |
| * | | | | style fixes | Georg Ehrke | 2013-07-30 | 1 | -1/+1 | |
| * | | | | Merge branch 'master' into oc_preview | Thomas Müller | 2013-07-30 | 2 | -9/+5 | |
| |\ \ \ \ | | | |_|/ | | |/| | | ||||||
| * | | | | add class='preview-icon' to rows in file app that make use of previews | Georg Ehrke | 2013-07-29 | 1 | -2/+10 | |
| * | | | | implement use of previews in sharing app | Georg Ehrke | 2013-07-11 | 1 | -1/+8 | |
| * | | | | merge conflicts ... | Georg Ehrke | 2013-07-10 | 3 | -9/+43 | |
| |\ \ \ \ | ||||||
| * | | | | | some style adjustments | Georg Ehrke | 2013-07-10 | 1 | -3/+3 |