summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4285 from owncloud/scan-files-script-masterThomas Müller2013-08-052-0/+67
|\
| * remove cli checkThomas Müller2013-08-021-4/+0
| * more verbose printouts - fixing executionThomas Müller2013-08-021-7/+18
| * adjust usage textThomas Müller2013-08-021-2/+2
| * Use console.php entry point for file scanning from consoleBart Visscher2013-08-022-2/+25
| * adding new cli script to rescan filesThomas Müller2013-08-011-0/+37
* | Merge pull request #4293 from owncloud/config-dateThomas Müller2013-08-042-5/+10
|\ \
| * | fixing PHPDocThomas Müller2013-08-041-3/+3
| * | add 'logdateformat' to config.sample.phpThomas Müller2013-08-041-1/+4
| * | make log date configurable, default to iso 8601Bernhard Posselt2013-08-021-1/+3
* | | Merge pull request #4308 from owncloud/fix-4194Thomas Müller2013-08-041-3/+6
|\ \ \
| * | | fixing PHPDocThomas Müller2013-08-041-1/+1
| * | | Port log level filtering from OC_Log_Owncloud to OC_Log_Syslog.Andreas Fischer2013-08-041-2/+5
* | | | Merge pull request #4228 from owncloud/fix-3836Thomas Müller2013-08-041-1/+1
|\ \ \ \
| * | | | app migrate: Use = instead of LIKE as described in the comment above.Andreas Fischer2013-07-291-1/+1
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-04360-1589/+1610
| |/ / / |/| | |
* | | | add reveal mimetypeRobin Appelman2013-08-031-1/+2
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-0335-140/+200
* | | | 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
|\ \ \ \ \