summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3576 from owncloud/jquery.multiselect-1.13Thomas Tanghus2013-06-272-54/+101
|\ | | | | Update to jquery.multiselect 1.13
| * Forgot the css.Thomas Tanghus2013-06-041-1/+1
| |
| * Update to jquery.multiselect 1.13Thomas Tanghus2013-06-021-53/+100
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-06-272-27/+33
| |
* | move javascript variables 'oc_current_user' and 'oc_requesttoken' to js.js - ↵Thomas Mueller2013-06-262-3/+4
| | | | | | | | fixes #3853
* | [tx-robot] updated from transifexJenkins for ownCloud2013-06-263-31/+40
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-06-253-1/+21
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-06-231-0/+1
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-06-219-0/+23
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-06-2011-12/+13
| |
* | fixed enghlish sentence, thanks to @MTGapBjörn Schießle2013-06-191-1/+1
| |
* | fix lost password page, don't show checkbox is encryption is not enabledBjörn Schießle2013-06-192-6/+6
| |
* | Merge pull request #3765 from owncloud/hide-logo-claimFrank Karlitschek2013-06-182-2/+2
|\ \ | | | | | | hide the logo claim in case the theme is not loaded
| * | hide the logo claim in case the theme is not loadedJan-Christoph Borchardt2013-06-172-2/+2
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-181-0/+2
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2013-06-173-14/+27
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-06-1629-1/+50
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-06-1559-192/+48
| |
* | remove » and « from the text mail because they will be escapedThomas Mueller2013-06-141-1/+1
| |
* | Do no translate "ownCloud - "Stephan Arts2013-06-142-4/+4
| |
* | Use templates to theme share e-mails (#3683)Stephan Arts2013-06-144-9/+56
| |
* | Merge pull request #3726 from owncloud/remove-outlinesJan-Christoph Borchardt2013-06-141-0/+7
|\ \ | | | | | | remove dotted outlines in Firefox, fix #3712
| * | remove dotted outlines in Firefox, fix #3712Jan-Christoph Borchardt2013-06-141-0/+7
| | |
* | | Merge branch 'master' into move-maint-startThomas Mueller2013-06-14192-22043/+1256
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: lib/util.php
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-1462-65/+8
| |/ /
| * | Merge pull request #3687 from owncloud/template_updatesBjörn Schießle2013-06-133-7/+24
| |\ \ | | | | | | | | Make templates aware of different owncloud editions
| | * | improved footerBjörn Schießle2013-06-131-1/+2
| | | |
| | * | add logo-claimBjörn Schießle2013-06-122-1/+6
| | | |
| | * | keep all strings in one place to make it easier to change themBjörn Schießle2013-06-123-7/+6
| | | |
| | * | make footer aware of ownCloud editionsBjörn Schießle2013-06-121-2/+7
| | | |
| | * | mage page title aware of ownCloud editionBjörn Schießle2013-06-123-4/+11
| | | |
| * | | Merge branch 'master' into files_encryption_check_private_keyBjörn Schießle2013-06-133-77/+121
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/appinfo/app.php apps/files_encryption/lib/util.php
| | * \ \ Merge pull request #3679 from owncloud/multiselect-fixesThomas Tanghus2013-06-122-74/+95
| | |\ \ \ | | | |/ / | | |/| | Multiselect fixes
| | | * | multiselect: up min-width of group multiselect to 150pxJan-Christoph Borchardt2013-06-111-1/+1
| | | | |
| | | * | multiselect: fixed 'add group' interface a bitJan-Christoph Borchardt2013-06-112-4/+12
| | | | |
| | | * | multiselect: more breathing space for entriesJan-Christoph Borchardt2013-06-111-4/+13
| | | | |
| | | * | multiselect: drop shadow for better focusJan-Christoph Borchardt2013-06-111-0/+3
| | | | |
| | | * | multiselect: do not cut off group namesJan-Christoph Borchardt2013-06-111-0/+1
| | | | |
| | | * | checkstyle: add space after colonJan-Christoph Borchardt2013-06-111-46/+46
| | | | |
| | | * | remove leading spacesJan-Christoph Borchardt2013-06-111-66/+66
| | | | |
| | * | | feedback for hover/tap on breadcrumbsJan-Christoph Borchardt2013-06-111-0/+10
| | | | |
| | * | | better contrast and grouping for blocks in personal settings through darker ↵Jan-Christoph Borchardt2013-06-111-2/+15
| | | | | | | | | | | | | | | | | | | | background color
| | * | | better contrast for controls barJan-Christoph Borchardt2013-06-111-1/+1
| | |/ /
| * | | Merge branch 'master' into files_encryption_check_private_keyBjörn Schießle2013-06-111-0/+1
| |\| | | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/tests/crypt.php
| | * | [tx-robot] updated from transifexJenkins for ownCloud2013-06-111-0/+1
| | | |
| * | | Merge branch 'master' into files_encryption_check_private_keyBjörn Schießle2013-06-1017-22/+370
| |\| | | | | | | | | | | | | | | | | | Conflicts: settings/ajax/changepassword.php
| | * | [tx-robot] updated from transifexJenkins for ownCloud2013-06-083-0/+4
| | | |
| | * | [tx-robot] updated from transifexJenkins for ownCloud2013-06-076-0/+29
| | | |
| | * | [tx-robot] updated from transifexJenkins for ownCloud2013-06-054-2/+38
| | | |
| | * | Added input[type="url"] to styles.cssopensaucesystems2013-06-041-3/+4
| | | |