Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4618 from owncloud/visualize-js | Morris Jobke | 2013-08-28 | 1 | -0/+65 |
|\ | | | | | visualize | ||||
| * | fixing typo | Thomas Müller | 2013-08-28 | 1 | -1/+1 |
| | | |||||
| * | calculate fontsize and line-height | Morris Jobke | 2013-08-28 | 1 | -2/+7 |
| | | |||||
| * | reviewers comments | Morris Jobke | 2013-08-28 | 1 | -6/+14 |
| | | |||||
| * | add visualize | Morris Jobke | 2013-08-28 | 1 | -0/+52 |
| | | |||||
* | | Merge pull request #4627 from owncloud/trashbin-tipsy | Morris Jobke | 2013-08-28 | 1 | -0/+1 |
|\ \ | |/ |/| | change orientation for delete tooltip to left, fix #4589 | ||||
| * | change orientation for delete tooltip to left, fix #4589 | Jan-Christoph Borchardt | 2013-08-28 | 1 | -0/+1 |
| | | |||||
* | | remove show password toggle from log in page, ref #4577 #4580 | Jan-Christoph Borchardt | 2013-08-28 | 1 | -1/+0 |
|/ | |||||
* | Merge pull request #4434 from owncloud/fix_octemplate_escaping | Thomas Tanghus | 2013-08-28 | 1 | -4/+5 |
|\ | | | | | Fix octemplate string escaping. | ||||
| * | Cache Object.keys(this.vars) | Thomas Tanghus | 2013-08-28 | 1 | -3/+4 |
| | | |||||
| * | Fix octemplate string escaping. | Thomas Tanghus | 2013-08-14 | 1 | -4/+4 |
| | | |||||
* | | Merge pull request #4262 from owncloud/fix_jslint_kondou | Christopher | 2013-08-20 | 9 | -38/+52 |
|\ \ | | | | | | | Fix some JSLint warnings | ||||
| * \ | Merge branch 'master' into fix_jslint_kondou | kondou | 2013-08-18 | 3 | -51/+142 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/file-upload.js | ||||
| * | | | Fix a syntax error & have if-conds in an own line | kondou | 2013-08-01 | 1 | -7/+21 |
| | | | | |||||
| * | | | Fix some JSLint warnings | kondou | 2013-07-31 | 9 | -38/+38 |
| | | | | |||||
* | | | | Merge pull request #4497 from owncloud/newlines_at_eof_kondou | Kondou | 2013-08-18 | 4 | -4/+4 |
|\ \ \ \ | | | | | | | | | | | Add newlines at the end of files | ||||
| * | | | | Add _many_ newlines at the end of files | kondou | 2013-08-18 | 4 | -4/+4 |
| | |/ / | |/| | | |||||
* | | | | Fixed inconsistent spacing. | Owen Winkler | 2013-08-18 | 1 | -1/+1 |
| | | | | |||||
* | | | | fixing undefined js error | Thomas Müller | 2013-08-17 | 1 | -1/+1 |
|/ / / | |||||
* | | | Remove cancel button from filepicker | kondou | 2013-08-17 | 1 | -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-fix | Jan-Christoph Borchardt | 2013-08-15 | 1 | -1/+0 |
|\ \ \ | | | | | | | | | Delete icon fix | ||||
| * \ \ | Merge branch 'master' into delete-fix | Thomas Müller | 2013-07-23 | 2 | -11/+6 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: core/css/styles.css | ||||
| * | | | | remove unnecessary tipsy for Files delete | Jan-Christoph Borchardt | 2013-07-18 | 1 | -1/+0 |
| | | | | | |||||
* | | | | | Merge pull request #4354 from ↵ | Thomas Müller | 2013-08-15 | 1 | -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 filterAttr | Jörn Friedrich Dreyer | 2013-08-08 | 1 | -3/+3 |
| | | | | | | |||||
* | | | | | | remove jPlayer css rules from core css file | Morris Jobke | 2013-08-15 | 1 | -2/+0 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Merge pull request #4376 from owncloud/use_plurals | Jörn Friedrich Dreyer | 2013-08-14 | 1 | -6/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | Use plural translations | ||||
| * | | | | | Use plural translations | kondou | 2013-08-09 | 1 | -6/+4 |
| | | | | | | |||||
* | | | | | | comment clarification | Jörn Friedrich Dreyer | 2013-08-14 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | use edit & reshare permission as default | Jörn Friedrich Dreyer | 2013-08-13 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | add PERMISSIONS_ALL summary | Jörn Friedrich Dreyer | 2013-08-13 | 1 | -0/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #4271 from owncloud/plural_translations | Owen Winkler | 2013-08-08 | 1 | -32/+93 |
|\ \ \ \ \ | |/ / / / |/| | | | | Plural translations | ||||
| * | | | | adding proper evaluation of plural form - uses LGPL licensed code of jsgettext | Thomas Müller | 2013-08-03 | 1 | -17/+62 |
| | | | | | |||||
| * | | | | Add multiple plural forms to the php part | Jakob Sack | 2013-07-16 | 1 | -6/+5 |
| | | | | | |||||
| * | | | | Partly integrate plural translations into js | Jakob Sack | 2013-07-07 | 1 | -19/+36 |
| | | | | | |||||
* | | | | | use fixed OC.Breadcrumb.push() | Jörn Friedrich Dreyer | 2013-08-02 | 1 | -56/+32 |
| | | | | | |||||
* | | | | | add OC.Breadcrumb.show(dir, filename, link) | Jörn Friedrich Dreyer | 2013-08-02 | 1 | -0/+62 |
| | | | | | |||||
* | | | | | make sure the first breadcrumb item is inserted before any other elements in ↵ | Robin Appelman | 2013-08-01 | 1 | -1/+1 |
| |_|_|/ |/| | | | | | | | | | | | the topbar | ||||
* | | | | fixes #4026 | Thomas Müller | 2013-07-30 | 1 | -9/+21 |
| | | | | |||||
* | | | | show tablespace only for oracle, hide dbhost for sqlite, remove unnecessary ↵ | Jörn Friedrich Dreyer | 2013-07-24 | 1 | -16/+10 |
| | | | | | | | | | | | | | | | | js & html ids | ||||
* | | | | Create an array entry before filling it | Victor Dubiniuk | 2013-07-23 | 1 | -0/+1 |
| | | | | |||||
* | | | | Show generic error when there is no error | Victor Dubiniuk | 2013-07-22 | 1 | -1/+6 |
| |_|/ |/| | | |||||
* | | | Merge branch 'master' into disable-anon-upload-master | Thomas Müller | 2013-07-22 | 1 | -10/+0 |
|\ \ \ | |||||
| * | | | finally remove the file size obfuscation as it had more disadvantages. I was ↵ | Jan-Christoph Borchardt | 2013-07-18 | 1 | -10/+0 |
| | |/ | |/| | | | | | | | wrong, sorry. | ||||
* / | | new admin setting added which allows to turn off anonymous uploads | Thomas Müller | 2013-07-12 | 1 | -1/+6 |
|/ / | |||||
* | | - eventsource.php: in case of potential CSRF attack we send an error message ↵ | Thomas Müller | 2013-07-11 | 2 | -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_ie8 | Jörn Friedrich Dreyer | 2013-07-09 | 1 | -2/+6 |
|\ \ | |/ |/| | [ie8] Fix lazy CSS loading and missing borders in search dropdown | ||||
| * | Fix lazy styles loading in IE8 | Victor Dubiniuk | 2013-07-02 | 1 | -2/+6 |
| | | |||||
* | | fixing === and ident | Thomas Müller | 2013-07-05 | 1 | -6/+6 |
| | | |||||
* | | Merge branch 'master' into fixing-3934-master | Thomas Müller | 2013-07-05 | 1 | -5/+5 |
|\ \ | | | | | | | | | | | | | Conflicts: core/js/share.js |