Commit Graph

2677 Commits

Author SHA1 Message Date
Matias Griese
c8f87f87ee Composer update on minimum toolbox version 2016-03-07 21:33:41 +02:00
Andy Miller
f11c7b40bb Merge branch 'develop' of https://github.com/getgrav/grav into develop 2016-03-07 11:44:58 -07:00
Andy Miller
5155d09765 Fix for corrupted downloads in inherited themes - https://github.com/getgrav/grav-plugin-admin/issues/437 2016-03-07 11:44:45 -07:00
Matias Griese
9a83977913 Merge remote-tracking branch 'origin/develop' into develop 2016-03-07 20:27:29 +02:00
Matias Griese
10a89cf4e7 Expose the active theme metadata and configuration through the grav.theme object (#720) 2016-03-07 20:27:22 +02:00
Andy Miller
a87315c57d updated with stable toolbox 2016-03-07 11:17:33 -07:00
Flavio Copes
0dc9070f2e Update composer.lock 2016-03-07 19:01:21 +01:00
Flavio Copes
cee512c585 Fix issue installing a new plugin 2016-03-07 18:38:31 +01:00
Matias Griese
e9c46e7ace Merge branches 'develop' and 'feature/blueprints-update' of https://github.com/getgrav/grav into develop 2016-03-07 14:58:02 +02:00
Flavio Copes
2f1f48b9b2 Improve command line flow to install packages and dependencies 2016-03-06 17:26:15 +01:00
Flavio Copes
db664b2762 Move common GPM methods from InstallCommand to Common\GPM\GPM. Move tests too 2016-03-06 17:25:56 +01:00
Andy Miller
2db4b519c8 manually merged the newer user profile blueprint 2016-03-04 22:59:24 -07:00
Djamil Legato
d101ffe353 Merge branch 'feature/blueprints-update' of https://github.com/getgrav/grav into feature/blueprints-update 2016-03-04 17:03:10 -08:00
Djamil Legato
c304c40dbf Enable active line for frontmatter 2016-03-04 17:03:04 -08:00
Andy Miller
14353c50d8 added fragment support to URI #711 2016-03-04 16:33:18 -07:00
Andy Miller
42222d1be4 Merge branch 'develop' of https://github.com/getgrav/grav into develop 2016-03-04 15:44:51 -07:00
Andy Miller
9feebaaa69 user blueprint refactor 2016-03-04 15:44:32 -07:00
Flavio Copes
04aab610c9 Improve uninstall CLI flow 2016-03-04 19:18:34 +01:00
Flavio Copes
606c38b852 Move getPackagesThatDependOnPackage to Common/GPM/GPM 2016-03-04 19:18:34 +01:00
Andy Miller
400213fdf0 added an underline 2016-03-04 09:48:56 -07:00
Andy Miller
91222cb32b Fixed an issue with Retina alternatives not clearing properly between repeat uses. 2016-03-03 19:31:26 -07:00
Matias Griese
3a5d92db1f Merge remote-tracking branch 'origin/feature/blueprints-update' into feature/blueprints-update 2016-03-03 21:07:55 +02:00
Matias Griese
b040596aab Composer update (input@: false property for blueprints) 2016-03-03 21:07:44 +02:00
Djamil Legato
d95881e535 Merge branch 'feature/blueprints-update' of https://github.com/getgrav/grav into feature/blueprints-update 2016-03-03 10:56:04 -08:00
Djamil Legato
7fe50f454e Updated yamls in view of the new admin 2016-03-03 10:55:50 -08:00
Matias Griese
b58cce573a Merge remote-tracking branch 'origin/feature/blueprints-update' into feature/blueprints-update 2016-03-03 20:52:21 +02:00
Matias Griese
ed0d562a3e Remove todos from code 2016-03-03 20:52:10 +02:00
Andy Miller
76f9d85360 Merge branch 'develop' into feature/blueprints-update 2016-03-03 11:39:14 -07:00
Flavio Copes
faac7eb783 Fix issue with updating dependencies packages of type ignore, do not halt the process if not updated 2016-03-03 16:34:01 +01:00
Matias Griese
e0c579d513 Fix plugin/theme names in admin 2016-03-03 15:26:01 +02:00
Matias Griese
7e4f4319d5 Minor refactoring 2016-03-03 15:16:33 +02:00
Matias Griese
d573ebbfe3 Code review: Minor fixes and todos 2016-03-03 14:15:29 +02:00
Matias Griese
99bd25f805 Add streams support for Filesystem\Folder class 2016-03-02 20:58:34 +02:00
Matias Griese
48cabb19e7 Composer update, fixes saving pages 2016-03-02 12:50:50 +02:00
Matias Griese
30f15682e1 Merge branches 'develop' and 'feature/blueprints-update' of https://github.com/getgrav/grav into feature/blueprints-update 2016-03-02 10:13:26 +02:00
Andy Miller
c8cc861b94 Added GravTrait back to ensure 3rd party CLI plugins don't break. 2016-03-01 16:08:39 -07:00
Matias Griese
207e07876f Fix blueprints bug in bin/grav 2016-03-01 21:51:29 +02:00
Matias Griese
830cd5c172 Merge branches 'develop' and 'feature/blueprints-update' of https://github.com/getgrav/grav into feature/blueprints-update
# Conflicts:
#	composer.lock
2016-03-01 21:14:21 +02:00
Djamil Legato
e784b13bdf Minor adjustments to the repository URL for GPM 2016-03-01 10:20:27 -08:00
Matias Griese
091a727fe1 Fix plugin installation from GPM 2016-03-01 20:14:03 +02:00
Andy Miller
8a11269ccd various vendor updates 2016-03-01 10:34:50 -07:00
Andy Miller
ed68714302 updated composer 2016-03-01 10:34:34 -07:00
Matias Griese
3196122f4e Restore old blueprints from develop 2016-03-01 19:14:11 +02:00
Matias Griese
5a4fec7825 Merge branch 'develop' of https://github.com/getgrav/grav into feature/blueprints-update 2016-03-01 19:11:34 +02:00
Matias Griese
ca064d2abc Fix fatal error in GPM\Remote\Plugins|Themes 2016-03-01 15:03:12 +02:00
Matias Griese
9bdccbf2ef Merge branch 'develop' of https://github.com/getgrav/grav into feature/blueprints-update 2016-03-01 14:56:45 +02:00
Flavio Copes
cdef2e105d Fix error with self::getGrav() call 2016-03-01 13:55:41 +01:00
Matias Griese
c5c16fc24d Composer update 2016-03-01 14:55:36 +02:00
Flavio Copes
ffcfd7df6b Merge pull request #682 from getgrav/feature/dependencies
WIP - Versions in dependencies
2016-03-01 11:36:33 +01:00
Flavio Copes
0d77e31036 Changing the month, the monthize() results changed. Take that into account for tests 2016-03-01 11:33:21 +01:00