summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-07-028-3/+16
|
* add logo claim to defaults.phpBjörn Schießle2013-07-012-6/+2
|
* construct the foother in defaults.php so that we use always the same footerBjörn Schießle2013-07-011-5/+2
| | | | | | Conflicts: settings/templates/admin.php
* Merge pull request #3223 from owncloud/fix-2820Morris Jobke2013-07-011-2/+2
|\ | | | | if rename of file fails, the rename is undone in the view - fix 2820
| * if rename of file fails, the rename is undone in the view - #fix 2820Morris Jobke2013-06-151-2/+2
| | | | | | | | | | | | | | | | Changes: * OC.dialog -> OC.Notification * Added test * Fixed OC.Notification.show() issue for queued items * Highlight failed item and show notification
* | [tx-robot] updated from transifexJenkins for ownCloud2013-07-012-11/+13
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-06-301-0/+2
| |
* | Escape dropdownLukas Reschke2013-06-291-2/+2
| | | | | | Fixes #3241
* | Merge pull request #2914 from Kondou-ger/label_overlapping_valueBart Visscher2013-06-291-1/+1
|\ \ | | | | | | Fix textfield label overlapping value.
| * | Fix textfield label overlapping value.kondou2013-04-131-1/+1
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-292-5/+11
| | |
* | | Merge pull request #3838 from rgeber/masterJörn Friedrich Dreyer2013-06-281-1/+42
|\ \ \ | | | | | | | | Public Upload Feature
| * | | Public upload featureRoman Geber2013-06-251-1/+42
| | | |
* | | | 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
| | | | | |