summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* merge conflicts ...Georg Ehrke2013-07-1093-411/+538
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2013-07-102-1/+3
| * Merge pull request #3920 from owncloud/Fixing_search_ie8Jörn Friedrich Dreyer2013-07-091-2/+6
| |\
| | * Fix lazy styles loading in IE8Victor Dubiniuk2013-07-021-2/+6
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-07-091-0/+1
| * | Merge pull request #3963 from owncloud/update-logic-spliticewind19912013-07-081-107/+28
| |\ \
| | * | split upgrade logic from ajax fileRobin Appelman2013-07-061-107/+28
| * | | Merge pull request #3757 from owncloud/icon-cleanupJan-Christoph Borchardt2013-07-0816-25/+23
| |\ \ \
| | * | | change delete from entry forbidden sign to proper iconJan-Christoph Borchardt2013-07-052-3/+10
| | * | | Optimize pictures with optipng and scourkondou2013-06-215-217/+9
| | * | | standardize on 32px loading spinner, decrease size in CSS where neededJan-Christoph Borchardt2013-06-173-0/+7
| | * | | use proper style for add iconJan-Christoph Borchardt2013-06-172-8/+60
| | * | | remove unused loading spinners, just have oneJan-Christoph Borchardt2013-06-172-0/+0
| | * | | remove unused big imagesJan-Christoph Borchardt2013-06-172-0/+0
| | * | | use mail icon consistent with Mail app iconJan-Christoph Borchardt2013-06-172-6/+94
| | * | | transparent background for lock iconJan-Christoph Borchardt2013-06-171-0/+0
| | * | | use consistent icon for 'restore'/versions/history, also SVGJan-Christoph Borchardt2013-06-171-0/+0
| | * | | differentiate delete from close iconJan-Christoph Borchardt2013-06-175-11/+63
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-073-0/+12
| | |/ / | |/| |
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-0662-63/+8
| * | | fixing === and identThomas Müller2013-07-051-6/+6
| * | | Merge branch 'master' into fixing-3934-masterThomas Müller2013-07-053-13/+13
| |\ \ \
| | * | | no anonymous upload on read-only foldersThomas Müller2013-07-051-9/+11
| | * | | Merge https://github.com/owncloud/core/pull/3900Björn Schießle2013-07-052-8/+8
| * | | | no anonymous upload on files only foldersThomas Müller2013-07-051-5/+7
| |/ / /
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-051-35/+98
| * | | move to non-static OC_DefaultsBjörn Schießle2013-07-043-9/+9
| * | | Add init funtion to OC_Defaults to be able to wrap translatable stringsBjörn Schießle2013-07-043-0/+9
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-042-1/+3
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-031-0/+1
| | |/ | |/|
| * | [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
| * | 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 2820Morris Jobke2013-06-151-2/+2
| * | | [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
| * | | Merge pull request #2914 from Kondou-ger/label_overlapping_valueBart Visscher2013-06-291-1/+1
| |\ \ \
| | * | | 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 featureRoman Geber2013-06-251-1/+42
| * | | | | Merge pull request #3576 from owncloud/jquery.multiselect-1.13Thomas Tanghus2013-06-272-54/+101
| |\ \ \ \ \
| | * | | | | 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
| * | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-263-31/+40
| | |/ / / / | |/| | | |
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-253-1/+21