summaryrefslogtreecommitdiffstats
path: root/core/js
Commit message (Expand)AuthorAgeFilesLines
...
* | | 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
|\| |
| * | 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
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | placeholder.js: fix typoJan-Christoph Borchardt2013-09-021-1/+1
| | * | | placeholder.js: adjust saturation and lightness valuesJan-Christoph Borchardt2013-09-021-2/+2
| | * | | RGB -> HSLMorris Jobke2013-09-021-7/+4
| | | |/ | | |/|
| * / | Use provided mimetype on open. Fix #4696Thomas Tanghus2013-09-021-2/+2
| |/ /
| * | Merge pull request #4618 from owncloud/visualize-jsMorris Jobke2013-08-281-0/+65
| |\ \
| | * | fixing typoThomas Müller2013-08-281-1/+1
| | * | calculate fontsize and line-heightMorris Jobke2013-08-281-2/+7
| | * | reviewers commentsMorris Jobke2013-08-281-6/+14
| | * | add visualizeMorris Jobke2013-08-281-0/+52
| * | | Merge pull request #4627 from owncloud/trashbin-tipsyMorris Jobke2013-08-281-0/+1
| |\ \ \ | | |/ / | |/| |
| | * | change orientation for delete tooltip to left, fix #4589Jan-Christoph Borchardt2013-08-281-0/+1
| * | | remove show password toggle from log in page, ref #4577 #4580Jan-Christoph Borchardt2013-08-281-1/+0
| |/ /
| * | Merge pull request #4434 from owncloud/fix_octemplate_escapingThomas Tanghus2013-08-281-4/+5
| |\ \
| | * | Cache Object.keys(this.vars)Thomas Tanghus2013-08-281-3/+4
| | * | Fix octemplate string escaping.Thomas Tanghus2013-08-141-4/+4
| * | | Merge pull request #4262 from owncloud/fix_jslint_kondouChristopher2013-08-209-38/+52
| |\ \ \
| | * \ \ Merge branch 'master' into fix_jslint_kondoukondou2013-08-183-51/+142
| | |\ \ \
| | * | | | Fix a syntax error & have if-conds in an own linekondou2013-08-011-7/+21
| | * | | | Fix some JSLint warningskondou2013-07-319-38/+38
| * | | | | Merge pull request #4497 from owncloud/newlines_at_eof_kondouKondou2013-08-184-4/+4
| |\ \ \ \ \
| | * | | | | Add _many_ newlines at the end of fileskondou2013-08-184-4/+4
| | | |/ / / | | |/| | |
| * | | | | Fixed inconsistent spacing.Owen Winkler2013-08-181-1/+1
| * | | | | fixing undefined js errorThomas Müller2013-08-171-1/+1
| |/ / / /
| * | | / Remove cancel button from filepickerkondou2013-08-171-4/+0
| | |_|/ | |/| |
| * | | Merge pull request #4113 from owncloud/delete-fixJan-Christoph Borchardt2013-08-151-1/+0
| |\ \ \
| | * \ \ Merge branch 'master' into delete-fixThomas Müller2013-07-232-11/+6
| | |\ \ \
| | * | | | remove unnecessary tipsy for Files deleteJan-Christoph Borchardt2013-07-181-1/+0
| * | | | | Merge pull request #4354 from owncloud/fix_2711_shared_icon_disappears_on_fir...Thomas Müller2013-08-151-3/+3
| |\ \ \ \ \
| | * | | | | fix #2711 using a custom event, also use css selectors over filterAttrJörn Friedrich Dreyer2013-08-081-3/+3
| * | | | | | remove jPlayer css rules from core css fileMorris Jobke2013-08-151-2/+0
| | |_|_|_|/ | |/| | | |
| * | | | | Merge pull request #4376 from owncloud/use_pluralsJörn Friedrich Dreyer2013-08-141-6/+4
| |\ \ \ \ \
| | * | | | | Use plural translationskondou2013-08-091-6/+4
* | | | | | | 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