aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #8999 from owncloud/issue/8996Morris Jobke2014-06-124-1/+6
|\
| * Move IE8 fixes to fixes.cssMorris Jobke2014-06-122-1/+5
| * Fix missing caret in header menu for IE8Joas Schilling2014-06-121-1/+1
| * Fix header menu background in IE8Joas Schilling2014-06-121-0/+1
| * Reduce size of png files so they match the svgJoas Schilling2014-06-122-0/+0
* | Merge pull request #8980 from owncloud/better-accept-headerVincent Petry2014-06-123-20/+69
|\ \
| * | also handle lowercase headersBernhard Posselt2014-06-112-22/+31
| * | fix indentionBernhard Posselt2014-06-111-6/+6
| * | handle http accept headers more gracefullyBernhard Posselt2014-06-113-18/+58
* | | Merge pull request #8991 from owncloud/fix-php53-arraycombineVincent Petry2014-06-121-2/+7
|\ \ \
| * | | Fixed array_combine for PHP 5.3Vincent Petry2014-06-111-2/+7
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-1254-197/+275
* | | | Merge pull request #8986 from owncloud/disable_testsVincent Petry2014-06-112-3/+9
|\| | |
| * | | Use assertNotSame when checking etagsVincent Petry2014-06-111-3/+3
| * | | disable failing testsBjoern Schiessle2014-06-111-0/+6
* | | | Merge pull request #8901 from owncloud/permissions-update-cacheVincent Petry2014-06-113-22/+56
|\ \ \ \ | |/ / / |/| | |
| * | | Use &=Robin Appelman2014-06-091-2/+2
| * | | adjust unit test assert valuesThomas Müller2014-06-091-8/+6
| * | | adding PHPDocThomas Müller2014-06-091-0/+36
| * | | Save the permissions in the filecache if it's not saved yetRobin Appelman2014-06-091-12/+12
* | | | Merge pull request #8985 from owncloud/share-grouporderfixVincent Petry2014-06-111-0/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Added ORDER BY to enforce share entry orderVincent Petry2014-06-111-0/+1
* | | | increase to 7.0 alpha 1Frank Karlitschek2014-06-111-2/+2
|/ / /
* | | Merge pull request #8966 from owncloud/fix_failing_tests_on_masterVincent Petry2014-06-115-30/+1
|\ \ \
| * | | call self::getNumericStorageId() to get the numeric IDBjoern Schiessle2014-06-101-1/+1
| * | | wwe no longer have a versions tableBjoern Schiessle2014-06-103-28/+0
| * | | no need to prepare a statement twiceBjoern Schiessle2014-06-101-1/+0
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-11221-1057/+1573
* | | | Merge pull request #8972 from owncloud/use_imagettftext_take2Morris Jobke2014-06-112-2/+6
|\ \ \ \ | |_|_|/ |/| | |
| * | | make text preview backend use imagettftext, fixes #8087Georg Ehrke2014-06-102-2/+6
* | | | Merge pull request #8971 from owncloud/sidebar-disablesnapperinielte9jbtbnl2014-06-101-1/+1
|\ \ \ \
| * | | | Disable snapper init for IE <= 9Vincent Petry2014-06-101-1/+1
|/ / / /
* | | | Merge pull request #8908 from owncloud/fix-placeholdersMorris Jobke2014-06-103-5/+5
|\ \ \ \ | |/ / / |/| | |
| * | | fix split translationsVolkan Gezer2014-06-063-5/+5
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-10102-245/+278
* | | | Merge pull request #8928 from owncloud/too-long-filename-fix-v2jbtbnl2014-06-093-6/+58
|\ \ \ \ | |_|_|/ |/| | |
| * | | improve ellipsis of filename for different screen sizesMorris Jobke2014-06-082-19/+22
| * | | @jancborchardt's commit for cross browser compatibility of extension.raghunayyar2014-06-081-3/+1
| * | | Adds class name to span element inside filename.raghunayyar2014-06-072-7/+7
| * | | Adds multiple media queries for filename.raghunayyar2014-06-071-1/+37
| * | | Ellipcises too long filenamesraghunayyar2014-06-062-1/+16
* | | | Merge pull request #8948 from owncloud/fix-logger-race-conditionMorris Jobke2014-06-091-1/+1
|\ \ \ \
| * | | | set logger before registrate to an error handlerMorris Jobke2014-06-091-1/+1
|/ / / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-0949-423/+735
* | | | Merge pull request #8916 from owncloud/rmdirr-test-cleanup-fixMorris Jobke2014-06-082-4/+11
|\ \ \ \
| * | | | Added hacky fix for long path cleanup routineVincent Petry2014-06-062-4/+11
* | | | | Merge pull request #8937 from owncloud/design-sizingMorris Jobke2014-06-082-2/+2
|\ \ \ \ \
| * | | | | display empty content message a bit higher up so it's easier to seeJan-Christoph Borchardt2014-06-071-1/+1
| * | | | | app settings: only display text fields at full width, not buttonsJan-Christoph Borchardt2014-06-071-1/+1
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-08614-1641/+2125