summaryrefslogtreecommitdiffstats
path: root/core/js
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | comment clarificationJörn Friedrich Dreyer2013-08-141-1/+1
* | | | | | use edit & reshare permission as defaultJörn Friedrich Dreyer2013-08-131-2/+2
* | | | | | add PERMISSIONS_ALL summaryJörn Friedrich Dreyer2013-08-131-0/+1
|/ / / / /
* | | | | Merge pull request #4271 from owncloud/plural_translationsOwen Winkler2013-08-081-32/+93
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | adding proper evaluation of plural form - uses LGPL licensed code of jsgettextThomas Müller2013-08-031-17/+62
| * | | | Add multiple plural forms to the php partJakob Sack2013-07-161-6/+5
| * | | | Partly integrate plural translations into jsJakob Sack2013-07-071-19/+36
* | | | | use fixed OC.Breadcrumb.push()Jörn Friedrich Dreyer2013-08-021-56/+32
* | | | | add OC.Breadcrumb.show(dir, filename, link)Jörn Friedrich Dreyer2013-08-021-0/+62
* | | | | make sure the first breadcrumb item is inserted before any other elements in ...Robin Appelman2013-08-011-1/+1
| |_|_|/ |/| | |
* | | | fixes #4026Thomas Müller2013-07-301-9/+21
* | | | show tablespace only for oracle, hide dbhost for sqlite, remove unnecessary j...Jörn Friedrich Dreyer2013-07-241-16/+10
* | | | Create an array entry before filling itVictor Dubiniuk2013-07-231-0/+1
* | | | Show generic error when there is no errorVictor Dubiniuk2013-07-221-1/+6
| |_|/ |/| |
* | | Merge branch 'master' into disable-anon-upload-masterThomas Müller2013-07-221-10/+0
|\ \ \
| * | | finally remove the file size obfuscation as it had more disadvantages. I was ...Jan-Christoph Borchardt2013-07-181-10/+0
| | |/ | |/|
* / | new admin setting added which allows to turn off anonymous uploadsThomas Müller2013-07-121-1/+6
|/ /