summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [Share 2.0] Update db structure to stay backwards compatibleRoeland Jago Douma2016-01-062-7/+7
|
* Merge pull request #21473 from owncloud/fix-unit-tests-because-appstoreJörn Friedrich Dreyer2016-01-065-32/+38
|\ | | | | Inject OCSClient - Fixes master unit tests
| * Inject OCSClientLukas Reschke2016-01-065-32/+38
|/ | | | Fixes https://github.com/owncloud/core/issues/21451
* [tx-robot] updated from transifexJenkins for ownCloud2016-01-0620-30/+56
|
* Merge pull request #21409 from JohannesKleine/patch-1Jörn Friedrich Dreyer2016-01-051-1/+1
|\ | | | | Update config.sample.php
| * Merge branch 'master' into patch-1JohannesKleine2016-01-024-0/+6
| |\
| * | Update config.sample.phpJohannesKleine2015-12-311-1/+1
| | | | | | | | | I corrected the word order.
* | | Merge pull request #21377 from owncloud/login-submit-button-border-2Jörn Friedrich Dreyer2016-01-051-0/+2
|\ \ \ | | | | | | | | Remove unnecessary border from login button
| * | | Remove unnecessary border from login buttonChristoph Wurst2015-12-291-0/+2
| | | |
* | | | Merge pull request #21446 from edwardcrompton/feature/21413-better-occ-user-helpJörn Friedrich Dreyer2016-01-051-0/+1
|\ \ \ \ | | | | | | | | | | Feature/21413 better occ user help
| * | | | Whitespace correctionEdward Crompton2016-01-041-1/+1
| | | | |
| * | | | Removing the . from the end of the help response to match convention set by ↵Edward Crompton2016-01-041-1/+1
| | | | | | | | | | | | | | | | | | | | other messages
| * | | | Adding a more helpful error message for when occ is run at the console as ↵Edward Crompton2016-01-041-1/+2
| | | | | | | | | | | | | | | | | | | | the wrong user
* | | | | Merge pull request #21454 from owncloud/proper-style-sidebar-transparencyJörn Friedrich Dreyer2016-01-051-0/+3
|\ \ \ \ \ | | | | | | | | | | | | Use color instead of transparency for proper tooltip appearance
| * | | | | Use color instead of transparency for proper tooltip appearanceMorris Jobke2016-01-051-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | * fixes #21436
* | | | | | Merge pull request #21442 from owncloud/annotate-typeJörn Friedrich Dreyer2016-01-051-6/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Annotate type
| * | | | | Annotate typeLukas Reschke2016-01-041-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | Otherwise static code scanners will complain about this.
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-0572-116/+216
| |/ / / / |/| | | |
* | | | | Merge pull request #21393 from owncloud/fix-urlgenerator-callThomas Müller2016-01-041-1/+5
|\ \ \ \ \ | |/ / / / |/| | | | No more deprecation messages in error log
| * | | | No more deprecation messages in error logThomas Müller2015-12-291-1/+5
| | | | |
* | | | | Merge pull request #21435 from owncloud/improved_upgrade_messagesBjörn Schießle2016-01-042-4/+4
|\ \ \ \ \ | | | | | | | | | | | | don't show previous log level in upgrade message
| * | | | | don't show previous log level in upgrade messageBjörn Schießle2016-01-042-4/+4
|/ / / / /
* | | | / [tx-robot] updated from transifexJenkins for ownCloud2016-01-0416-2/+100
| |_|_|/ |/| | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-022-0/+2
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-012-0/+4
| |_|/ |/| |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-3130-4/+160
| | |
* | | Merge pull request #21402 from owncloud/view-getuserobject-cacheThomas Müller2015-12-301-1/+4
|\ \ \ | | | | | | | | Cache usermanager instance in view
| * | | Cache usermanager instance in viewRobin Appelman2015-12-301-1/+4
| | |/ | |/|
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-30114-116/+2
| |/ |/|
* | Merge pull request #21149 from owncloud/quota-wordingThomas Müller2015-12-291-1/+1
|\ \ | | | | | | shorten quota usage wording, fix overflow on mobile, fix #21129
| * | shorten quota usage wording, fix overflow on mobile, fix #21129Jan-Christoph Borchardt2015-12-281-1/+1
| |/
* | Merge pull request #21331 from switch-ch/fix_ms_logThomas Müller2015-12-291-1/+1
|\ \ | |/ |/| Fix owncloud logging with ms precision
| * When microtime(true) returns a whole number, then the parsing fails.Christian Schnidrig2015-12-221-1/+1
| | | | | | | | This patch makes sure, that the value can always be parsed correctly.
* | Merge pull request #21364 from owncloud/bring_back_icons_filepickerThomas Müller2015-12-281-0/+1
|\ \ | | | | | | Get the icon in javascript for the filepicker
| * | Since the server no longer calculates the iconRoeland Jago Douma2015-12-241-0/+1
| | | | | | | | | | | | | | | The server no longer calculates the icon. So we have the js side do it for us.
* | | Merge pull request #21291 from owncloud/refactor-call-checkThomas Müller2015-12-286-27/+7
|\ \ \ | | | | | | | | Refactor OC_Util::callCheck
| * | | Refactor OC_Util::callCheckMorris Jobke2015-12-226-27/+7
| | | |
* | | | Merge pull request #21254 from owncloud/files-uploadcanceliconfixThomas Müller2015-12-282-23/+36
|\ \ \ \ | | | | | | | | | | Correctly render uploadtext indicator only on folders
| * | | | Use showBusyState for upload into folderVincent Petry2015-12-181-22/+20
| | | | | | | | | | | | | | | | | | | | | | | | | This makes sure that the original icon will be restored properly in case it's not the default folder icon
| * | | | Correctly render uploadtext indicator only on foldersVincent Petry2015-12-182-1/+16
| | | | |
* | | | | Merge pull request #21216 from owncloud/fopen-statcacheThomas Müller2015-12-282-2/+20
|\ \ \ \ \ | | | | | | | | | | | | Clear SMB statcache after fopen
| * | | | | clear statcache after fopen for smbRobin Appelman2015-12-151-2/+7
| | | | | |
| * | | | | test for statcache after fopenRobin Appelman2015-12-151-0/+13
| | | | | |
* | | | | | Merge pull request #17333 from owncloud/php7-scalar-types-controllersThomas Müller2015-12-282-10/+35
|\ \ \ \ \ \ | | | | | | | | | | | | | | Prefer scalar type hints over phpdoc annotation
| * | | | | | Fix unit testRoeland Jago Douma2015-12-241-2/+6
| | | | | | |
| * | | | | | prefer scalar type hints over phpdoc annotationBernhard Posselt2015-12-242-10/+31
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | use method exists lookup to be safe and not break on old hhvm versions add test that checks if type hint is preferred over annotation
* | | | | | Merge pull request #20992 from owncloud/log-in-noselectThomas Müller2015-12-281-0/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | prevent selecting on log in page to solve ugliness on accidental selection
| * | | | | | prevent selecting on log in page to solve ugliness on accidental selectionJan-Christoph Borchardt2015-12-241-0/+16
| | | | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-2816-2/+86
| | | | | | |
* | | | | | | Merge pull request #21368 from owncloud/xenopathic-mailmapThomas Müller2015-12-272-1/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Update mailmap for myself
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-08 15:12:21 +0000