summaryrefslogtreecommitdiffstats
path: root/core/js
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * 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
| |/ /
* | | 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 #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