Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-03-06 12:31:53 +01:00
Code Issues Packages Projects Releases Activity
3,503 Commits 9 Branches 318 Tags
22effeac4208fa3b3adda4a41af9c8ea6c00da80
Commit Graph

3503 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matias Griese
22effeac42 Move new Collection/Object classes into Grav\Framework 2017-04-13 12:04:14 +03:00
Matias Griese
0e77103883 Merge branches 'develop' and 'feature/objects' of https://github.com/getgrav/grav into feature/objects 
# Conflicts:
#	composer.lock
 2017-04-12 20:58:10 +03:00
Andy Miller
56e58f3b5e Return "" if no childType set rather than default 2017-04-12 10:28:55 -06:00
Andy Miller
619dc30aca Merge tag '1.2.2' into develop 
Release v1.2.2
 2017-04-11 14:21:16 -06:00
Andy Miller
5bc3ce07dc Merge branch 'release/1.2.2' 1.2.2 2017-04-11 14:21:15 -06:00
Andy Miller
0fe676c34b Preparing release 2017-04-11 14:21:03 -06:00
Andy Miller
60f97f27be Fix for redirects breaking #1420 2017-04-11 13:32:25 -06:00
Flavio Copes
1d7f41e4a8 Fix #1405 issue in direct-install with github-style dependencies 2017-04-11 11:30:27 +02:00
Andy Miller
3a97502219 Merge tag '1.2.1' into develop 
Release v1.2.1
 2017-04-10 18:36:59 -06:00
Andy Miller
ca09f789a7 Merge branch 'release/1.2.1' 1.2.1 2017-04-10 18:36:58 -06:00
Andy Miller
be94947d38 Prepare for release 2017-04-10 18:36:42 -06:00
Andy Miller
0a22ff0c68 Fixed changelog 2017-04-10 15:18:33 -06:00
Andy Miller
840a349ace Updated changelog 2017-04-10 15:18:10 -06:00
Andy Miller
b85e595bbb Little cleanup 2017-04-10 12:10:55 -06:00
Josh Weiss
082d4e3435 Ancestor and Inherited functions for Page & Pages (#1362) 
* Ancestor and inherited functions for Page & Pages

Addes both helper methods to `Grav\Common\Page` and Grav instance utility functions to `Grav\Common\Pages`.

* Ancestor Page return considering field criteria

* Updates according to code review issue

Made changes to act on current Page object only for the Page functions

Changed variable name to better reflect the intention of the passed param for the Pages class functions

* Simplify duplicate code

* Simplify Pages logic

Simpilfied duplicate code. Also clarified  variable naming for similar functions.
 2017-04-10 12:00:58 -06:00
Andy Miller
bfb6b6d68a Updated changelog 2017-04-04 13:31:32 -06:00
Andy Miller
8dc2ced94c Fix for direct-install of plugins with languages.yaml #1396 2017-04-04 13:24:10 -06:00
OliverO2
f510e136c8 Add {'loading': 'inline'} option for Js and CSS assets (#1377) 
* Assets.php: Extract common functionaly of addCss() and addJs() into
  addTo(), make css() and js() honor $attributes['loading'],
  make pipelineCss() and pipelineJs() return generated content
  instead of URL depending on new option $returnURL.

* AssetsTest.php: Accept new 'loading' option for CSS, add tests for
  adding and pipelining local and remote assets with inline loading.
 2017-04-04 11:25:39 -06:00
Flavio Copes
4365662304 Add query string in lighttpd default config (#1393) 2017-04-04 08:54:48 -06:00
Gilles van Eeden
4aa6dce853 add function isajaxrequest() (#1400) 
* Update Taxonomy.php

* Update TwigExtension.php

* Update TwigExtension.php

Incorrect comment updated.

* Update TwigExtension.php

Add function ishuman() to detect agent disposition.

* Update TwigExtension.php

* Revert "Merge remote-tracking branch 'origin/develop' into develop"

This reverts commit 7a59a84290, reversing
changes made to 102973d22c.

* Revert "Revert "Merge remote-tracking branch 'origin/develop' into develop""

This reverts commit 50fc775c69.

* Attempt to resolve conflicts

* param comment corrected

* Update TwigExtension.php

* Update TwigExtension.php

* Update TwigExtension.php

* Update TwigExtension.php

* add isajaxrequest

Check HTTP_X_REQUESTED_WITH header. Non critical use only. Handy for
streamlining ajax presentation.

* remove ishuman

* remove Browser class
 2017-04-04 08:53:27 -06:00
Flavio Copes
d338d79acb When determining language from HTTP_ACCEPT_LANGUAGE, also try base language only (#1402) 
Fixes Safari sending the language code always with a locale (e.g. it-it
or fr-fr)
 2017-04-04 08:51:16 -06:00
Frédéric Potvin
459b7c4a33 Fix #1389 related to bin/gpm direct-install (#1397) 
Add --all-yes and --destination options

Fix a problem where temporary package files will not be
cleaned upon command error.
 2017-04-02 18:45:57 -06:00
Andy Miller
06e880de57 Fixed a bad method signature causing warning when running tests on GPMTest object 2017-04-01 22:13:43 -06:00
Djamil Legato
cbf3df4bf1 Trying using Gimme to switch Golang version 2017-03-31 11:30:58 -07:00
Andy Miller
aabc8aeb31 Merge branch 'release/1.2.0' 1.2.0 2017-03-31 11:28:48 -06:00
Andy Miller
3d1ed7118e Merge tag '1.2.0' into develop 
Release v1.2.0
 2017-03-31 11:28:48 -06:00
Andy Miller
ca4f6f3c5c Prepare for release 2017-03-31 11:28:34 -06:00
Andy Miller
3a645ab4a2 updated changelog 2017-03-31 11:09:40 -06:00
Andy Miller
25ba6198e5 switched to stable composer vendor libs 2017-03-31 11:09:29 -06:00
Andy Miller
6564ea98b1 Analysis fixes 2017-03-30 14:30:20 -07:00
Andy Miller
8fe018a7dd Add file upload for user avatar in admin profile 2017-03-29 22:43:26 -07:00
Hugh Barnes
5c40337ff0 CSS pipeline rewrite URL fix for webserver root-based paths (#1383) 
* Implement fix to not rewrite paths in CSS pipeline when CSS URLs use a path startng at webserver root (e.g. url('/path/to/asset')) - fixes #1382

* Amend CSS pipeline's resource location checking predicates to use Utils::startsWith, and consolidate into a single predicate

* Add back colon to data URL prefix test

Copy error in last commit would have broken any relative path beginning with the string 'data'
 2017-03-26 17:50:22 -07:00
Frédéric Potvin
41e7142dfc [#1200] Clarified install and direct-install (#1384) 
To help user that need to install specific version of a package.
So far it wasn't absolutely clear how to achieve and some
users ended up asking for help or opening issues asking
for the feature.
 2017-03-26 10:02:50 -07:00
Frédéric Potvin
f45362b5b5 Invite users to join Slack instead of Gitter (#1385) 
Since the team is now on Slack.
 2017-03-26 10:00:42 -07:00
Andy Miller
f8fbc82196 Prepare for release 1.2.0-rc.3 2017-03-22 17:30:00 -06:00
Andy Miller
c153039457 Fixed loading issues with improperly named themes #1373 2017-03-22 17:29:47 -06:00
Andy Miller
88ccc25c47 Added an admin only section for child ordering 2017-03-22 17:12:36 -06:00
Andy Miller
b8164d3fe6 changelog updated 2017-03-22 12:10:37 -06:00
Andy Miller
a1d4199e68 Merge branch 'feature/ordering-refactor' into develop 2017-03-22 12:09:47 -06:00
Andy Miller
30f8eca905 Allow Twig url() function to pass through external URLs 2017-03-22 12:04:24 -06:00
Andy Miller
ef7ff9ec4e Improved reorder logic and removed old logic 2017-03-21 20:20:08 -06:00
Andy Miller
0d471599d7 Changed logic for order handling 2017-03-21 15:35:16 -06:00
Andy Miller
13bc19f1e3 Moved debugger logic to avoid null page instances. 2017-03-20 15:25:41 -06:00
Andy Miller
da61196b7b Cleanup package files via GPM install to make them more windows-friendly #1361 2017-03-20 13:30:53 -06:00
Andy Miller
04e1710de1 Updated composer.json to pick up latest Gregwar Image library 2017-03-20 11:26:31 -06:00
Andy Miller
330a90b0ab Added language_codes to Twig init to allow for easy language name/code/native-name lookup 2017-03-20 10:36:26 -06:00
Andy Miller
5c34556246 Fix for page-level debugger override changing the option site-wide 2017-03-20 10:19:37 -06:00
Andy Miller
10a15ef33f Simplified some logic and fixed an issue with system-level process twig logic #1351 2017-03-19 21:24:46 -06:00
Andy Miller
4eebc81808 Merge branch 'develop' of https://github.com/getgrav/grav into develop 2017-03-18 13:54:29 -06:00
Andy Miller
cd37ea0689 Chaned image quality field to use new range field 2017-03-18 13:54:25 -06:00