summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-10-27774-25383/+43641
|
* Merge pull request #5561 from owncloud/fix5401Thomas Müller2013-10-261-14/+3
|\ | | | | local user backend shall search for both username and displayname, fixes...
| * local user backend shall search for both username and displayname, fixes #5401Arthur Schiwon2013-10-251-14/+3
| |
* | Merge pull request #5562 from owncloud/fix5560Thomas Müller2013-10-261-1/+1
|\ \ | |/ |/| Fix broken users page when a username consists of digits only, fixes #55...
| * Fix broken users page when a username consists of digits only, fixes #5560Arthur Schiwon2013-10-251-1/+1
|/
* Merge pull request #5542 from owncloud/quotastream-fseektoendfixBjörn Schießle2013-10-254-3/+109
|\ | | | | Fixes for quota stream fseek
| * Added comment for clarification about fseek() call in quota.phpVincent Petry2013-10-251-0/+2
| |
| * Fixed quota stream to not wrap read-only fopen callsVincent Petry2013-10-252-1/+23
| |
| * Fixed quota stream's fseek methodVincent Petry2013-10-252-2/+84
| | | | | | | | | | | | - Added missing return statement - Added missing support for SEEK_END - Fixes #5524
* | Port PR #5457 to masterArthur Schiwon2013-10-251-4/+11
| |
* | make sure the shared ldap connection is rebound to the configured user after ↵Donald Buczek2013-10-251-1/+3
|/ | | | being used for password checking.
* Merge pull request #5532 from owncloud/ldap_fixesThomas Müller2013-10-243-12/+45
|\ | | | | Ldap fixes
| * LDAP: don't validate unconfigured (new) LDAP server configs, fixes #5518Arthur Schiwon2013-10-241-0/+15
| |
| * LDAP Wizard: always show correct Back+Continue Buttons, fixes #5520Arthur Schiwon2013-10-241-10/+28
| |
| * LDAP: when multiline values are passed as array, do not try to preg_split ↵Arthur Schiwon2013-10-241-1/+1
| | | | | | | | them. Fixes #5521
| * typo, fixes #5517Arthur Schiwon2013-10-241-1/+1
| |
* | Merge pull request #5528 from frisco82/changeUpadateNotificationThomas Müller2013-10-244-2/+17
|\ \ | | | | | | Changed update message to be more instructive
| * | Changed update message to be more instructive, changed update style to be ↵Ramiro Aparicio2013-10-244-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | less aggresive Fix br tags Improve english messages
* | | Merge pull request #5507 from owncloud/webdav-removeredirectfromindexThomas Müller2013-10-242-31/+5
|\ \ \ | | | | | | | | Remove WebDAV redirect from the root path
| * | | Removed old webdav endpointVincent Petry2013-10-241-30/+0
| | | |
| * | | Remove WebDAV redirect from the root pathVincent Petry2013-10-241-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This will prevent people mounting the root path. They should use the full webdav path instead. Fixes #4923
* | | | Merge pull request #5494 from owncloud/fixing-3593-masterThomas Müller2013-10-243-1/+96
|\ \ \ \ | | | | | | | | | | introducing new dav property {xmlns:oc="http://owncloud.org/ns}id
| * | | | - fixing namespaceThomas Müller2013-10-241-2/+4
| | | | | | | | | | | | | | | | | | | | - remove property only if present
| * | | | 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 contacts app
| * | | Fix leftcontent/right content, fixes tasks appVincent Petry2013-10-242-6/+6
|/ / / | | | | | | | | | | | | Tasks app layout was broken since the controls bar is higher now. This change should hopefully fix other apps using the same layout.
* | | Merge pull request #5402 from owncloud/fixing-5367-masterThomas Müller2013-10-242-1/+11
|\ \ \ | |_|/ |/| | fixes chunked upload
| * | 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 core
| * | | prefer logo png from theme over svg from coreJörn Friedrich Dreyer2013-10-231-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üller2013-10-2310-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 translationsJörn Friedrich Dreyer2013-10-232-10/+10
| | | | |
| * | | | Merge branch 'master' into ↵Jörn Friedrich Dreyer2013-10-2327-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 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 i18n - use trim when checking for empty file / folder name - use more verbose error descriptions
| * | | | 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 ↵Thomas Müller2013-10-223-3/+48
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prevent_user_from_creating_or_renaming_to_an_existing_filename Conflicts: apps/files/js/filelist.js
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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-placeholdershimThomas Müller2013-10-235-6/+226
|\ \ \ \ \ \ | | | | | | | | | | | | | | Ie8 placeholdershim
| * | | | | | Fixed sharing dropdown placeholders in IE8/9Vincent Petry2013-10-233-0/+220
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Added jquery.placeholder shim to handle input field placeholders in IE8/9
| * | | | | | Renamed current placeholder jquery plugin to imageplaceholderVincent Petry2013-10-232-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to prevent conflicts with jquery libs that handle text placeholders in IE8
* | | | | | | Merge pull request #5464 from owncloud/fixing-5456-masterThomas Müller2013-10-234-3/+59
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fixing 5456 master
| * | | | | | | test cases added for create/remove Shared folder and fileThomas Müller2013-10-222-0/+41
| | | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-05 04:40:46 +0000