summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5396 from owncloud/fix-sharing-codeMorris Jobke2013-10-292-10/+25
|\ | | | | Fix sharing error message - id -> file name
| * also add new parameter to function callsMorris Jobke2013-10-291-4/+4
| |
| * pass the name of the item source from the browser to the server - no need to ↵Thomas Müller2013-10-232-6/+21
| | | | | | | | get the data via complicated db queries
* | [tx-robot] updated from transifexJenkins for ownCloud2013-10-2913-13/+134
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-10-275-5/+46
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-10-2765-212/+158
| |
* | Fix broken users page when a username consists of digits only, fixes #5560Arthur Schiwon2013-10-251-1/+1
| |
* | Merge pull request #5528 from frisco82/changeUpadateNotificationThomas Müller2013-10-243-0/+13
|\ \ | | | | | | Changed update message to be more instructive
| * | Changed update message to be more instructive, changed update style to be ↵Ramiro Aparicio2013-10-243-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | less aggresive Fix br tags Improve english messages
* | | Fix leftcontent/right content, fixes tasks appVincent Petry2013-10-241-2/+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 #5477 from ↵Thomas Müller2013-10-233-3/+3
|\ \ | | | | | | | | | | | | owncloud/prevent_user_from_creating_or_renaming_to_an_existing_filename prevent user from creating or renaming sth. to an existing filename
| * | add missing ;Jörn Friedrich Dreyer2013-10-231-1/+1
| | |
| * | fix message dialog titles in IE8Jörn Friedrich Dreyer2013-10-231-1/+1
| | |
| * | prevent user from creating or renaming sth. to an existing filenameJörn Friedrich Dreyer2013-10-221-1/+1
| |/ | | | | | | | | | | | | | | - 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-234-6/+225
|\ \ | | | | | | Ie8 placeholdershim
| * | Fixed sharing dropdown placeholders in IE8/9Vincent Petry2013-10-232-0/+219
| | | | | | | | | | | | 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 #5435 from owncloud/share-improvementsThomas Müller2013-10-232-52/+53
|\ \ | |/ |/| Share improvements
| * Fixed share dropdown checkbox wrappingVincent Petry2013-10-232-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 linkJan-Christoph Borchardt2013-10-231-2/+2
| |
| * Added left padding to notCreatable messageVincent Petry2013-10-231-0/+1
| |
| * beautify 'you dont have write permissions' notice, fix #2770Jan-Christoph Borchardt2013-10-201-0/+5
| |
| * 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
| |
* | Merge pull request #5455 from owncloud/fixing-2423-masterThomas Müller2013-10-221-1/+1
|\ \ | | | | | | introduce link_to_docs() and migrate links
| * | introduce link_to_docs() and migrate linksThomas Müller2013-10-211-1/+1
| | |
* | | Merge pull request #5446 from frisco82/fixNotifyUserFrank Karlitschek2013-10-212-12/+11
|\ \ \ | | | | | | | | Fix notify user checkbox
| * | | fix notify user, and made js more resiliant to changesRamiro Aparicio2013-10-212-12/+11
| | | |
* | | | Merge pull request #5120 from frisco82/sendEmailJSVincent Petry2013-10-211-4/+4
|\ \ \ \ | | | | | | | | | | Fix disabled status after sending a share link email
| * | | | Fix disabled status after sending the emailRamiro Aparicio2013-10-041-4/+4
| | | | |
* | | | | Merge pull request #5444 from frisco82/fixDisplayGroupVincent Petry2013-10-212-8/+11
|\ \ \ \ \ | | | | | | | | | | | | Fix display name for user after sharing
| * | | | | fix user displayName not being shown after add, added class for improved ↵Ramiro Aparicio2013-10-212-8/+11
| | |/ / / | |/| | | | | | | | | | | | | styling, fix strong for groups when english is not being used
* | | | | Merge pull request #5441 from owncloud/files-sharewithlinkasnormaluserfixVincent Petry2013-10-211-12/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | Fixed share with link checkbox missing as regular user
| * | | | Fixed share with link checkbox missing as regular userVincent Petry2013-10-211-12/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of loading the app config setting "shareapi_allow_links" using a synchronous ajax call that fails when the user is not an admin, this fix puts the flag directly in the template so it doesn't need to be loaded afterwards. Fixes #5440
* / / / [tx-robot] updated from transifexJenkins for ownCloud2013-10-211-0/+5
|/ / /
* | | Merge pull request #5200 from owncloud/ie8-warning-fixFrank Karlitschek2013-10-201-0/+5
|\ \ \ | |_|/ |/| | Fix warning box in IE8
| * | Fix warning box in IE8Morris Jobke2013-10-161-0/+5
| | | | | | | | | | | | * simulates a black transparent background on a blue pane
* | | remove superfluous input hover color changeJan-Christoph Borchardt2013-10-201-1/+1
| | |
* | | input field background size to white, fix input fields seeming disabled, fix ↵Jan-Christoph Borchardt2013-10-201-1/+3
| | | | | | | | | | | | #5168
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-196-11/+108
| | |
* | | Merge pull request #5338 from frisco82/fixGroupDisplayMorris Jobke2013-10-181-1/+4
|\ \ \ | | | | | | | | Show (group) after groups in share dropdown
| * | | Show (group) after groups in share dropdownRamiro Aparicio2013-10-141-1/+4
| | | |
* | | | Merge pull request #5403 from owncloud/fix-breadcrumbsJan-Christoph Borchardt2013-10-181-1/+2
|\ \ \ \ | | | | | | | | | | correctly position ... overflow in breadcrumbs, fix #5158
| * | | | correctly position ... overflow in breadcrumbs, fix #5158Jan-Christoph Borchardt2013-10-171-1/+2
| | | | |
* | | | | readability: single line -> multiple linesMorris Jobke2013-10-181-4/+10
| | | | |
* | | | | Fix accidental deletion of ifMichael Gapczynski2013-10-181-0/+1
| | | | |
* | | | | Don't show links option in dropdown if disabledMichael Gapczynski2013-10-181-1/+6
|/ / / /