summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* fix merge conflictsGeorg Ehrke2013-08-0510-26/+109
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2013-08-041-1/+1
| * [tx-robot] updated from transifexJenkins for ownCloud2013-08-032-0/+16
| * 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
| * Merge pull request #4278 from owncloud/breadcrumb-firstJörn Friedrich Dreyer2013-08-021-1/+1
| |\
| | * make sure the first breadcrumb item is inserted before any other elements in ...Robin Appelman2013-08-011-1/+1
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-08-022-10/+12
| |/
| * [tx-robot] updated from transifexJenkins for ownCloud2013-08-013-0/+10
| * [tx-robot] updated from transifexJenkins for ownCloud2013-07-311-0/+1
| * Merge pull request #4225 from owncloud/better-404Thomas Müller2013-07-301-6/+10
| |\
| | * Move styles from core to appVictor Dubiniuk2013-07-291-12/+0
| | * Allow apps to have own 404 content, closes #3225Victor Dubiniuk2013-07-292-6/+22
| * | fixes #4026Thomas Müller2013-07-301-9/+21
* | | Merge branch 'master' into oc_previewGeorg Ehrke2013-07-302-21/+25
|\| |
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-07-302-21/+25
| |/
* | fix code style of try catch blocksGeorg Ehrke2013-07-301-1/+1
* | style fixesGeorg Ehrke2013-07-304-3/+183
* | Merge branch 'master' into oc_previewThomas Müller2013-07-3061-257/+447
|\|
| * [tx-robot] updated from transifexJenkins for ownCloud2013-07-291-0/+2
| * [tx-robot] updated from transifexJenkins for ownCloud2013-07-281-0/+2
| * [tx-robot] updated from transifexJenkins for ownCloud2013-07-2744-86/+25
| * Merge pull request #4199 from owncloud/login-cleanupJörn Friedrich Dreyer2013-07-261-0/+21
| |\
| | * IE8 login/install screen cleartype fixes and input box bordersJörn Friedrich Dreyer2013-07-261-0/+21
| | * force dbs to stay in one lineJörn Friedrich Dreyer2013-07-241-1/+1
| * | show tablespace only for oracle, hide dbhost for sqlite, remove unnecessary j...Jörn Friedrich Dreyer2013-07-242-31/+25
| * | force dbs to stay in one lineJörn Friedrich Dreyer2013-07-241-1/+1
| |/
| * merge masterJan-Christoph Borchardt2013-07-248-29/+29
| |\
| | * Merge pull request #4175 from owncloud/remember-checkedJan-Christoph Borchardt2013-07-241-2/+2
| | |\
| | | * check remember log in by default, ref #3918Jan-Christoph Borchardt2013-07-241-2/+2
| | * | use OC_Defaults directly from the templateBjörn Schießle2013-07-241-2/+2
| | * | initialize OC_Defaults in template constructorXBjörn Schießle2013-07-245-23/+14
| | |/
| | * Merge branch 'master' into more-themable-stringsThomas Müller2013-07-2414-19/+67
| | |\
| | | * [tx-robot] updated from transifexJenkins for ownCloud2013-07-241-1/+7
| | * | use themable strings for installationJan-Christoph Borchardt2013-07-111-2/+5
| | * | introduce shortname themable string and split from title, use for image alt textJan-Christoph Borchardt2013-07-114-8/+8
| * | | slight dark inset text shadow for warnings to increase legibilityJan-Christoph Borchardt2013-07-241-0/+1
| * | | Bring the NoiseJan-Christoph Borchardt2013-07-231-9/+9
| * | | remove superfluous importantJan-Christoph Borchardt2013-07-231-1/+1
| * | | fix browser rendering issuesJan-Christoph Borchardt2013-07-231-2/+8
| * | | larger log in and installation buttonsJan-Christoph Borchardt2013-07-231-1/+3
| * | | better whitespace for footerJan-Christoph Borchardt2013-07-231-5/+3
| * | | cleaner look and code for primary buttonJan-Christoph Borchardt2013-07-231-10/+18
| * | | input fields work on any background nowJan-Christoph Borchardt2013-07-231-15/+19
| * | | add some padding to footerJan-Christoph Borchardt2013-07-231-2/+8
| * | | adjust labels and input field groupsJan-Christoph Borchardt2013-07-233-39/+64
| * | | more beautiful warningsJan-Christoph Borchardt2013-07-231-13/+27
| * | | fix and checkstyle for show password toggleJan-Christoph Borchardt2013-07-231-10/+40
| * | | increase button size, adjust remember checkboxJan-Christoph Borchardt2013-07-231-2/+2
| * | | move log in button CSS to appropriate placeJan-Christoph Borchardt2013-07-231-4/+18