summaryrefslogtreecommitdiffstats
path: root/apps/files/templates
Commit message (Expand)AuthorAgeFilesLines
...
| * | Merge pull request #4691 from owncloud/encryption_improved_error_messages_4617Björn Schießle2013-10-041-0/+1
| |\ \
| | * | fix hidden fieled nameBjoern Schiessle2013-10-041-1/+1
| | * | Merge branch 'master' into encryption_improved_error_messages_4617Bjoern Schiessle2013-09-301-1/+1
| | |\|
| | * | Merge branch 'master' into encryption_improved_error_messages_4617Bjoern Schiessle2013-09-231-0/+26
| | |\ \
| | * \ \ Merge branch 'master' into encryption_improved_error_messages_4617Bjoern Schiessle2013-09-162-46/+20
| | |\ \ \
| | * | | | no longer enforce log out, but provide useful errors/warnings insteadBjoern Schiessle2013-09-061-0/+1
* | | | | | Merge branch 'master' into sharing_mail_notification_masterThomas Müller2013-10-022-9/+8
|\| | | | |
| * | | | | Merge pull request #5093 from owncloud/file-actionsJan-Christoph Borchardt2013-10-021-8/+7
| |\ \ \ \ \
| | * | | | | Takes nametext inside the anchor tag to fix the issue completely.raghunayyar2013-10-021-8/+5
| | * | | | | Closes Label inside the a tag for not hiding the fileactions.raghunayyar2013-10-021-1/+3
| | * | | | | File Selected on Click instead of download.raghunayyar2013-10-021-1/+1
| | | |_|_|/ | | |/| | |
| * / | | | simplify From Link icon in New menuJan-Christoph Borchardt2013-10-021-1/+1
| |/ / / /
* | | | | Merge branch 'master' into sharing_mail_notification_masterBjoern Schiessle2013-10-021-1/+1
|\| | | |
| * | | | Fix not displaying "Upload something!" messagekondou2013-09-231-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'master' into sharing_mail_notification_masterBjoern Schiessle2013-09-231-0/+26
|\| | |
| * | | simplify conflict template handling, fix reopen after ESCJörn Friedrich Dreyer2013-09-181-1/+1
| * | | Merge branch 'master' into fix_3728_with_file_exists_dialogJörn Friedrich Dreyer2013-09-172-44/+18
| |\ \ \ | | | |/ | | |/|
| * | | refactor dialog creationJörn Friedrich Dreyer2013-09-041-0/+26
* | | | Merge branch 'master' into sharing_mail_notification_masterBjoern Schiessle2013-09-162-44/+18
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #4838 from owncloud/refactor_upload_jsThomas Müller2013-09-161-10/+2
| |\ \ \
| | * | | refactor upload js & html to always use only js to fill form dataJörn Friedrich Dreyer2013-09-131-10/+2
| * | | | Use hash part of URL for IE8 in files appVincent Petry2013-09-131-1/+2
| * | | | Fixed ajax support to also update the current dir permissionsVincent Petry2013-09-131-6/+4
| * | | | fixing breadcrumbs on ajax loading of filesThomas Müller2013-09-131-1/+3
| * | | | Ajax calls for "files" and "files_trashbin" appsVincent Petry2013-09-132-6/+8
| |/ / /
| * | | remove unused $relativePathThomas Müller2013-09-121-2/+0
| * | | move icon generation logic out of the templateThomas Müller2013-09-121-20/+1
| |/ /
* | | Merge branch 'master' into sharing_mail_notification_masterBjoern Schiessle2013-09-051-1/+1
|\| |
| * | Merge pull request #4473 from owncloud/texteditor_polishingJörn Friedrich Dreyer2013-09-031-1/+1
| |\ \ | | |/ | |/|
| | * Revert "remove editor div in filelist", add "is deprecated" commentJörn Friedrich Dreyer2013-09-031-0/+1
| | * remove editor div in filelistJörn Friedrich Dreyer2013-08-161-1/+0
* | | Merge branch 'master' into sharing_mail_notification_masterBjoern Schiessle2013-09-022-18/+45
|\| |
| * | text centered horizontally and vertically in emptycontent divAlessandro Cosentino2013-08-311-1/+1
| * | Merge master into oc_previewGeorg Ehrke2013-08-291-39/+1
| |\ \
| * | | move isMimeSupported out of template filesGeorg Ehrke2013-08-211-3/+3
| * | | style fixes for preview libGeorg Ehrke2013-08-191-1/+2
| * | | Merge master into oc_previewGeorg Ehrke2013-08-191-0/+1
| |\ \ \
| * | | | checkstyle double quotes in HTMLJan-Christoph Borchardt2013-08-151-2/+2
| * | | | Merge branch 'oc_preview' of github.com:owncloud/core into oc_previewJan-Christoph Borchardt2013-08-141-2/+6
| |\ \ \ \
| | * | | | fix adding preview-icon to clss attributeGeorg Ehrke2013-08-141-2/+6
| * | | | | increase row height to 50px, properly position everything, checkboxes, action...Jan-Christoph Borchardt2013-08-142-12/+18
| |/ / / /
| * | | | fix breaking error due to ... a wrong icon link. Seriously?Jan-Christoph Borchardt2013-08-141-1/+1
| * | | | use web.svg instead of web.pngGeorg Ehrke2013-08-141-1/+1
| * | | | don't use hardcoded size for previewGeorg Ehrke2013-08-141-1/+1
| * | | | style fixesGeorg Ehrke2013-07-301-1/+1
| * | | | Merge branch 'master' into oc_previewThomas Müller2013-07-302-9/+5
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | add class='preview-icon' to rows in file app that make use of previewsGeorg Ehrke2013-07-291-2/+10
| * | | | implement use of previews in sharing appGeorg Ehrke2013-07-111-1/+8
| * | | | merge conflicts ...Georg Ehrke2013-07-103-9/+43
| |\ \ \ \
| * | | | | some style adjustmentsGeorg Ehrke2013-07-101-3/+3