Commit Graph

7920 Commits

Author SHA1 Message Date
Tyler Cosgrove
1d90107a5a Fix Humanize Test 2016-02-17 18:27:40 -05:00
Tyler Cosgrove
10758eecd1 Add InflectorTest 2016-02-17 18:11:46 -05:00
Flavio Copes
0143ac22e3 Improve calculateVersionNumberFromDependencyVersion using extracted method 2016-02-17 14:33:52 +01:00
Flavio Copes
17c47889a6 Improve calculateMergedDependenciesOfPackages
Raise exceptions if two merged versions in "next significant release"
format are incompatible

Wrote appropriate tests.
2016-02-17 14:33:27 +01:00
Flavio Copes
5cdc10075a Add versionFormatIsNextSignificantRelease and versionFormatIsEqualOrHigher methods
And corresponding tests
2016-02-17 14:22:59 +01:00
Flavio Copes
b331758d9c Add checkNextSignificantReleasesAreCompatible method
Added own tests too.

Returns true if two releases are compatible by the 'next significant
release' meaning.

~1.2 is equivalent to >=1.2 <2.0.0
~1.2.3 is equivalent to >=1.2.3 <1.3.0

In short, allows the last digit specified to go up
2016-02-17 14:19:14 +01:00
Flavio Copes
503ff8d70f First step towards versions in dependencies
Add InstallCommand::calculateMergedDependenciesOfPackages and
InstallCommand::calculateVersionNumberFromDependencyVersion and
corresponding unit tests
2016-02-16 15:24:33 +01:00
Matias Griese
2ba5517d4c Merge remote-tracking branch 'origin/feature/blueprints-update' into feature/blueprints-update 2016-02-16 13:58:26 +02:00
Matias Griese
3a0a20ab97 Blueprint extend: Add blueprint special types support 2016-02-16 13:58:13 +02:00
Flavio Copes
b59cdbfdcf Lint 2016-02-15 16:53:26 +01:00
Flavio Copes
2944289544 Merge branch 'develop' into feature/dependencies 2016-02-15 16:52:57 +01:00
Flavio Copes
a683f661ed Add truncate and truncateHtml tests for input type 2016-02-15 14:39:28 +01:00
Flavio Copes
1c382a1bc6 Fix assertEquals parameters order 2016-02-15 14:39:03 +01:00
Flavio Copes
1e6e9bbbb4 Merge branch 'develop' into feature/blueprints-update 2016-02-15 10:57:01 +01:00
Matias Griese
a4c817147b Merge branches 'develop' and 'feature/blueprints-update' of https://github.com/getgrav/grav into feature/blueprints-update 2016-02-15 11:20:08 +02:00
Matias Griese
ed3c1c7b3a Blueprint extend: reverse order of the multi-extend 2016-02-15 11:19:46 +02:00
Flavio Copes
a1d0494ea2 Test adding media queries 2016-02-14 08:58:31 +01:00
Andy Miller
16889cac31 Merge pull request #671 from rkusa/patch-1
fix lighttpd config
2016-02-12 18:05:26 -07:00
Andy Miller
afc0559d68 log error on invalid slug - only when setting the value from frontmatter 2016-02-12 17:51:20 -07:00
Andy Miller
59b75a339c sort strings naturally and case insensitively #643 2016-02-12 17:36:08 -07:00
Andy Miller
7a1d9e454b Add support for custom page-level dateformat field (core only) 2016-02-12 15:33:23 -07:00
Markus Ast
788c54ea9c fix lighttpd config 2016-02-12 14:49:06 +01:00
Matias Griese
1cfc778467 Composer update 2016-02-12 09:32:38 +02:00
Matias Griese
afd680b133 Merge branch 'develop' of https://github.com/getgrav/grav into feature/blueprints-update
# Conflicts:
#	composer.lock
2016-02-12 09:32:24 +02:00
Andy Miller
3a46dc3dcd fixed some extraneous spaces 2016-02-11 18:05:05 -07:00
Andy Miller
7b6cadbeeb Merge branch 'release/1.0.10' 1.0.10 2016-02-11 15:37:25 -07:00
Andy Miller
0b361c3790 Merge branch 'release/1.0.10' into develop 2016-02-11 15:37:25 -07:00
Andy Miller
bf91d13222 version update 2016-02-11 15:37:14 -07:00
Andy Miller
0bd60d24b7 updated libraries 2016-02-11 15:28:57 -07:00
Andy Miller
864f14344e Add method to get contentMeta and initialize content if needed 2016-02-11 12:59:46 -07:00
Flavio Copes
b50ebba477 Merge branch 'develop' into feature/blueprints-update 2016-02-11 20:10:06 +01:00
Matias Griese
81e25e314b Hide streams blueprint from admin 2016-02-11 20:55:48 +02:00
Flavio Copes
028554dbf8 Fix languages in Grav 2016-02-11 16:27:34 +01:00
Flavio Copes
bda8de3076 Typo 2016-02-11 16:27:34 +01:00
Andy Miller
36be17617d use old cache_id mechanism for safety 2016-02-10 22:48:04 -07:00
Andy Miller
bb23f6157f Support content level meta data .. so you can store things in cache alongside content 2016-02-10 22:44:54 -07:00
Flavio Copes
39ac423bce Merge pull request #665 from gracix/Add-Language-Ja
Add Ja language file.
2016-02-09 08:23:50 +01:00
Takefumi Ota
39b1eed912 Add Ja language file. 2016-02-09 10:27:57 +09:00
Andy Miller
360286f3d4 moved build status 2016-02-06 17:53:43 -07:00
Djamil Legato
88c84ed028 Updated auth token (and kicking of unit tests) 2016-02-05 16:10:51 -08:00
Djamil Legato
f03a7ced06 Check if php version starts with 5.6 for the release 2016-02-05 15:32:51 -08:00
Andy Miller
5605b69844 Merge branch 'release/1.0.9' into develop 2016-02-05 16:00:23 -07:00
Andy Miller
652c5cd4bd Merge branch 'release/1.0.9' 1.0.9 2016-02-05 16:00:22 -07:00
Andy Miller
bfe3a7750e version update 2016-02-05 15:59:40 -07:00
Andy Miller
1d23d29485 Various PSR fixes 2016-02-05 12:39:04 -07:00
Andy Miller
3bec73049b Revert "use ConsoleCommand"
This reverts commit 990663cd60.
2016-02-05 12:35:32 -07:00
Andy Miller
cd7366ca8d removed unused stuff 2016-02-05 12:35:21 -07:00
Andy Miller
63812cc6b1 Use strict boolean compare 2016-02-05 12:26:29 -07:00
Andy Miller
de9b6df2c7 removed TODOs.. 2016-02-05 12:17:08 -07:00
Andy Miller
990663cd60 use ConsoleCommand 2016-02-05 12:11:57 -07:00