Commit Graph

669 Commits

Author SHA1 Message Date
Djamil Legato
bfb5a74197 Merge branch 'develop' into feature/gpm 2014-09-06 15:23:36 -07:00
Djamil Legato
cceaeb8d42 Manual merge from develop 2014-09-06 15:20:15 -07:00
Andy Miller
2a43983ede added onShutdown event that fires after the connection has been closed (background processing) 2014-09-06 14:32:21 -06:00
Andy Miller
cd5707f2d2 removed barDump() test :) 2014-09-06 13:31:34 -06:00
Andy Miller
5667f8b023 Added shutddown event to flush buffer and set content length (tracy-safe) 2014-09-06 13:29:56 -06:00
Andy Miller
09248f2917 Added barDump() to Debugger 2014-09-06 13:28:47 -06:00
Djamil Legato
162409053f Merge branch 'develop' into feature/gpm 2014-09-05 22:42:00 -07:00
Djamil Legato
528f85642f Reverted streams for theme 2014-09-05 22:39:26 -07:00
Djamil Legato
9d1b50ffbb Merge branch 'develop' into feature/gpm 2014-09-05 22:33:50 -07:00
Andy Miller
7a38ac0810 override modified only if a non-markdown file was modified 2014-09-05 22:25:48 -06:00
Andy Miller
0fec4c003b getList was returning nothing 2014-09-05 22:25:13 -06:00
Andy Miller
80d08eace7 fixes for themes streams and such 2014-09-05 20:52:46 -06:00
Djamil Legato
e7568bf8d0 Merge branch 'develop' into feature/gpm 2014-09-05 18:58:48 -07:00
Djamil Legato
353f69deb3 Merge branch 'develop' into feature/gpm 2014-09-05 18:55:51 -07:00
Djamil Legato
e2917e36f8 Fixed use of streams. Using YAML_EXT constant for the extension. Changed get and all methods to static 2014-09-05 18:51:14 -07:00
Djamil Legato
8ddfa571d3 Merge pull request #48 from rindeal/feature/config-fixes
fix for PHP warning "is_file(): open_basedir restriction in effect", round 2
2014-09-05 18:14:07 -07:00
Jan Chren
393c8cab2a final workaround for PHP bug 52065 2014-09-06 03:09:07 +02:00
Jan Chren
cb03c7ab0d Revert "reverted back to file-only checks, changed to file_exists()"
This reverts commit d234b8e212.
2014-09-06 00:46:59 +02:00
Andy Miller
bce0797c55 Merge pull request #47 from rindeal/feature/config-fixes
fix for PHP warning "is_file(): open_basedir restriction in effect"
2014-09-05 16:04:54 -06:00
Jan Chren
d234b8e212 reverted back to file-only checks, changed to file_exists() 2014-09-06 00:00:47 +02:00
Djamil Legato
481e61b08b Merge pull request #46 from rindeal/feature/configurable-assets-attributes
Feature/configurable assets attributes
2014-09-05 14:51:34 -07:00
Jan Chren
f8fe108db5 PHPDocs updated 2014-09-05 23:19:18 +02:00
Jan Chren
103abc5f6d assets attributes implemented 2014-09-05 23:11:02 +02:00
Djamil Legato
470bac23bc Removed vendors from the mapping in SetupCommand 2014-09-05 13:40:35 -07:00
Jan Chren
e5037eb69b json_encode() is faster than serialize()
ref: http://stackoverflow.com/a/7723730/2566213
2014-09-05 16:17:05 +02:00
Jan Chren
8da3eb32f0 fix for PHP warning "is_file(): open_basedir restriction in effect"
Example:
PHP Warning: is_file(): open_basedir restriction in effect. File(/home/users/.../user/plugins/.gitkeep/.gitkeep.yaml) is not within the allowed path(s): (/home/users/.../:/usr/share/pear/) in .../web/system/src/Grav/Common/Config.php:237
2014-09-05 15:46:18 +02:00
Djamil Legato
24d1d4774e Cleanup police: using traits for GPM 2014-09-04 20:34:36 -07:00
Djamil Legato
b0f37079b0 Removed unused var declaration 2014-09-04 20:33:22 -07:00
Djamil Legato
258f55fe96 Vendors get now installed via composer automatically through first run of GPM or Grav cli. 2014-09-04 16:29:10 -07:00
Djamil Legato
c8db29ce46 Removed copying of vendor/ since it's now vendor-free. Install command will take care of it. 2014-09-04 16:26:04 -07:00
Djamil Legato
8a4a810771 Fixed old setupCommand references 2014-09-04 16:19:24 -07:00
Djamil Legato
ea1c26caa3 Added more info for the BackupCommand help 2014-09-04 15:13:08 -07:00
Djamil Legato
0977d330e6 Reworded description and help of Install and NewProject commands 2014-09-04 14:48:58 -07:00
Djamil Legato
f7c2df0050 Renamed setup command to sandbox. 2014-09-04 14:48:24 -07:00
Andy Miller
0b0ce2eb27 Merge pull request #43 from rindeal/hotfix/debugger-mode
Some tiny fixes in Debugger
2014-09-04 11:50:18 -06:00
Jan Chren
cc81ea7e3e disable display_errors in production environment 2014-09-04 02:50:27 +02:00
Andy Miller
a0f5e35ad5 removed memcahed from the list of cache options 2014-09-03 17:54:50 -06:00
Andy Miller
971508f613 Removed memcache from auto setup, added memcache server config, removed memcached support 2014-09-03 17:49:55 -06:00
Jan Chren
144d64e0c8 detect mode only if debugger enabled 2014-09-04 00:29:45 +02:00
Jan Chren
a999046882 removed unused functions 2014-09-04 00:27:30 +02:00
Matias Griese
943921eadb Fix broken password validation 2014-09-03 21:19:16 +03:00
Matias Griese
0f87946276 Move new Blueprints class into RocketTheme\Toolbox 2014-09-03 19:13:57 +03:00
Matias Griese
9e032a7120 Fix wrong namespace declaration 2014-09-03 15:50:17 +03:00
Matias Griese
cb705f2d96 Remove debug message 2014-09-03 14:48:53 +03:00
Matias Griese
ac8483f894 Start using RocketTheme\Toolbox and remove local copies of the Toolbox classes 2014-09-03 14:34:40 +03:00
Matias Griese
30246a8666 Post merge fixes 2014-09-03 10:33:45 +03:00
Matias Griese
f606999c40 Merge branch 'develop' of https://github.com/getgrav/grav into feature/multi-config
Conflicts:
	composer.json
	system/config/streams.yaml
	system/src/Grav/Common/Page/Page.php
	system/src/Grav/Common/Theme.php
	system/src/Grav/Common/Themes.php
	system/src/Grav/Component/Filesystem/ResourceLocator.php
	vendor/autoload.php
	vendor/composer/autoload_classmap.php
	vendor/composer/autoload_files.php
	vendor/composer/autoload_real.php
	vendor/composer/installed.json
2014-09-03 10:33:02 +03:00
Matias Griese
affa768efb Ground work for allowing multiple configurations 2014-09-03 09:57:46 +03:00
Djamil Legato
615c91b1c5 Minor change in the output 2014-09-02 22:52:00 -07:00
Djamil Legato
a0bc5bf765 Added Update command that scans for installed extensions and look for available updates (as well as install them!) 2014-09-02 22:41:07 -07:00