Commit Graph

3707 Commits

Author SHA1 Message Date
Flavio Copes
7e540e0623 Merge branch 'develop' into feature/introduce-user-groups
Use the new isPositive() method to check permissions
2015-10-28 11:00:48 +01:00
Flavio Copes
f7140522f6 Merge pull request #388 from littmus/develop
Typo fixed
2015-10-28 09:56:02 +01:00
littmus
bd2f7088e9 Typo fixed 2015-10-28 17:55:23 +09:00
hwmaier
5260c181a1 Asset management uses now streams rather the constant ASSETS_DIR to configure location. In addition it supports subdirectories for assets location, for example assets/runtime. 2015-10-28 13:15:03 +10:00
Andy Miller
a9538adf2b Merge branch 'release/1.0.0-rc.2' into develop 2015-10-27 14:47:43 -06:00
Andy Miller
8bba0fd332 Merge branch 'release/1.0.0-rc.2' 1.0.0-rc.2 2015-10-27 14:47:43 -06:00
Andy Miller
abf6d6638e version update 2015-10-27 14:47:27 -06:00
Andy Miller
36e52146f5 changelog updated 2015-10-27 12:35:29 -06:00
Flavio Copes
24eaa24839 Check that label is set prior to access it 2015-10-27 18:30:54 +01:00
Flavio Copes
fafd72fcd8 Add a items() method that returns the Data::items array 2015-10-27 18:30:54 +01:00
Andy Miller
df9b219a16 Merge pull request #386 from hwmaier/feature/onTwigPageVariables
onTwigPageVariables event handler gets Page object passed as Event parameter
2015-10-27 09:49:47 -06:00
hwmaier
5c9c378889 onTwigPageVariables event handler gets Page object passed 2015-10-27 23:04:21 +10:00
Andy Miller
47e1eab6c1 updated bundled composer.phar 2015-10-26 17:31:48 -06:00
Andy Miller
d88f56316d updated changelog 2015-10-26 17:15:25 -06:00
Andy Miller
8b414c388d wrapped_site option in system.yaml 2015-10-26 17:14:58 -06:00
Flavio Copes
acb828eacf Merge pull request #382 from tbreuss/develop
Use of capital and small initial letters
2015-10-26 20:40:31 +01:00
Thomas Breuss
293dfad87e Use of capital and small initial letters 2015-10-26 19:35:08 +01:00
Andy Miller
e4e1927126 Merge pull request #381 from getgrav/feature/check-positive-value
Check a positive value, not just "true"
2015-10-26 11:53:31 -06:00
Flavio Copes
edf6f86cb5 Add a Utils::isPositive(). Use that. 2015-10-26 18:29:22 +01:00
Flavio Copes
d086664a61 Check a positive value, not just "true" 2015-10-26 18:06:28 +01:00
Flavio Copes
b0c171f453 Merge branch 'develop' into feature/introduce-user-groups 2015-10-26 17:48:53 +01:00
Andy Miller
feed15f75b changelog update 2015-10-25 18:46:07 -06:00
Andy Miller
95fd54d909 Moved grav variable into globals and removed from template variables 2015-10-25 16:49:28 -06:00
Andy Miller
79f6380aae improved merging of meta tags into title/alt/class 2015-10-25 16:43:52 -06:00
Andy Miller
8478d690a0 Optimizations to the TAG regex handling for inline CSS/JS 2015-10-25 16:20:01 -06:00
Andy Miller
5db8197db2 use a regex to remove surrounding tags but not inline ones! #376 2015-10-24 22:35:44 -06:00
Andy Miller
8407e5b295 Metadata return a new Data object so nulls are possible #375 2015-10-24 16:01:22 -06:00
Andy Miller
3e3b4548e9 Fix for inline JS and HTML entities #376 2015-10-24 15:21:25 -06:00
Andy Miller
868a61dd34 Fail quietly if file doesn't exist 2015-10-24 14:53:16 -06:00
Andy Miller
a7a5625a8b Revert "Added CSS Group asset support #374"
This reverts commit f65633043a.
2015-10-24 12:19:47 -06:00
Andy Miller
a614c8c7cc Added CSS Group asset support #374 2015-10-24 12:19:22 -06:00
Andy Miller
f65633043a Added CSS Group asset support #374 2015-10-24 12:18:54 -06:00
Djamil Legato
de61d88d29 Synced travis.yml 2015-10-23 16:11:26 -07:00
Djamil Legato
dc57bef5f3 Merge branch 'release/1.0.0-rc.1' 1.0.0-rc.1 2015-10-23 14:44:38 -07:00
Djamil Legato
9d86c0a9db Merge tag '1.0.0-rc.1' into develop
Release v1.0.0-rc.1
2015-10-23 14:44:38 -07:00
Djamil Legato
2721bb511a Quoting tag for github release 2015-10-23 14:02:52 -07:00
Andy Miller
1e07cb9b5b Merge branch 'release/1.0.0-rc.1' 2015-10-23 14:52:35 -06:00
Andy Miller
39a4a1e9bf Merge branch 'release/1.0.0-rc.1' into develop 2015-10-23 14:52:35 -06:00
Andy Miller
7a56a361a0 version update 2015-10-23 14:52:22 -06:00
Andy Miller
d54359d441 missing semicolons in safeEmailFilter() 2015-10-23 14:12:06 -06:00
Andy Miller
98d0538868 Option to allow all hidden files/folders #306 2015-10-23 10:23:01 -06:00
Andy Miller
f03921690c Created system option for redirect code + allowed [30x] syntax on redirect urls 2015-10-22 14:37:38 -06:00
Andy Miller
46869de29c don't do work if there are no assets found 2015-10-21 18:08:24 -06:00
Andy Miller
b7b29b3f84 Broke out pipeline into two methods for simplicity 2015-10-21 18:03:01 -06:00
Andy Miller
b9e1d9af6e Fix for broken CSS caused by variable overwriting 2015-10-21 17:38:13 -06:00
Andy Miller
edf313a7a2 Fix for empty pipeline asset file 2015-10-21 17:21:14 -06:00
Andy Miller
4f22d1c918 Fix for #373 - pipeline not respecting asset groups 2015-10-21 16:06:56 -06:00
Flavio Copes
67fefb53ad Allow to filter pages by access level 2015-10-21 19:47:06 +02:00
Flavio Copes
0ff5dc0016 Add accessLevels to return the used page access levels 2015-10-21 18:41:34 +02:00
Flavio Copes
ae17a77789 Use config/groups.yaml instead of config/site.yaml 2015-10-21 17:47:39 +02:00