summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'oc_preview' of github.com:owncloud/core into oc_previewJan-Christoph Borchardt2013-08-146-22/+5
|\
| * remove \OC\Preview::showErrorPreviewGeorg Ehrke2013-08-144-19/+0
| |
| * use web.svg instead of web.pngGeorg Ehrke2013-08-141-1/+1
| |
| * don't use hardcoded size for previewGeorg Ehrke2013-08-142-2/+4
| |
* | replace different icons for code with proper onesJan-Christoph Borchardt2013-08-1420-50/+317
| |
* | replace different icons for documents, spreadsheets and presentations with ↵Jan-Christoph Borchardt2013-08-1418-0/+233
| | | | | | | | proper ones
* | replace same but differently named package graphics with one proper oneJan-Christoph Borchardt2013-08-1416-0/+62
| |
* | add more file type icons, replace old onesJan-Christoph Borchardt2013-08-1415-0/+1387
|/
* update indexes of oc_permissionsGeorg Ehrke2013-08-092-3/+1
|
* fix js errorGeorg Ehrke2013-08-071-1/+1
|
* allow permissions.user to be null as suggested by @butonicGeorg Ehrke2013-08-072-2/+2
|
* implement previews of single shared filesGeorg Ehrke2013-08-072-1/+5
|
* fix merge conflictsGeorg Ehrke2013-08-05642-4744/+7925
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2013-08-0566-121/+124
| |
| * Merge pull request #4285 from owncloud/scan-files-script-masterThomas Müller2013-08-052-0/+67
| |\ | | | | | | adding new cli script to rescan files
| | * 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
| |\ \ | | | | | | | | make log date configurable, default to iso 8601
| | * | 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
| |\ \ \ | | | | | | | | | | Port log level filtering from OC_Log_Owncloud to OC_Log_Syslog.
| | * | | 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.
| | * | | | app migrate: Use = instead of LIKE as described in the comment above.Andreas Fischer2013-07-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The LIKE operator is not defined on integers (probably any non-text) columns on PostgreSQL.
| * | | | | [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 functions
| | * | | | Simplify OC_DB transaction functionsBart Visscher2013-08-021-10/+0
| | | | | |
| * | | | | Merge pull request #4283 from owncloud/add_ocimage_unittestBart Visscher2013-08-024-0/+221
| |\ \ \ \ \ | | | | | | | | | | | | | | Add ocimage unittest
| | * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use file_get_contents() and base64_encode(file_get_contents()), to load from data and base64, to cover more cases
| | * | | | | | Add OC_Image Unit Testkondou2013-08-014-0/+220
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | data() somehow does not return, what file_get_contents() returns, so I skipped related tests.
| * | | | | | | Merge pull request #4287 from Takuto88/language-configThomas Müller2013-08-022-1/+10
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Make default language configurable via config.php
| | * | | | | | | 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
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | add OC.Breadcrumb.show(dir, filename, link)
| | * | | | | | | 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't a 'valid path', but only a data/base64-string.
| | * | | | | | | Don't throw a fatal, if is_file() parameter isn'tkondou2013-08-011-1/+1
| | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a 'valid path', but only a data/base64-string. Related to #4283
| * | | | | | | Merge pull request #3006 from owncloud/===_and_!==_in_files_trashbin-appJörn Friedrich Dreyer2013-08-028-27/+27
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | Use !== and === in files_trashbin app
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-10 15:04:42 +0000