summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix syntax errorMyles McNamara2013-08-031-1/+1
* use theme name and title for password resetMyles McNamara2013-08-031-1/+2
* Merge pull request #4299 from owncloud/simplify-db-transactionThomas Müller2013-08-021-10/+0
|\
| * Simplify OC_DB transaction functionsBart Visscher2013-08-021-10/+0
* | Merge pull request #4283 from owncloud/add_ocimage_unittestBart Visscher2013-08-024-0/+221
|\ \
| * | Update skipped tests messageskondou2013-08-021-3/+3
| * | Merge branch 'master' into add_ocimage_unittestkondou2013-08-02176-499/+830
| |\ \
| * | | Optimize image and skip mimetype testkondou2013-08-012-0/+1
| * | | Cover more caseskondou2013-08-011-17/+17
| * | | Add OC_Image Unit Testkondou2013-08-014-0/+220
* | | | Merge pull request #4287 from Takuto88/language-configThomas Müller2013-08-022-1/+10
|\ \ \ \
| * | | | users's -> user'sLennart Rosam2013-08-021-1/+1
| * | | | Fix typo (again >.<).. gnahLennart Rosam2013-08-021-1/+1
| * | | | Make default language configurable via config.phpLennart Rosam2013-08-022-1/+10
* | | | | Merge pull request #4274 from owncloud/breadcrumbs_showJörn Friedrich Dreyer2013-08-021-0/+38
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | 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 #4284 from owncloud/dont_fatal_on_is_fileThomas Tanghus2013-08-021-1/+1
|\ \ \ \ \
| * | | | | Don't throw a fatal, if is_file() parameter isn'tkondou2013-08-011-1/+1
| | |_|/ / | |/| | |
* | | | | Merge pull request #3006 from owncloud/===_and_!==_in_files_trashbin-appJörn Friedrich Dreyer2013-08-028-27/+27
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Use isIgnoredDir()kondou2013-07-101-1/+1
| * | | | Use !== and === in files_trashbin-appkondou2013-07-108-27/+27
* | | | | 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-02166-470/+801
| |_|/ / |/| | |
* | | | Some styling to user listVictor Dubiniuk2013-08-011-0/+2
| |_|/ |/| |
* | | Merge pull request #4221 from owncloud/fix-3698Jörn Friedrich Dreyer2013-08-012-19/+24
|\ \ \ | |/ / |/| |
| * | Add test for calculating size of newly empty folderMichael Gapczynski2013-07-291-0/+5
| * | Use query to calculate folder sizeMichael Gapczynski2013-07-291-10/+13
| * | Fix calculating size for empty foldersMichael Gapczynski2013-07-281-19/+16
* | | Merge pull request #4270 from owncloud/fix_4253Björn Schießle2013-08-013-13/+34
|\ \ \
| * | | fix test and make warning translatableBjoern Schiessle2013-08-012-3/+9
| * | | cancel sharing if some users doesn't have a working encryption set-up.Bjoern Schiessle2013-08-012-11/+26
* | | | Merge pull request #4265 from berendt/OC_Files_Storage_AmazonS3_phpdocJörn Friedrich Dreyer2013-08-011-0/+15
|\ \ \ \
| * | | | added @var tagsChristian Berendt2013-08-011-0/+15
* | | | | Merge pull request #4266 from berendt/OC_Files_Storage_AmazonS3_loggingJörn Friedrich Dreyer2013-08-011-0/+14
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | write all catched exception messages to the logChristian Berendt2013-08-011-0/+14
| |/ / /
* | | | Merge pull request #4155 from owncloud/mdb2schemareader-booleansMorris Jobke2013-08-015-69/+308
|\ \ \ \
| * | | | add tests for MDB2SchemaReaderRobin Appelman2013-07-292-0/+157
| * | | | make MDB2Schema reader non staticRobin Appelman2013-07-292-72/+143
| * | | | add function to get config object from OC_ConfigRobin Appelman2013-07-291-0/+4
| * | | | use ===Robin Appelman2013-07-221-1/+1
| * | | | add support for the <primary/> element within field definitionsRobin Appelman2013-07-221-0/+4
| * | | | db: cast default values for boolean fields to booleansRobin Appelman2013-07-221-0/+3
* | | | | Merge pull request #4208 from owncloud/scanner-php53Morris Jobke2013-08-011-6/+7
|\ \ \ \ \
| * | | | | remove unneeded 'use'Robin Appelman2013-07-291-1/+0
| * | | | | dont need to explicitly pass by referenceRobin Appelman2013-07-291-2/+2
| * | | | | fix scanner hooks, cant use inside closures in php 5.3Robin Appelman2013-07-261-5/+7
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-0168-209/+325
* | | | | | Merge pull request #4259 from owncloud/search_result_scrollbarMorris Jobke2013-07-311-56/+57
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |