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
Andy Miller
eb4eafd915
Utilize new summary.delimiter setting rather than constant
2015-02-02 17:25:51 -07:00
Andy Miller
dc65475723
PSR fixes
2015-02-02 17:25:24 -07:00
Andy Miller
3f33e97f0c
fix for markdown adding HTML tags into inline JS/CSS
2015-02-02 17:25:14 -07:00
Andy Miller
02508933d7
moved summary delimiter into site config
2015-02-02 17:24:41 -07:00
Andy Miller
89ebf2b011
Merge pull request #136 from Sommerregen/feature/added-summary-option
...
Added summary option
2015-02-02 17:23:00 -07:00
Andy Miller
c747c4baf7
fix for twig set capturing
2015-02-02 16:27:36 -07:00
Andy Miller
a3c848e4e2
Moved to camels for plugins+themes as optional class naming type
2015-02-02 13:08:56 -07:00
Andy Miller
f0585ddb4e
per-page debug setting not working as intended. Changing approaches...
2015-02-02 09:59:54 -07:00
Sommerregen
a6790cace3
Added summary option
2015-02-01 18:15:24 +01:00
Andy Miller
f244fc93c8
fix for using just defaults
2015-01-30 19:19:49 -07:00
Andy Miller
26ebb8fa6d
Merge branch 'release/0.9.16' into develop
2015-01-30 18:13:37 -07:00
Andy Miller
cb8ea7780f
version update
2015-01-30 18:13:25 -07:00
Andy Miller
5400bd3951
Added a page override support to media debug
2015-01-30 17:38:43 -07:00
Andy Miller
03521cd3f6
Some performance optimizations
2015-01-29 17:22:55 -07:00
Andy Miller
1eb0e37214
Merge pull request #133 from Sommerregen/feature/merge-config-and-disable-function-in-plugin.php
...
Added merge config and disable function in "Plugin.php"
2015-01-29 13:02:23 -07:00
Andy Miller
3e769618ec
some cleanup refactoring
2015-01-29 10:40:30 -07:00
Andy Miller
9319d5c0aa
PSR fixes
2015-01-29 10:27:10 -07:00
Andy Miller
eb94940df6
Merge pull request #132 from Sommerregen/feature/summary-options-and-query-support-in-assets
...
Added 'enabled' option for summary and fixed query support in assets
2015-01-29 10:23:59 -07:00
Sommerregen
a4c8c53939
Added 'enabled' option for summary and fixed query support in assets
2015-01-29 16:57:46 +01:00
Sommerregen
567dd0d2c6
Added merge config and disable function in "Plugin.php"
2015-01-29 16:51:17 +01:00
Andy Miller
25c44816c0
moved cached images from image:// to cache://images
2015-01-28 10:01:20 -07:00
Andy Miller
1a692b348e
some minor cleanup
2015-01-27 21:27:42 -07:00
Andy Miller
17ed48e677
PSR Fixes
2015-01-27 17:37:58 -07:00
Andy Miller
685033bb02
Went back to using regular image:// stream
2015-01-27 17:31:41 -07:00
Andy Miller
b86c982ba1
Updated to use new image cache stream and add width/height back to link
2015-01-27 17:24:21 -07:00
Andy Miller
a0148f36fd
added image cache stream
2015-01-27 17:22:06 -07:00
Andy Miller
b88de0cd3b
Merge pull request #131 from namaless/bugfix/medium_fix_locator_unused_vars_phpdoc
...
Bug fixes phpdoc/missed vars/locator.
2015-01-27 17:00:11 -07:00
Pereira Ricardo
3207efd383
Add again the width and height params for lightbox method.
2015-01-28 00:55:12 +01:00
Pereira Ricardo
31dd235b50
Add missed streams for images and system folders. Fixed problem with images link when you use user/images folder instead /images folder.
2015-01-28 00:39:24 +01:00
Pereira Ricardo
bb1cdb17f5
Typo fix.
2015-01-27 23:40:41 +01:00
Pereira Ricardo
f35287cb7a
- Removed unused variables.
...
- Add missed phpdoc params.
- Update constants with locator.
2015-01-27 23:36:43 +01:00
Andy Miller
391f7d3be4
Merge pull request #130 from Gertt/feature-responsive-images
...
Feature responsive images
2015-01-27 13:35:32 -07:00
Gert
76d0583b00
prevent double overlays on scaled media generation
2015-01-27 21:29:14 +01:00
Gert
7857568c92
update images
2015-01-27 21:28:59 +01:00
Gert
bfe94bc5d0
add option to show debug overlay on images
2015-01-27 21:18:16 +01:00
Gert
cf3bcf6d7f
fix double base url
2015-01-26 23:21:47 +01:00
Gert
d2aa775ee8
make cache names of generated images more informative by adding correct @#x suffix
2015-01-26 21:45:10 +01:00
Gert
ce800ccd92
fix lightbox issue
2015-01-26 21:31:47 +01:00
Gert
2c57453608
don't output srcset when only one image
2015-01-26 21:30:17 +01:00
Gert
03f729602b
refactor the way parsedown gets image data, this also fixes lightbox operations for markdown
2015-01-26 18:57:54 +01:00
Andy Miller
21f064b1d0
updated parsedown extra lib
2015-01-25 22:12:46 -07:00
Gert
b7f6b827e4
fix lightbox for responsive images
2015-01-26 03:18:17 +01:00
Gert
a33e2ed226
fix empty alternatives bug
2015-01-26 02:45:14 +01:00
Gert
ef7806b509
forgot to save after fixing merge conflict
2015-01-26 02:43:52 +01:00
Gert
e268cda1b5
Merge branch 'develop' of github.com:getgrav/grav into feature-responsive-images
...
* 'develop' of github.com:getgrav/grav:
fix for #129 markdown images not found when base_url == '/' on homepage
Conflicts:
system/src/Grav/Common/Markdown/ParsedownGravTrait.php
2015-01-26 02:42:48 +01:00
Gert
3ae5e3c569
refactor and create missing versions of medium
2015-01-26 02:40:34 +01:00
Andy Miller
304c7519d1
fix for #129 markdown images not found when base_url == '/' on homepage
2015-01-25 18:33:24 -07:00
Gert
a4a8a422a5
fix for base url error
2015-01-25 23:48:58 +01:00
Gert
6700003dd2
generate @1x image when user provides only @2x
2015-01-25 23:11:23 +01:00