Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #5528 from frisco82/changeUpadateNotification | Thomas Müller | 2013-10-24 | 4 | -2/+17 |
|\ | |||||
| * | Changed update message to be more instructive, changed update style to be les... | Ramiro Aparicio | 2013-10-24 | 4 | -2/+17 |
* | | Merge pull request #5507 from owncloud/webdav-removeredirectfromindex | Thomas Müller | 2013-10-24 | 2 | -31/+5 |
|\ \ | |||||
| * | | Removed old webdav endpoint | Vincent Petry | 2013-10-24 | 1 | -30/+0 |
| * | | Remove WebDAV redirect from the root path | Vincent Petry | 2013-10-24 | 1 | -1/+5 |
* | | | Merge pull request #5494 from owncloud/fixing-3593-master | Thomas Müller | 2013-10-24 | 3 | -1/+96 |
|\ \ \ | |||||
| * | | | - fixing namespace | Thomas Müller | 2013-10-24 | 1 | -2/+4 |
| * | | | handle case where fileid is not set | Thomas Müller | 2013-10-23 | 2 | -4/+12 |
| * | | | introducing new dav property {xmlns:oc="http://owncloud.org/ns}id | Thomas Müller | 2013-10-23 | 3 | -1/+86 |
| |/ / | |||||
* | | | Merge pull request #5512 from owncloud/css-fixleftcontentrightcontent | Vincent Petry | 2013-10-24 | 2 | -6/+6 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Fix leftcontent/right content, fixes tasks app | Vincent Petry | 2013-10-24 | 2 | -6/+6 |
|/ / | |||||
* | | Merge pull request #5402 from owncloud/fixing-5367-master | Thomas Müller | 2013-10-24 | 2 | -1/+11 |
|\ \ | |||||
| * | | 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 | Jörn Friedrich Dreyer | 2013-10-23 | 1 | -0/+18 |
* | | | | Merge pull request #5477 from owncloud/prevent_user_from_creating_or_renaming... | Thomas Müller | 2013-10-23 | 10 | -460/+582 |
|\ \ \ \ | |||||
| * | | | | fix translations | Jörn Friedrich Dreyer | 2013-10-23 | 2 | -10/+10 |
| * | | | | Merge branch 'master' into prevent_user_from_creating_or_renaming_to_an_exist... | Jörn Friedrich Dreyer | 2013-10-23 | 27 | -33/+111 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| * | | | | 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 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 prevent_user_from_creating_or_renaming_to_an_exist... | Thomas Müller | 2013-10-22 | 3 | -3/+48 |
| |\ \ \ \ | |||||
| * | | | | | 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 |
* | | | | | | Merge pull request #5497 from owncloud/ie8-placeholdershim | Thomas Müller | 2013-10-23 | 5 | -6/+226 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fixed sharing dropdown placeholders in IE8/9 | Vincent Petry | 2013-10-23 | 3 | -0/+220 |
| * | | | | | | Renamed current placeholder jquery plugin to imageplaceholder | Vincent Petry | 2013-10-23 | 2 | -6/+6 |
* | | | | | | | Merge pull request #5464 from owncloud/fixing-5456-master | Thomas Müller | 2013-10-23 | 4 | -3/+59 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | 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 | Vincent Petry | 2013-10-23 | 1 | -1/+1 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #5435 from owncloud/share-improvements | Thomas Müller | 2013-10-23 | 3 | -53/+54 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fixed share dropdown checkbox wrapping | Vincent Petry | 2013-10-23 | 2 | -28/+43 |
| * | | | | | | | 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 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | |