| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #5402 from owncloud/fixing-5367-master | Thomas Müller | 2013-10-24 | 2 | -1/+11 |
| |\ | | | | | fixes chunked upload | ||||
| | * | fixes #5367 | Thomas Müller | 2013-10-17 | 2 | -1/+11 |
| | | | |||||
| * | | Merge pull request #5496 from owncloud/prefer_png_from_theme_over_core_svg | Thomas Müller | 2013-10-23 | 1 | -0/+18 |
| |\ \ | | | | | | | prefer logo png from theme over svg from core | ||||
| | * | | prefer logo png from theme over svg from core | Jörn Friedrich Dreyer | 2013-10-23 | 1 | -0/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The logo images are specified in the php templates with eg `image_path('', 'logo-wide.svg')`. If that file exists the correct path will be served to the client in the html template. Then the `SVGSupport()` is checked in https://github.com/owncloud/core/blob/master/core/js/js.js#L701 which will replace `svg` with `png` in img tags and css background definitions. fixes #5074 partially solves #5421, but not when an svg has been specified in css and is then 'fixed' by js to point to a png which does not exist in the theme but is then might be resolved to an image from core .... well theoretical problem ... might not even be a problem @karlitschek @jancborchardt please review | ||||
| * | | | Merge pull request #5477 from ↵ | Thomas Müller | 2013-10-23 | 10 | -460/+582 |
| |\ \ \ | | | | | | | | | | | | | | | | | owncloud/prevent_user_from_creating_or_renaming_to_an_existing_filename prevent user from creating or renaming sth. to an existing filename | ||||
| | * | | | fix translations | Jörn Friedrich Dreyer | 2013-10-23 | 2 | -10/+10 |
| | | | | | |||||
| | * | | | Merge branch 'master' into ↵ | Jörn Friedrich Dreyer | 2013-10-23 | 27 | -33/+111 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prevent_user_from_creating_or_renaming_to_an_existing_filename Conflicts: apps/files/js/filelist.js | ||||
| | * | | | | use a more descriptive error message when the user tries to create '/Shared' | Jörn Friedrich Dreyer | 2013-10-23 | 2 | -3/+3 |
| | | | | | | |||||
| | * | | | | cleanup array value assignment | Jörn Friedrich Dreyer | 2013-10-23 | 1 | -8/+4 |
| | | | | | | |||||
| | * | | | | add missing ; | Jörn Friedrich Dreyer | 2013-10-23 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | cleanup precondition checking when creating new files / folders | Jörn Friedrich Dreyer | 2013-10-23 | 2 | -19/+50 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - use i18n - use trim when checking for empty file / folder name - use more verbose error descriptions | ||||
| | * | | | | use correct filename in error result json | Jörn Friedrich Dreyer | 2013-10-23 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | fix message dialog titles in IE8 | Jörn Friedrich Dreyer | 2013-10-23 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Merge branch 'master' into ↵ | Thomas Müller | 2013-10-22 | 3 | -3/+48 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prevent_user_from_creating_or_renaming_to_an_existing_filename Conflicts: apps/files/js/filelist.js | ||||
| | * | | | | | fixing js syntax error | Thomas Müller | 2013-10-22 | 1 | -2/+2 |
| | | | | | | | |||||
| | * | | | | | fixing undefined variable $newname | Thomas Müller | 2013-10-22 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | adding PHPDoc comments | Thomas Müller | 2013-10-22 | 1 | -0/+7 |
| | | | | | | | |||||
| | * | | | | | prevent user from creating or renaming sth. to an existing filename | Jörn Friedrich Dreyer | 2013-10-22 | 7 | -436/+524 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - show tooltip when violating naming constraints while typing - when target filename exists on server fallback to dialog to interrupt the users flow because something unexpected went wrong - fixes #5062 - also fixes some whitespace and codestyle issues in files js - uses css selector over filterAttr in touched js files | ||||
| * | | | | | | Merge pull request #5497 from owncloud/ie8-placeholdershim | Thomas Müller | 2013-10-23 | 5 | -6/+226 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Ie8 placeholdershim | ||||
| | * | | | | | | Fixed sharing dropdown placeholders in IE8/9 | Vincent Petry | 2013-10-23 | 3 | -0/+220 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added jquery.placeholder shim to handle input field placeholders in IE8/9 | ||||
| | * | | | | | | Renamed current placeholder jquery plugin to imageplaceholder | Vincent Petry | 2013-10-23 | 2 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to prevent conflicts with jquery libs that handle text placeholders in IE8 | ||||
| * | | | | | | | Merge pull request #5464 from owncloud/fixing-5456-master | Thomas Müller | 2013-10-23 | 4 | -3/+59 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fixing 5456 master | ||||
| | * | | | | | | | test cases added for create/remove Shared folder and file | Thomas Müller | 2013-10-22 | 2 | -0/+41 |
| | | | | | | | | | |||||
| | * | | | | | | | creating and deleting of file and folder 'Shared' in root is not allowed | Thomas Müller | 2013-10-22 | 2 | -3/+18 |
| | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | | Merge pull request #5492 from owncloud/admin-forcesslwrongid | Thomas Müller | 2013-10-23 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fixed wrong id when reading checkbox value for force SSL setting | ||||
| | * | | | | | | | Fixed wrong id when reading checkbox value for force SSL setting | Vincent Petry | 2013-10-23 | 1 | -1/+1 |
| | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | Fixes #5488 | ||||
| * | | | | | | | Merge pull request #5435 from owncloud/share-improvements | Thomas Müller | 2013-10-23 | 3 | -53/+54 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Share improvements | ||||
| | * | | | | | | | Fixed share dropdown checkbox wrapping | Vincent Petry | 2013-10-23 | 2 | -28/+43 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "show cruds" button is now embedded into the last label/checkbox group and wraps with it. Added ellipsis to prevent long names to exceed the dropdown's width. | ||||
| | * | | | | | | | better wording for share input field and share link | Jan-Christoph Borchardt | 2013-10-23 | 1 | -2/+2 |
| | | | | | | | | | |||||
| | * | | | | | | | Added left padding to notCreatable message | Vincent Petry | 2013-10-23 | 1 | -0/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | improve wording of permission notice | Jan-Christoph Borchardt | 2013-10-20 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | beautify 'you dont have write permissions' notice, fix #2770 | Jan-Christoph Borchardt | 2013-10-20 | 2 | -1/+6 |
| | | | | | | | | | |||||
| | * | | | | | | | shorten string to 'notify by email', cut 'user' | Jan-Christoph Borchardt | 2013-10-20 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | remove hover hide/show stuff for share dropdown to make things more obvious | Jan-Christoph Borchardt | 2013-10-20 | 1 | -26/+3 |
| | | | | | | | | | |||||
| | * | | | | | | | bold share username | Jan-Christoph Borchardt | 2013-10-20 | 1 | -0/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | properly align checkboxes to text | Jan-Christoph Borchardt | 2013-10-20 | 1 | -0/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | more breathing space in share list | Jan-Christoph Borchardt | 2013-10-20 | 1 | -1/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | beta 1 | Frank Karlitschek | 2013-10-23 | 1 | -2/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #5442 from owncloud/extstorage-ignoreduplicateinserts | Thomas Müller | 2013-10-23 | 2 | -14/+38 |
| |\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | Ignore duplicate inserts in file cache and mime type | ||||
| | * | | | | | | | Catch duplicate insertion errors while scanning files | Vincent Petry | 2013-10-23 | 2 | -14/+38 |
| | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When two scanning processed run at the same time, for example when scan.php and list.php were called at the same time on an external storage mountpoint, duplicate insertion errors can occurs. These errors are now logged and ignored. Since both scans are running in parallel transactions, they don't see each other's changes directly in the DB which can cause duplicate insertion errors for mime types as well, but those mime types can't be selected yet. The solution to this is to force-reload the mimetypes list after the transaction is finished. Fixes #5199 | ||||
| * | | | | | | | run first getUsersItemShared() with the owner | Bjoern Schiessle | 2013-10-23 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | update etags for user we haven't checked yet | Bjoern Schiessle | 2013-10-23 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | keep a list of users we already checked to avoid loops | Bjoern Schiessle | 2013-10-23 | 1 | -3/+3 |
| | | | | | | | | |||||
| * | | | | | | | fix infinite loop while updating etags, fix for #4365 | Bjoern Schiessle | 2013-10-23 | 1 | -2/+4 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'master' of github.com:owncloud/core | Bjoern Schiessle | 2013-10-23 | 2 | -1/+35 |
| |\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| | * | | | | | | Merge pull request #5478 from owncloud/core-logexceptionstacktrace | Thomas Müller | 2013-10-23 | 2 | -1/+35 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Expand exception stack trace in log in debug mode | ||||
| | | * | | | | | | Added $app parameter to logException | Vincent Petry | 2013-10-23 | 2 | -5/+5 |
| | | | | | | | | | |||||
| | | * | | | | | | Moved logException to OCP\Util class | Vincent Petry | 2013-10-23 | 2 | -29/+34 |
| | | | | | | | | | |||||
| | | * | | | | | | Expand exception stack trace in log in debug mode | Vincent Petry | 2013-10-22 | 1 | -1/+30 |
| | | | | | | | | | |||||
| * | | | | | | | | files_encryption: Fix getFileSize() | Markus Goetz | 2013-10-23 | 2 | -3/+38 |
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For certain file sizes, we rounded to the wrong chunk number and the returned bogus results. This should fix https://github.com/owncloud/mirall/issues/1009 Conflicts: apps/files_encryption/tests/util.php | ||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |