summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5528 from frisco82/changeUpadateNotificationThomas Müller2013-10-244-2/+17
|\
| * Changed update message to be more instructive, changed update style to be les...Ramiro Aparicio2013-10-244-2/+17
* | Merge pull request #5507 from owncloud/webdav-removeredirectfromindexThomas Müller2013-10-242-31/+5
|\ \
| * | Removed old webdav endpointVincent Petry2013-10-241-30/+0
| * | Remove WebDAV redirect from the root pathVincent Petry2013-10-241-1/+5
* | | Merge pull request #5494 from owncloud/fixing-3593-masterThomas Müller2013-10-243-1/+96
|\ \ \
| * | | - fixing namespaceThomas Müller2013-10-241-2/+4
| * | | handle case where fileid is not setThomas Müller2013-10-232-4/+12
| * | | introducing new dav property {xmlns:oc="http://owncloud.org/ns}idThomas Müller2013-10-233-1/+86
| |/ /
* | | Merge pull request #5512 from owncloud/css-fixleftcontentrightcontentVincent Petry2013-10-242-6/+6
|\ \ \ | |_|/ |/| |
| * | Fix leftcontent/right content, fixes tasks appVincent Petry2013-10-242-6/+6
|/ /
* | Merge pull request #5402 from owncloud/fixing-5367-masterThomas Müller2013-10-242-1/+11
|\ \
| * | fixes #5367Thomas Müller2013-10-172-1/+11
* | | Merge pull request #5496 from owncloud/prefer_png_from_theme_over_core_svgThomas Müller2013-10-231-0/+18
|\ \ \
| * | | prefer logo png from theme over svg from coreJörn Friedrich Dreyer2013-10-231-0/+18
* | | | Merge pull request #5477 from owncloud/prevent_user_from_creating_or_renaming...Thomas Müller2013-10-2310-460/+582
|\ \ \ \
| * | | | fix translationsJörn Friedrich Dreyer2013-10-232-10/+10
| * | | | Merge branch 'master' into prevent_user_from_creating_or_renaming_to_an_exist...Jörn Friedrich Dreyer2013-10-2327-33/+111
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | use a more descriptive error message when the user tries to create '/Shared'Jörn Friedrich Dreyer2013-10-232-3/+3
| * | | | cleanup array value assignmentJörn Friedrich Dreyer2013-10-231-8/+4
| * | | | add missing ;Jörn Friedrich Dreyer2013-10-231-1/+1
| * | | | cleanup precondition checking when creating new files / foldersJörn Friedrich Dreyer2013-10-232-19/+50
| * | | | use correct filename in error result jsonJörn Friedrich Dreyer2013-10-231-1/+1
| * | | | fix message dialog titles in IE8Jörn Friedrich Dreyer2013-10-231-1/+1
| * | | | Merge branch 'master' into prevent_user_from_creating_or_renaming_to_an_exist...Thomas Müller2013-10-223-3/+48
| |\ \ \ \
| * | | | | fixing js syntax errorThomas Müller2013-10-221-2/+2
| * | | | | fixing undefined variable $newnameThomas Müller2013-10-221-1/+1
| * | | | | adding PHPDoc commentsThomas Müller2013-10-221-0/+7
| * | | | | prevent user from creating or renaming sth. to an existing filenameJörn Friedrich Dreyer2013-10-227-436/+524
* | | | | | Merge pull request #5497 from owncloud/ie8-placeholdershimThomas Müller2013-10-235-6/+226
|\ \ \ \ \ \
| * | | | | | Fixed sharing dropdown placeholders in IE8/9Vincent Petry2013-10-233-0/+220
| * | | | | | Renamed current placeholder jquery plugin to imageplaceholderVincent Petry2013-10-232-6/+6
* | | | | | | Merge pull request #5464 from owncloud/fixing-5456-masterThomas Müller2013-10-234-3/+59
|\ \ \ \ \ \ \
| * | | | | | | test cases added for create/remove Shared folder and fileThomas Müller2013-10-222-0/+41
| * | | | | | | creating and deleting of file and folder 'Shared' in root is not allowedThomas Müller2013-10-222-3/+18
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #5492 from owncloud/admin-forcesslwrongidThomas Müller2013-10-231-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fixed wrong id when reading checkbox value for force SSL settingVincent Petry2013-10-231-1/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #5435 from owncloud/share-improvementsThomas Müller2013-10-233-53/+54
|\ \ \ \ \ \ \
| * | | | | | | Fixed share dropdown checkbox wrappingVincent Petry2013-10-232-28/+43
| * | | | | | | better wording for share input field and share linkJan-Christoph Borchardt2013-10-231-2/+2
| * | | | | | | Added left padding to notCreatable messageVincent Petry2013-10-231-0/+1
| * | | | | | | improve wording of permission noticeJan-Christoph Borchardt2013-10-201-1/+1
| * | | | | | | beautify 'you dont have write permissions' notice, fix #2770Jan-Christoph Borchardt2013-10-202-1/+6
| * | | | | | | shorten string to 'notify by email', cut 'user'Jan-Christoph Borchardt2013-10-201-1/+1
| * | | | | | | remove hover hide/show stuff for share dropdown to make things more obviousJan-Christoph Borchardt2013-10-201-26/+3
| * | | | | | | bold share usernameJan-Christoph Borchardt2013-10-201-0/+1
| * | | | | | | properly align checkboxes to textJan-Christoph Borchardt2013-10-201-0/+1
| * | | | | | | more breathing space in share listJan-Christoph Borchardt2013-10-201-1/+2
* | | | | | | | beta 1Frank Karlitschek2013-10-231-2/+2
* | | | | | | | Merge pull request #5442 from owncloud/extstorage-ignoreduplicateinsertsThomas Müller2013-10-232-14/+38
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |