aboutsummaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3687 from owncloud/template_updatesBjörn Schießle2013-06-133-7/+24
|\
| * 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
|\ \
| * \ Merge pull request #3679 from owncloud/multiselect-fixesThomas Tanghus2013-06-122-74/+95
| |\ \ | | |/ | |/|
| | * 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 b...Jan-Christoph Borchardt2013-06-111-2/+15
| * | 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
|\|
| * [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
|\|
| * [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
| * [tx-robot] updated from transifexJenkins for ownCloud2013-06-041-0/+3
| * Set default button in oc-dialogsThomas Tanghus2013-06-031-3/+6
| * Catch double destroy on escape.Thomas Tanghus2013-06-031-1/+3
| * Let the content determine overflow.Thomas Tanghus2013-06-032-1/+1
| * Replacement for jquery.dialog to fit better with ownCloud design.Thomas Tanghus2013-06-024-10/+280
| * Forgot typeof conditionThomas Tanghus2013-06-011-1/+3
| * Speed up octemplate rendering.Thomas Tanghus2013-06-011-5/+3
* | print a warning if a user wants to reset his password and encryption is enabledBjörn Schießle2013-06-052-2/+20
|/
* Merge pull request #3509 from owncloud/update_jquery_to_1_10Jörn Friedrich Dreyer2013-05-303-4/+8
|\
| * Update jquery to 1.10.0 & add jquery-migrate 1.2.1kondou2013-05-273-4/+8
* | [tx-robot] updated from transifexJenkins for ownCloud2013-05-301-0/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2013-05-293-17/+18
* | Merge pull request #3179 from pawl/patch-1Jörn Friedrich Dreyer2013-05-281-1/+2
|\ \
| * | Improve IE CompatibilityPaul Brown2013-04-291-1/+2
* | | Merge pull request #2778 from Kondou-ger/optimize_picturesJörn Friedrich Dreyer2013-05-28108-21422/+314
|\ \ \
| * | | Add shellscript for optimization.kondou2013-04-131-0/+20
| * | | Optimize svgs with scour.kondou2013-04-1255-21422/+294
| * | | Optimize pictures with optipng.kondou2013-04-0752-0/+0
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-281-0/+1
| |_|/ |/| |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-264-0/+4
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-257-0/+7
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-2462-118/+124
* | | Merge pull request #3406 from owncloud/oc_dialogs_oc_templateMorris Jobke2013-05-224-322/+246
|\ \ \
| * | | Remove more obsolete code.Thomas Tanghus2013-05-201-20/+4
| * | | Don't set image path in template.Thomas Tanghus2013-05-202-2/+2