summaryrefslogtreecommitdiffstats
path: root/core/js
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4618 from owncloud/visualize-jsMorris Jobke2013-08-281-0/+65
|\ | | | | visualize
| * 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 #4589
| * 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
|\ | | | | Fix octemplate string escaping.
| * 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
|\ \ | | | | | | Fix some JSLint warnings
| * \ Merge branch 'master' into fix_jslint_kondoukondou2013-08-183-51/+142
| |\ \ | | | | | | | | | | | | | | | | Conflicts: apps/files/js/file-upload.js
| * | | 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 newlines at the end of files
| * | | | 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
| | | | | | | | | | | | | | | Having the cancel button in the bottom right corner was a bit confusing. It's useless anyways, since there's a X in the top right.
* | | Merge pull request #4113 from owncloud/delete-fixJan-Christoph Borchardt2013-08-151-1/+0
|\ \ \ | | | | | | | | Delete icon fix
| * \ \ Merge branch 'master' into delete-fixThomas Müller2013-07-232-11/+6
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: core/css/styles.css
| * | | | remove unnecessary tipsy for Files deleteJan-Christoph Borchardt2013-07-181-1/+0
| | | | |
* | | | | Merge pull request #4354 from ↵Thomas Müller2013-08-151-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | owncloud/fix_2711_shared_icon_disappears_on_firefox fix #2711 using a custom event, also use css selectors over filterAttr
| * | | | | 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 translations
| * | | | | 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
|\ \ \ \ \ | |/ / / / |/| | | | Plural translations
| * | | | 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
| |_|_|/ |/| | | | | | | | | | | the topbar
* | | | fixes #4026Thomas Müller2013-07-301-9/+21
| | | |
* | | | show tablespace only for oracle, hide dbhost for sqlite, remove unnecessary ↵Jörn Friedrich Dreyer2013-07-241-16/+10
| | | | | | | | | | | | | | | | js & html ids
* | | | 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
| | |/ | |/| | | | | | | wrong, sorry.
* / | new admin setting added which allows to turn off anonymous uploadsThomas Müller2013-07-121-1/+6
|/ /
* | - eventsource.php: in case of potential CSRF attack we send an error message ↵Thomas Müller2013-07-112-2/+9
| | | | | | | | | | | | | | | | from the EventSource to the browser - eventsource.js: handle undefined data on event - update.js: in case of error we close the event source - advise the user to reload the page - update.php: EventSource initialization is now done before we enter the maintenance mode in order to allow browser reload in case of possible CSRF attack
* | Merge pull request #3920 from owncloud/Fixing_search_ie8Jörn Friedrich Dreyer2013-07-091-2/+6
|\ \ | |/ |/| [ie8] Fix lazy CSS loading and missing borders in search dropdown
| * Fix lazy styles loading in IE8Victor Dubiniuk2013-07-021-2/+6
| |
* | fixing === and identThomas Müller2013-07-051-6/+6
| |
* | Merge branch 'master' into fixing-3934-masterThomas Müller2013-07-051-5/+5
|\ \ | | | | | | | | | | | | Conflicts: core/js/share.js