Commit Graph

7920 Commits

Author SHA1 Message Date
Gert
96b2b327b2 reset on construct 2015-04-01 16:51:24 +02:00
Gert
e014b12626 thumbnail selection fixes 2015-04-01 16:17:10 +02:00
Gert
d473f72edd remove debugger line 2015-04-01 16:14:18 +02:00
Andy Miller
7139425812 Merge pull request #161 from Gertt/feature-multimedia
Media overhaul
2015-03-31 15:00:49 -06:00
Gert
f5722d7baa Merge branch 'develop' of github.com:getgrav/grav into feature-multimedia
* 'develop' of github.com:getgrav/grav:
  switched to && operator
  Moved default image quality to defines.php
  Missing 'quality' in valid image functions
  updated version
  updated version
  updated changelog
  Fix for issue #158 - load order with debugger on
  Added support for external URL in directs
  more description for separator
  Serve images as static files
  Corrected HTML output of links with empty HTML anchors
  Changed Twig Link Regex which fixes #149 [Markdown Doesn't Handle [words](#)]

Conflicts:
	system/src/Grav/Common/Page/Medium.php
2015-03-31 22:58:24 +02:00
Gert
467eb00f0f rename factory to mediumfactory 2015-03-31 22:52:41 +02:00
Gert
0ce3646977 use style for static resize 2015-03-31 22:50:55 +02:00
Gert
53dd6c0860 multimedia refactor finishing touches 2015-03-31 21:23:14 +02:00
Andy Miller
e4a130c919 switched to && operator 2015-03-28 14:52:35 -06:00
Andy Miller
0d9ddb92d5 Moved default image quality to defines.php 2015-03-26 11:32:17 -06:00
Andy Miller
68a561d4fb Missing 'quality' in valid image functions 2015-03-26 11:24:22 -06:00
Andy Miller
5e651dd0e5 Merge branch 'release/0.9.20' 0.9.20 2015-03-24 17:31:39 -06:00
Andy Miller
1bb2965916 Merge tag '0.9.20' into develop
Release v0.9.20
2015-03-24 17:31:39 -06:00
Andy Miller
4ea650fc6d updated version 2015-03-24 17:31:24 -06:00
Andy Miller
501b38c4ba updated version 2015-03-24 17:30:30 -06:00
Andy Miller
ede958bd61 updated changelog 2015-03-24 17:29:44 -06:00
Andy Miller
f3d099e655 Fix for issue #158 - load order with debugger on 2015-03-19 23:29:45 -06:00
Andy Miller
db5c3ea400 Added support for external URL in directs 2015-03-16 21:10:31 -06:00
Andy Miller
504f57930a Merge pull request #151 from rzimin/patch-1
Serve images as static files
2015-03-16 18:59:27 -06:00
Andy Miller
02b1b2cf9d 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:
  Corrected HTML output of links with empty HTML anchors
  Changed Twig Link Regex which fixes #149 [Markdown Doesn't Handle [words](#)]
2015-03-12 17:09:15 -06:00
Andy Miller
99dbb3225b more description for separator 2015-03-12 17:08:33 -06:00
rzimin
08a8d69be2 Serve images as static files
Ensure images are served as static files when using Nginx
2015-03-12 13:34:46 +03:00
Andy Miller
a029f89ad2 Merge pull request #150 from Sommerregen/bugfix/parsedown-handle-empty-html-anchors
Changed Twig Link Regex which fixes #149 [Markdown Doesn't Handle [words](#)
2015-03-08 19:17:16 -06:00
Sommerregen
ed02fed866 Corrected HTML output of links with empty HTML anchors 2015-03-08 20:01:30 +01:00
Sommerregen
06de6c8e17 Changed Twig Link Regex which fixes #149 [Markdown Doesn't Handle [words](#)] 2015-03-08 19:24:48 +01:00
Gert
9ddfcd2154 Merge branch 'develop' of github.com:getgrav/grav into feature-multimedia
* 'develop' of github.com:getgrav/grav:
  updated changelog
  Added async and defer loading of JavaScript files
  Updated web.config  - Assets accesible
  fixed date
  version update
  removed some unused vars
  Removed some duplicate code via a trait
  Broke out iterators into their own class files
  only use files for last modified, so children don't affect the modified time of their parent page
  prevent a page from taken it's parent into account when detecting modified time
  Fixed `nth()` and added `first()` `last()` and `reverse()` methods
  Revert "Replace constant with streams. (need for multisite)."
  Replace constant with streams. (need for multisite).
2015-03-02 22:52:18 +01:00
Andy Miller
217e5e5a2c Merge branch 'develop' of https://github.com/getgrav/grav into develop
# By Vivalldi
# Via Andy Miller (1) and Vivalldi (1)
* 'develop' of https://github.com/getgrav/grav:
  Updated web.config  - Assets accesible
2015-03-02 11:09:54 -07:00
Andy Miller
272bf357d4 updated changelog 2015-03-02 11:06:14 -07:00
Andy Miller
9a5d14aa13 Added async and defer loading of JavaScript files 2015-03-02 11:03:21 -07:00
Andy Miller
2b70b2ad4f Merge pull request #148 from Vivalldi/patch-1
Updated web.config  - Assets accesible
2015-03-02 10:33:10 -07:00
Vivalldi
9323385b25 Updated web.config - Assets accesible
The system/assets folder is accessible except for .txt .md .html .yaml .php .twig .sh .bat files.
2015-03-02 12:30:46 -05:00
Andy Miller
fe90204772 Merge branch 'release/0.9.19' 0.9.19 2015-03-01 15:30:15 -07:00
Andy Miller
1b66e3d2a1 fixed date 2015-03-01 14:48:13 -07:00
Andy Miller
a2e1b9e100 Merge branch 'release/0.9.19' 2015-02-28 17:53:09 -07:00
Andy Miller
74ab81b524 Merge branch 'release/0.9.19' into develop 2015-02-28 17:53:09 -07:00
Andy Miller
01be2df935 version update 2015-02-28 17:52:55 -07:00
Andy Miller
62e5ea3bbd removed some unused vars 2015-02-28 14:14:20 -07:00
Andy Miller
b8c274b7b8 Removed some duplicate code via a trait 2015-02-28 14:13:59 -07:00
Andy Miller
e154b13b6e Broke out iterators into their own class files 2015-02-28 13:56:53 -07:00
Andy Miller
0f312a3c43 Merge pull request #146 from Gertt/develop
fix for last modified time detection of page
2015-02-27 16:17:48 -07:00
Gert
d8823a6b3a only use files for last modified, so children don't affect the modified time of their parent page 2015-02-27 23:29:23 +01:00
Gert
73d5f9da90 prevent a page from taken it's parent into account when detecting modified time 2015-02-27 22:16:59 +01:00
Andy Miller
7707b042e5 Fixed nth() and added first() last() and reverse() methods 2015-02-26 19:28:34 -07:00
Gert
ff95a116c2 Merge branch 'develop' of github.com:getgrav/grav into feature-multimedia
* 'develop' of github.com:getgrav/grav: (21 commits)
  Added initial named-assets implementation
  version update
  Update README.md
  Added optional deep option. defaults to false
  Added more flexible param separator option
  PSR camelCase fix
  missed a logical operator
  Fix camelCase method
  removed function in loop
  removed some commented out code
  removed unused vars
  Removed unused `use` statements
  rename fixme to todo
  remove fixme
  Object type hints
  strict boolean compare
  PSR fixes
  Strict boolean compares
  Some insight fixes
  Added new random string static and twig function
  ...
2015-02-24 21:40:59 +01:00
Andy Miller
2fe6dda365 Added initial named-assets implementation 2015-02-23 16:30:52 -07:00
Gert
f30a3c137e define new types 2015-02-22 00:01:55 +01:00
Gert
a5d31e7187 allow duplicated actions and follow medium on action 2015-02-22 00:01:44 +01:00
Gert
73c42313fa media overhaul 2015-02-22 00:00:52 +01:00
Andy Miller
686ba8a3f6 Merge branch 'release/0.9.18' into develop 2015-02-19 16:59:41 -07:00
Andy Miller
3397d5d2b7 Merge branch 'release/0.9.18' 0.9.18 2015-02-19 16:59:40 -07:00