aboutsummaryrefslogtreecommitdiffstats
path: root/core/js
Commit message (Expand)AuthorAgeFilesLines
* 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
* | 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
|\|
| * 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
| |\ \
| | * | Use external and shared icons in OC.Dialogs.filepicker()kondou2013-09-141-5/+1
| * | | Merge pull request #4506 from owncloud/oc_avatarsBernhard Posselt2013-09-142-0/+92
| |\ \ \
| | * | | Merge branch 'master' into oc_avatarskondou2013-09-122-7/+18
| | |\| |
| | * | | Clean up avatars and preliminary use JSON->rawlist.phpkondou2013-09-051-10/+10
| | * | | Have login-checks and CSRF checkskondou2013-09-051-1/+1
| | * | | Merge branch 'master' into oc_avatarskondou2013-09-044-32/+43
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Fix unwanted caching in IE8kondou2013-09-031-3/+11
| | * | | Don't use HTML5 <header> to support avatars in IE8kondou2013-09-031-1/+1
| | * | | Better naming than "ava" & "data", cache timeout, use OC.Router.registerLoade...kondou2013-09-012-9/+11
| | * | | Add a description for $.avatar() and remove TODOs @raghunayyar fixedkondou2013-08-312-2/+28
| | * | | Deal with OC.Router.generate()kondou2013-08-311-4/+4
| | * | | Sanitize displayname, respect data @ $element, fix routename, clean after cro...kondou2013-08-311-2/+11
| | * | | Finish cropper, Get rid of TODOs, Improve \OCP\Avatar and "fix" unitestskondou2013-08-302-14/+14
| | * | | Use defaultavatarskondou2013-08-292-0/+47
| * | | | Merge pull request #4501 from owncloud/ajaxfilelistThomas Müller2013-09-141-0/+32
| |\ \ \ \
| | * | | | Ajax calls for "files" and "files_trashbin" appsVincent Petry2013-09-131-0/+32
| | | |_|/ | | |/| |
| * | | | Merge pull request #4806 from owncloud/oc-dialogs-pageleaveThomas Tanghus2013-09-141-8/+18
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Save two linesThomas Tanghus2013-09-111-3/+1
| | * | | Remove test error :PThomas Tanghus2013-09-111-1/+1
| | * | | Don't popup meaningless alerts when dialog called on page leaveThomas Tanghus2013-09-111-9/+21
| | | |/ | | |/|
| * | | Merge pull request #4735 from owncloud/multiple_mimetypes_rawlistThomas Tanghus2013-09-111-1/+8
| |\ \ \