summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #880 from toyamarinyon/masterHEADorigin/masterorigin/HEADmasterLucas Michot2017-02-062-37/+37
|\ | | | | Fixed japanese language file
| * Fixed japanese language filetoyama satoshi2017-01-312-37/+37
| |
* | Merge pull request #878 from lucasmichot/feature/master/fix-quarter-testsLucas Michot2017-01-311-2/+2
|\ \ | |/ |/| Fix quarter tests.
| * Fix quarter tests.Lucas Michot2017-01-311-2/+2
|/
* Merge pull request #869 from BerRRG/masterLucas Michot2017-01-302-0/+25
|\ | | | | Add getter to days attribute.
| * Merge https://github.com/briannesbitt/CarbonBernardo Generozo2017-01-301-4/+4
| |\ | |/ |/|
* | Merge pull request #874 from lucasmichot/feature/5.4/fix-testsLucas Michot2017-01-301-4/+4
|\ \ | | | | | | Fix tests for isLastMonth and isNextMonth.
| * | Fix tests for isLastMonth and isNextMonth.Lucas Michot2017-01-301-4/+4
|/ /
| * Merge https://github.com/briannesbitt/CarbonBernardo Generozo2017-01-302-18/+226
| |\ | |/ |/|
* | Merge pull request #855 from ROKAISAKKON/masterLucas Michot2017-01-242-18/+226
|\ \ | | | | | | Translation for th is wrong
| * | Fix translation for th.ROKAISAKKON2017-01-231-17/+17
| | | | | | | | | | | | Added test for thai translation.
| * | Fix translation for th.ROKAISAKKON2017-01-232-18/+226
| | | | | | | | | | | | Added test for thai translation.
| * | Merge pull request #1 from ROKAISAKKON/ROKAISAKKON-patch-no-plural-in-thai-langRO'KAISAKKON2017-01-161-14/+14
| |\ \ | | | | | | | | Translation for th is wrong
| | * | Translation for th is wrongRO'KAISAKKON2017-01-161-14/+14
| |/ / | | | | | | | | | | | | | | | There are no plural in th, which means e.g. 'year' => '1 ปี|:count ปี', Should be 'year' => ':count ปี'
| | * Fix the comment of documentationBernardo Generozo2017-01-301-1/+1
| | |
| | * Fix StyleCI analysisBernardo Generozo2017-01-241-2/+2
| | |
| | * Add test to day getterBernardo Generozo2017-01-241-0/+15
| | |
| | * Add get to daysBernardo Generozo2017-01-241-0/+10
| |/ |/|
* | Merge pull request #860 from lucasmichot/feature/master/assert-sameLucas Michot2017-01-161-11/+11
|\ \ | | | | | | Use stricter assertions.
| * | Use stricter assertions.Lucas Michot2017-01-161-11/+11
|/ /
* | Merge pull request #859 from ↵Lucas Michot2017-01-165-15/+22
|\ \ | | | | | | | | | | | | lucasmichot/feature/master/always-use-carbon-setTestNow Always Carbon::setTestNow
| * | Always Carbon::setTestNowLucas Michot2017-01-165-15/+22
|/ /
* | Merge pull request #858 from lucasmichot/feature/master/create-with-defaultsLucas Michot2017-01-161-1/+2
|\ \ | | | | | | Fix failing tests.
| * | Fix failing tests.Lucas Michot2017-01-161-1/+2
|/ /
* | Merge pull request #857 from lucasmichot/feature/master/phpstanLucas Michot2017-01-161-0/+1
|\ \ | | | | | | PHPStan totally deserves a badge - thx @ondrejmirtes
| * | PHPStan totally deserves a badge - thx @ondrejmirtesLucas Michot2017-01-161-0/+1
|/ /
* | Merge pull request #856 from lucasmichot/feature/master/travis-phpstanLucas Michot2017-01-161-7/+7
|\ \ | | | | | | Cleanup .travis.yml for phpstan
| * | Cleanup .travis.yml for phpstanLucas Michot2017-01-161-7/+7
|/ /
* | Merge pull request #842 from ondrejmirtes/phpstanLucas Michot2017-01-1611-21/+43
|\ \ | |/ |/| Integrating PHPStan & fixes of found issues
| * PHPStan integrationOndrej Mirtes2017-01-163-1/+14
| |
| * Consistent `@return $this` for methods that return result of another method ↵Ondrej Mirtes2017-01-151-4/+4
| | | | | | | | with `@return $this`
| * Fixed translator type handlingOndrej Mirtes2017-01-152-10/+19
| |
| * Fixed method caseOndrej Mirtes2017-01-152-2/+2
| |
| * Fixed static call to instance methodOndrej Mirtes2017-01-151-1/+1
| |
| * Fixed namespaces of a few testsOndrej Mirtes2017-01-153-3/+3
| |
* | Merge pull request #854 from lucasmichot/feature/master/last-errors1.22.1Lucas Michot2017-01-162-1/+7
|\ \ | |/ |/| Let extended classes access lastErrors
| * Let extended classes access lastErrorsLucas Michot2017-01-162-1/+7
|/
* Merge pull request #851 from lucasmichot/feature/master/release-1-231.22.0Lucas Michot2017-01-151-1/+1
|\ | | | | Prepare for release 1.22
| * Prepare for release 1.22Lucas Michot2017-01-151-1/+1
|/
* Merge pull request #850 from lucasmichot/feature/master/php-cs-fixer-2Lucas Michot2017-01-154-17/+60
|\ | | | | Switch to PHP-CS-Fixer 2.
| * Switch to PHP-CS-Fixer 2.Lucas Michot2017-01-154-17/+60
|/
* Merge pull request #849 from lucasmichot/feature/master/code-coverage-php-71Lucas Michot2017-01-141-2/+4
|\ | | | | Enable codecov for PHP 7.1
| * Enable codecov for PHP 7.1.Lucas Michot2017-01-141-2/+4
|/
* Merge pull request #848 from lucasmichot/feature/master/phpunitLucas Michot2017-01-142-10/+11
|\ | | | | PHPunit : respect .editorconfig
| * Ignore overriden phpunit.xmlLucas Michot2017-01-141-0/+1
| |
| * Let phpunit.xml respect .editorconfigLucas Michot2017-01-141-10/+10
|/
* Merge pull request #600 from lucasmichot/feature/master/can-serializeLucas Michot2017-01-132-0/+99
|\ | | | | Add serialize function
| * Fix CS.Lucas Michot2017-01-131-1/+1
| |
| * Add serialize and fromSerialized functionsLucas Michot2017-01-132-0/+99
|/
* Merge pull request #847 from ↵Lucas Michot2017-01-132-3/+11
|\ | | | | | | | | lucasmichot/c-jm-issue-817-change-settestnow-to-take-a-string Change Carbon::setTestNow() to be able to parse a string.
| * Add missing string docblockLucas Michot2017-01-131-1/+1
| |
| * Add docs and change to ternary operatorColin J. Mills2017-01-131-6/+2
| |
| * StyleciColin J. Mills2017-01-131-1/+1
| |
| * Add testColin J. Mills2017-01-131-0/+7
| |
| * Change Carbon::setTestNow() to be able to parse a string.Colin J. Mills2017-01-131-1/+6
|/
* Merge pull request #819 from milose/montenegroLucas Michot2017-01-134-0/+1099
|\ | | | | Add Montenegrin language translation
| * Test class name.Milos Sakovic2017-01-121-1/+1
| |
| * Add tests.Milos Sakovic2017-01-122-498/+985
| |
| * Tiny errors.Milos Sakovic2017-01-121-3/+3
| |
| * Add Cyrlic script, and properly name the files.Milos Sakovic2017-01-123-0/+76
| |
| * Style fix.Milos Sakovic2016-12-051-1/+0
| |
| * More exceptions for year_ago and year_from_now.Milos Sakovic2016-11-261-2/+2
| |
| * Trailing line.Milos Sakovic2016-11-261-1/+0
| |
| * Style fix.Milos Sakovic2016-11-261-301/+301
| |
| * Testing suite. Phew.Milos Sakovic2016-11-261-0/+500
| |
| * Precise pluralization.Milos Sakovic2016-11-261-16/+23
| |
| * Add Montenegrin localeMilos2016-11-251-0/+31
| |
* | Merge pull request #846 from lucasmichot/arjasco-masterLucas Michot2017-01-122-0/+120
|\ \ | | | | | | Add new isNext- / isLast- methods
| * | Adjust functionsLucas Michot2017-01-121-2/+2
| | |
| * | New is methods for next / last week, month and yearAaron Costello2017-01-122-0/+120
| | |
* | | Merge pull request #825 from milose/setlocale-longLucas Michot2017-01-121-2/+2
|\ \ \ | |/ / |/| | Allow Carbon::setLocale to accept long localization variants
| * | Allow Carbon::setLocale to accept long localization variant ll-Ssss-RR format.Milos Sakovic2016-12-051-2/+2
| |/
* | Merge pull request #834 from lucasmichot/feature/missing-locale-testsLucas Michot2017-01-111-0/+4
|\ \ | | | | | | Add missing locale tests
| * | Add missing locale testsLucas Michot2017-01-111-0/+4
| | |
* | | Merge pull request #823 from lucasmichot/feature/develop/wrapWithNonDstDateLucas Michot2017-01-111-1/+1
|\ \ \ | | | | | | | | Use wrapWithNonDstDate
| * | | Use wrapWithNonDstDateLucas Michot2017-01-111-1/+1
| |/ /
* | | Merge pull request #824 from lucasmichot/feature/develop/missing-namespaceLucas Michot2017-01-111-0/+2
|\ \ \ | | | | | | | | Add missing namespace
| * | | Add missing namespaceLucas Michot2017-01-111-0/+2
| |/ /
* | | Merge pull request #647 from lucasmichot/feature/master/composer-new-or-syntaxLucas Michot2017-01-111-2/+2
|\ \ \ | | | | | | | | Use new Composer OR syntax
| * | | Use new Composer OR syntaxLucas Michot2017-01-111-2/+2
| |/ /
* | | Merge pull request #832 from lucasmichot/feature/always-sort-packagesLucas Michot2017-01-111-0/+3
|\ \ \ | |/ / |/| | Always sort PHP dependencies
| * | Always sort PHP dependenciesLucas Michot2017-01-111-0/+3
|/ /
* | Merge pull request #835 from lucasmichot/feature/fix-php-71-testsLucas Michot2017-01-112-2/+2
|\ \ | | | | | | Fix PHP 7.1 tests
| * | Fix PHP 7.1 tests.Lucas Michot2017-01-112-2/+2
|/ /
* | Full docs linkBrian Nesbitt2016-12-021-0/+4
| |
* | Remove the wrong Ukrainian locale file and add tests for the correct one.Brian Nesbitt2016-11-212-42/+11
|/
* Merge pull request #815 from ↵Brian Nesbitt2016-11-213-3/+13
|\ | | | | | | | | lucasmichot/feature/master/travis-skip-testMicroGetterWithDefaultNow Make PHP 7.1 tests pass.
| * Only allows failures with HHVM.Lucas Michot2016-11-211-3/+1
| |
| * Make PHP 7.1 tests pass.Lucas Michot2016-11-212-0/+12
|/
* Merge pull request #813 from lucasmichot/feature/master/settimestampBrian Nesbitt2016-11-211-1/+1
|\ | | | | Directly call $this->setTimestamp
| * Directly call $this->setTimestamp(.Lucas Michot2016-11-201-1/+1
| |
* | Merge pull request #814 from lucasmichot/feature/master/travis-php-71Brian Nesbitt2016-11-211-1/+1
|\ \ | |/ |/| [WIP] Fix Travis builds for HHVM and PHP 7.1.
| * Fix Travis builds for HHVM and PHP 7.1.Lucas Michot2016-11-211-1/+1
|/
* Suppress the travis error for now.Brian Nesbitt2016-11-201-7/+12
|
* Merge pull request #812 from briannesbitt/analysis-87GLdkBrian Nesbitt2016-11-203-10/+10
|\ | | | | Applied fixes from StyleCI
| * Applied fixes from StyleCIBrian Nesbitt2016-11-203-10/+10
|/
* Merge branch 'lucasmichot-feature/develop/php-71'Brian Nesbitt2016-11-201-2/+8
|\
| * Merge branch 'feature/develop/php-71' of ↵Brian Nesbitt2016-11-201-2/+8
| |\ |/ / | | | | | | | | | | https://github.com/lucasmichot/Carbon into lucasmichot-feature/develop/php-71 Conflicts: .travis.yml
| * Also test PHP 7.1 with TravisLucas Michot2016-11-201-1/+8
| |
* | Merge pull request #779 from lucasmichot/feature/master/quarter-constantsBrian Nesbitt2016-11-201-3/+3
|\ \ | | | | | | Use constants for quarter calculations.
generated by cgit v1.1 at 2025-05-10 17:03:34 +0000