Commit Graph

3707 Commits

Author SHA1 Message Date
Andy Miller
83d606c34a remove fixme 2015-02-18 12:37:39 -07:00
Andy Miller
1f906326e7 Object type hints 2015-02-18 12:37:19 -07:00
Andy Miller
ec67bf4c5b strict boolean compare 2015-02-18 12:37:00 -07:00
Andy Miller
127fe7fa2a PSR fixes 2015-02-18 12:36:30 -07:00
Andy Miller
e0de6f8b5f Strict boolean compares 2015-02-18 12:36:19 -07:00
Andy Miller
e81e35b7c2 Some insight fixes 2015-02-18 12:24:35 -07:00
Andy Miller
9bc365fe9e Added new random string static and twig function 2015-02-17 15:44:34 -07:00
Gert
21772c5481 Merge branch 'develop' of github.com:getgrav/grav into feature-multimedia
* 'develop' of github.com:getgrav/grav: (31 commits)
  Some performance optimizations for folder/file checking routines
  now checks for symlink availability before giving that option
  updated bundled composer package
  Backup pages folder if it exits in demo copy
  Fix rcopy reference
  Fix for issue #140 - plugin/theme install status not working on windows
  added a space after prompt
  Look for `_demo` content in packages and prompt to install it
  Use rcopy from Utils class
  Set package_type for unknown packages based on best guess
  Added recursive folder copy
  Don't critically fail, only log when plugin has config but is missing
  added repo URL to output
  text addition
  some corner case fixes
  Added symlink + git clone installation methods
  beginning of dependency work
  move timezone setting to after Config's `init()` method
  added timezone override support
  added a twig processTemplate() method
  ...

Conflicts:
	system/src/Grav/Common/Markdown/ParsedownGravTrait.php
	system/src/Grav/Common/Page/Media.php
	system/src/Grav/Common/Page/Medium.php
2015-02-17 20:41:49 +01:00
Andy Miller
7b32cbe2e1 Some performance optimizations for folder/file checking routines 2015-02-17 11:22:35 -07:00
Andy Miller
04a2f618bd now checks for symlink availability before giving that option 2015-02-16 18:48:52 -07:00
Andy Miller
73a104000a updated bundled composer package 2015-02-16 18:28:52 -07:00
Andy Miller
b8cb788324 Backup pages folder if it exits in demo copy 2015-02-16 14:46:05 -07:00
Andy Miller
690bb8a8be Fix rcopy reference 2015-02-16 14:45:21 -07:00
Andy Miller
26b0b02de2 Fix for issue #140 - plugin/theme install status not working on windows 2015-02-16 10:14:14 -07:00
Andy Miller
e5348ec8f1 added a space after prompt 2015-02-15 16:16:27 -07:00
Andy Miller
5e22eee1a8 Look for _demo content in packages and prompt to install it 2015-02-15 16:10:00 -07:00
Andy Miller
534bb57d3f Use rcopy from Utils class 2015-02-15 16:09:16 -07:00
Andy Miller
f8c203c033 Set package_type for unknown packages based on best guess 2015-02-15 16:08:53 -07:00
Andy Miller
300155e82e Added recursive folder copy 2015-02-15 16:08:24 -07:00
Andy Miller
3117a214d4 Merge branch 'feature/gpm_dependency' into develop 2015-02-15 15:30:25 -07:00
Andy Miller
9959868022 Don't critically fail, only log when plugin has config but is missing 2015-02-15 15:24:07 -07:00
Andy Miller
9248c5b709 added repo URL to output 2015-02-15 14:21:17 -07:00
Andy Miller
85fb5bccf3 text addition 2015-02-15 14:07:40 -07:00
Andy Miller
bd595ca9f6 some corner case fixes 2015-02-15 14:04:50 -07:00
Andy Miller
ace8823bd6 Added symlink + git clone installation methods 2015-02-15 13:37:51 -07:00
Sommerregen
5051b15145 Fix to merge nested page options with default plugin configurations 2015-02-15 21:20:20 +01:00
Andy Miller
1c1f2c268a beginning of dependency work 2015-02-14 22:33:50 -07:00
Andy Miller
545c76088c move timezone setting to after Config's init() method 2015-02-14 13:07:45 -07:00
Andy Miller
b418a7fd1e added timezone override support 2015-02-14 10:38:01 -07:00
Andy Miller
2938848df1 added a twig processTemplate() method 2015-02-13 11:35:21 -07:00
Andy Miller
17172f8920 added a contains() static method 2015-02-13 11:35:04 -07:00
Andy Miller
aeb237633e Merge pull request #139 from Zifius/patch-1
Update formatting to have blocks nesting less confusing
2015-02-10 17:01:31 -07:00
Andy Miller
d8a29dd639 Moved parsedown config into trait 2015-02-09 18:56:33 -07:00
Andy Miller
5c139e4b3c added a new markdown twig filter 2015-02-09 18:56:12 -07:00
Andy Miller
d69a0a9b06 minor naming updates 2015-02-09 16:35:02 -07:00
Andy Miller
07ce9c83ac changed getGrav() to static 2015-02-08 11:42:08 -07:00
Andy Miller
1d3559f0db Added a new filter to convert relative to absolute URLs 2015-02-07 12:21:40 -07:00
Andy Miller
be92a1da97 Merge pull request #141 from Gertt/patch-1
fix page ids not picking up folder-only pages
2015-02-07 09:56:54 -07:00
Gertt
97b430a888 Update Page.php 2015-02-07 17:55:46 +01:00
Gertt
b696e0d790 fix page ids not picking up folder-only pages 2015-02-07 17:47:58 +01:00
Gert
5b08a8605e various bugfixes, thumbnail support for files 2015-02-07 00:05:40 +01:00
Andy Miller
ab358dd820 Merge branch 'release/0.9.17' 0.9.17 2015-02-05 20:59:46 -07:00
Andy Miller
573b3227c7 Merge branch 'release/0.9.17' into develop 2015-02-05 20:59:46 -07:00
Andy Miller
50785c2434 version update 2015-02-05 20:59:23 -07:00
Andy Miller
fb9705809d HHVM fixes due to issues with traits and static variables #138 2015-02-05 15:07:31 -07:00
Alexander Turiak
1aeac01284 Update formatting to have blocks nesting less confusing 2015-02-05 12:43:49 +02:00
Gert
0cc35b56e5 Merge branch 'develop' of github.com:getgrav/grav into feature-multimedia
* 'develop' of github.com:getgrav/grav:
  Utilize new summary.delimiter setting rather than constant
  PSR fixes
  fix for markdown adding HTML tags into inline JS/CSS
  moved summary delimiter into site config
  fix for twig set capturing
  Moved to camels for plugins+themes as optional class naming type
  Added summary option
2015-02-04 22:39:47 +01:00
Gert
1423375312 enable markdown for any medium object and further cleanup 2015-02-04 22:39:34 +01:00
Gert
640ba16f8b fix alternatives detect 2015-02-04 22:38:24 +01:00
Andy Miller
d4e17442b2 Merge branch 'develop' of https://github.com/getgrav/grav into develop
# By Sommerregen
# Via Andy Miller (1) and Sommerregen (1)
* 'develop' of https://github.com/getgrav/grav:
  Added summary option
2015-02-02 17:27:04 -07:00