summaryrefslogtreecommitdiffstats
path: root/core/js
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | Make it possible to have a different color than the username for placeholderkondou2013-09-251-2/+14
* | | some small js fixesBjoern Schiessle2013-09-241-4/+5
* | | Merge branch 'master' into sharing_mail_notification_masterBjoern Schiessle2013-09-235-6/+299
|\| |
| * | Merge pull request #4896 from owncloud/sharing_allow_disable_passwordBjörn Schießle2013-09-231-1/+12
| |\ \
| | * | initialize variableBjoern Schiessle2013-09-201-0/+1
| | * | calculate correct permissions while toggle the password protectionBjoern Schiessle2013-09-201-1/+11
| | |/
| * | Merge pull request #4908 from owncloud/fix_css_selectorBart Visscher2013-09-191-1/+1
| |\ \
| | * | css selectors never have a : before []Jörn Friedrich Dreyer2013-09-191-1/+1
| * | | Merge branch 'master' into fix_3728_with_file_exists_dialogJörn Friedrich Dreyer2013-09-191-0/+13
| |\ \ \
| | * \ \ Merge pull request #4263 from owncloud/search_scrolltoJörn Friedrich Dreyer2013-09-191-0/+13
| | |\ \ \ | | | |/ / | | |/| |
| | | * | initial scrollto implementation:Jörn Friedrich Dreyer2013-09-171-0/+13
| | * | | disable avatar loading on public guest pageJörn Friedrich Dreyer2013-09-171-3/+5
| | | |/ | | |/|
| * | | use {count} instead of 'One' for more versatile translationJörn Friedrich Dreyer2013-09-191-1/+1
| * | | use n to translate titleJörn Friedrich Dreyer2013-09-191-1/+7
| * | | use 96x96 as 64x64 thumbnails in conflicts dialog, 64x64 looks very blocky .....Jörn Friedrich Dreyer2013-09-191-1/+1
| * | | fix 'event is not defined' errorJörn Friedrich Dreyer2013-09-191-1/+1
| * | | indentationJörn Friedrich Dreyer2013-09-181-43/+43
| * | | simplify conflict template handling, fix reopen after ESCJörn Friedrich Dreyer2013-09-181-13/+11
| * | | allow passing classes to buttonsJörn Friedrich Dreyer2013-09-181-0/+3
| * | | we cannot load avatar on guest pageJörn Friedrich Dreyer2013-09-171-3/+5
| * | | Merge branch 'master' into fix_3728_with_file_exists_dialogJörn Friedrich Dreyer2013-09-171-1/+10
| |\| |
| | * | add exists method to jqueryJörn Friedrich Dreyer2013-09-161-1/+10
| | |/
| * | Merge branch 'master' into fix_3728_with_file_exists_dialogJörn Friedrich Dreyer2013-09-176-28/+165
| |\|
| * | fix ESC for conflicts dialogJörn Friedrich Dreyer2013-09-081-2/+0
| * | close and destroy dialog on ESCJörn Friedrich Dreyer2013-09-081-1/+4
| * | show preview for uploading image files on conflictRobin Appelman2013-09-071-16/+71
| * | fine ie8 compatabilityJörn Friedrich Dreyer2013-09-061-6/+10
| * | fix page leaving checksJörn Friedrich Dreyer2013-09-061-5/+6
| * | completely remove dialog on cancel/continueJörn Friedrich Dreyer2013-09-061-1/+2
| * | cleanup dead codeJörn Friedrich Dreyer2013-09-051-3/+4
| * | separate uploading code from progress code, add progress capability detectionJörn Friedrich Dreyer2013-09-051-8/+5
| * | refactor dialog creationJörn Friedrich Dreyer2013-09-041-88/+46
| * | Merge branch 'master' into fix_3728_with_file_exists_dialogJörn Friedrich Dreyer2013-09-0416-84/+166
| |\ \
| * | | reduced complexity, added listing conflicts to dialogJörn Friedrich Dreyer2013-08-221-116/+189
| * | | progress fixesJörn Friedrich Dreyer2013-08-161-89/+126
| * | | change filelist ui updatesJörn Friedrich Dreyer2013-08-142-11/+7
| * | | fix whitespace, check selected files before starting uploadJörn Friedrich Dreyer2013-08-142-2/+135
* | | | Merge branch 'master' into sharing_mail_notification_masterBjoern Schiessle2013-09-166-22/+165
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge pull request #4803 from owncloud/fix-4465-add-share-user-on-enterMorris Jobke2013-09-151-2/+4
| |\ \ \
| | * | | no autoFocus if no users returnedPete McFarlane2013-09-111-1/+3
| | * | | Added autoFocus to #shareWith autocomplete optionsPete McFarlane2013-09-111-3/+3
| | | |/ | | |/|
| * | | Merge pull request #4853 from owncloud/external-shared_mimetype-iconsThomas Müller2013-09-151-5/+1
| |\ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-14 23:11:10 +0000