summaryrefslogtreecommitdiffstats
path: root/core/js
Commit message (Expand)AuthorAgeFilesLines
...
| * | 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
| |\ \ \
| | * | | 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
| |\ \ \ \
| | * | | | Use shorter array-conversionkondou2013-09-061-3/+1
| | * | | | Only use mimetype_list and clean up a bitkondou2013-09-051-10/+12
| | * | | | Make it possible to pass rawlist.php an JSON array, to filter by more than on...kondou2013-09-051-4/+11
| | |/ / /
| * | | | Fix double destroy on escape.Thomas Tanghus2013-09-111-1/+2
| * | | | Remove console loggingThomas Tanghus2013-09-101-1/+0
| * | | | Fix setting ocdialog options after initialization.Thomas Tanghus2013-09-101-5/+9
| |/ / /
* | | | Merge branch 'master' into sharing_mail_notification_masterBjoern Schiessle2013-09-054-32/+43
|\| | |
| * | | Merge pull request #4709 from owncloud/previews_in_ocidalogs_filepickerMorris Jobke2013-09-031-1/+5
| |\ \ \
| | * | | Add previews to OC.dialogs.filepicker(); Fix #4697kondou2013-09-031-1/+5
| * | | | Merge pull request #4707 from owncloud/use_on_instead_of_deprecated_bindChristopher2013-09-031-1/+2
| |\ \ \ \
| | * | | | use on to add event listener instead of deprecated jquery bindJörn Friedrich Dreyer2013-09-031-1/+2
| | | |/ / | | |/| |
| * | | | Merge pull request #4473 from owncloud/texteditor_polishingJörn Friedrich Dreyer2013-09-031-20/+29
| |\ \ \ \
| | * | | | refactor OC.Breadcrumbs, allow injection of container to allow rendering crum...Jörn Friedrich Dreyer2013-08-161-20/+29
| * | | | | Merge pull request #4695 from owncloud/placeholder-hslMorris Jobke2013-09-031-8/+5
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |