aboutsummaryrefslogtreecommitdiffstats
path: root/core/js
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5477 from owncloud/prevent_user_from_creating_or_renaming...Thomas Müller2013-10-232-2/+2
|\
| * add missing ;Jö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
* | Merge pull request #5497 from owncloud/ie8-placeholdershimThomas Müller2013-10-234-6/+225
|\ \
| * | Fixed sharing dropdown placeholders in IE8/9Vincent Petry2013-10-232-0/+219
| * | Renamed current placeholder jquery plugin to imageplaceholderVincent Petry2013-10-232-6/+6
| |/
* | Merge pull request #5435 from owncloud/share-improvementsThomas Müller2013-10-231-36/+18
|\ \ | |/ |/|
| * Fixed share dropdown checkbox wrappingVincent Petry2013-10-231-10/+15
| * better wording for share input field and share linkJan-Christoph Borchardt2013-10-231-2/+2
| * 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
* | Merge pull request #5446 from frisco82/fixNotifyUserFrank Karlitschek2013-10-211-11/+10
|\ \
| * | fix notify user, and made js more resiliant to changesRamiro Aparicio2013-10-211-11/+10
| |/
* | Merge pull request #5120 from frisco82/sendEmailJSVincent Petry2013-10-211-4/+4
|\ \
| * | Fix disabled status after sending the emailRamiro Aparicio2013-10-041-4/+4
* | | Merge pull request #5444 from frisco82/fixDisplayGroupVincent Petry2013-10-211-5/+7
|\ \ \
| * | | fix user displayName not being shown after add, added class for improved styl...Ramiro Aparicio2013-10-211-5/+7
| | |/ | |/|
* / | Fixed share with link checkbox missing as regular userVincent Petry2013-10-211-12/+1
|/ /
* | Merge pull request #5338 from frisco82/fixGroupDisplayMorris Jobke2013-10-181-1/+4
|\ \
| * | Show (group) after groups in share dropdownRamiro Aparicio2013-10-141-1/+4
* | | 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
* | | Added missing var in share.jsVincent Petry2013-10-171-0/+1
* | | Fixed sharing status update for new/uploaded filesVincent Petry2013-10-171-39/+57
* | | Merge pull request #5262 from owncloud/files-ie8-conflictdialogbrokenfixMorris Jobke2013-10-161-1/+1
|\ \ \
| * | | Fixed conflict dialog in IE8Vincent Petry2013-10-101-1/+1
* | | | Merge pull request #5295 from owncloud/show-eye-in-personalRaghu Nayyar2013-10-152-10/+6
|\ \ \ \ | |_|/ / |/| | |
| * | | Removes Bogus showpassword js. thx @PVince81raghunayyar2013-10-151-3/+1
| * | | Should Display PasswordToggle Eye Everywhere.raghunayyar2013-10-151-7/+1
| * | | Shows The Eye permanently in the Confirm Password field in Personal Settings ...raghunayyar2013-10-121-1/+5
* | | | Improve expand/collapse logicVictor Dubiniuk2013-10-111-16/+13
|/ / /
* | | Merge pull request #5133 from owncloud/js_vcategories_to_tagsThomas Tanghus2013-10-113-249/+353
|\ \ \ | |/ / |/| |
| * | It's 'status', not 'result'!Thomas Tanghus2013-10-041-4/+4
| * | Remove obsolete files.Thomas Tanghus2013-10-042-249/+0
| * | JS version of the OCP\ITags interfaceThomas Tanghus2013-10-041-0/+353
| |/
* | Merge pull request #4921 from owncloud/file_conflicts_dialog_fixesVicDeo2013-10-071-1/+1
|\ \
| * | use correct property for mimetype of existing filesJörn Friedrich Dreyer2013-10-071-1/+1
* | | Prevent share dropdown to close too early with autocompleteVincent Petry2013-10-071-1/+1
* | | Fixed label for sharing notification to be clickableVincent Petry2013-10-071-1/+1
* | | Prevent scroll up when click on links in sharing dropdownVincent Petry2013-10-071-0/+2
|/ /
* | Allow "Finishing..." button on setup page to be translated.ringmaster2013-10-041-1/+1
* | Merge branch 'master' into sharing_mail_notification_masterBjoern Schiessle2013-10-042-6/+16
|\ \
| * | Hide defaultavatar in #header and don't darken proper avatars in #headerkondou2013-10-042-6/+16
| |/
* | Merge branch 'master' into sharing_mail_notification_masterBjoern Schiessle2013-10-023-5/+20
|\|
| * Base defaultavatar text on displaynamekondou2013-09-281-1/+5
| * Merge pull request #4887 from owncloud/sharing_disable_public_uploadBjörn Schießle2013-09-261-2/+2
| |\
| | * we can leave the loop if the permission of the link share was checkedBjoern Schiessle2013-09-171-3/+1
| | * check only permission from link-share to decide if public upload is enabled o...Bjoern Schiessle2013-09-171-1/+3
| * | Shorten optional text-argument processingkondou2013-09-251-3/+2