Flavio Copes
df7a94148b
Merge branch 'develop' into feature/introduce-user-groups
2015-11-26 12:14:48 +01:00
Flavio Copes
63890661fe
Add security.yaml to the ignored files
2015-11-26 11:55:13 +01:00
Flavio Copes
793ac1a1bb
Revert "no message"
...
This reverts commit b259927348
2015-11-26 11:54:05 +01:00
Flavio Copes
77db54c50d
Revert "If the page does not exist trigger a 404"
...
This reverts commit 8d8420c0d6
2015-11-26 11:53:27 +01:00
Andy Miller
b259927348
no message
2015-11-25 15:42:11 -07:00
Andy Miller
e8972a6aa5
vendor updates
2015-11-25 15:41:53 -07:00
Flavio Copes
8d8420c0d6
If the page does not exist trigger a 404
2015-11-25 22:30:45 +01:00
Flavio Copes
7a6707f597
Merge pull request #473 from getgrav/feature/allow-multiple-plurals
...
Handle languages that support _PLURAL_MORE_THAN_TWO
2015-11-25 17:42:37 +01:00
Djamil Legato
b0ec66cce8
Merge pull request #475 from nazwa/lists-patch
...
Proper handling of list fields
2015-11-24 15:51:58 -08:00
Maciej Ka
edfd7db88b
pretty & clean
2015-11-24 23:48:22 +00:00
Maciej Ka
fb3e68e16e
removed old parameters
2015-11-24 23:34:47 +00:00
Maciej Ka
080ab9e289
Fixed conflict caused by w00fz quickfix
2015-11-24 23:17:37 +00:00
nazwa
f67e441b83
Merge pull request #1 from getgrav/develop
...
Fixed nested logic for lists and forms parsing (fixes #273 )
2015-11-24 23:13:47 +00:00
nazwa
9c07d69c45
Proper handling of list fields
...
Moved field handling to a separate function and added logic to correctly process nested lists.
2015-11-24 23:02:42 +00:00
Djamil Legato
13207f13ad
Fixed nested logic for lists and forms parsing ( fixes #273 )
2015-11-24 14:57:05 -08:00
Flavio Copes
34f83ebde2
Use the new security salt to calculate the nonce instead of using password_hash
2015-11-24 21:13:46 +01:00
Flavio Copes
14ed805656
Merge branch 'develop' into feature/introduce-user-groups
2015-11-24 21:00:08 +01:00
Matias Griese
385233c508
Automatically create unique security salt for each configuration
2015-11-24 21:14:46 +02:00
Flavio Copes
8a3b987cd5
Merge branch 'develop' into feature/introduce-user-groups
2015-11-24 19:45:04 +01:00
Andy Miller
bdd17fc56a
Moving back to release version of Toolbox
2015-11-24 10:06:41 -07:00
Andy Miller
29b3c081ee
Merge branch 'feature/refactor' into develop
2015-11-24 09:59:51 -07:00
Andy Miller
b1d80b6c5f
Merge branch 'develop' into feature/refactor
2015-11-24 09:59:33 -07:00
Flavio Copes
e00560f81a
Handle languages that support _PLURAL_MORE_THAN_TWO
...
Ex. WEEK_PLURAL, WEEK_PLURAL_MORE_THAN_TWO
2015-11-24 15:18:10 +01:00
Flavio Copes
20f17130a2
Add the IP address of the user to the nonce string calculation even if it's logged in
2015-11-24 15:17:08 +01:00
Flavio Copes
583156d2f3
Handle multiple nonce action types per page
2015-11-24 09:03:48 +01:00
Andy Miller
88f36f4987
Merge branch 'develop' into feature/refactor
2015-11-23 19:08:46 -07:00
Andy Miller
965c8cfbe9
Only generate one nonce per process
2015-11-23 19:07:46 -07:00
Andy Miller
b8f00243e6
Make hash() public for future use
2015-11-23 19:07:12 -07:00
Andy Miller
1d97f98515
Made hash() public for future usage
2015-11-23 17:41:16 -07:00
Matias Griese
9764cf3f65
Sync CompiledFile class with Gantry
2015-11-23 11:00:28 +02:00
Matias Griese
1f5df81496
Sync Folder class with Gantry
2015-11-23 11:00:03 +02:00
Matias Griese
5f76a0255c
Merge branches 'develop' and 'feature/refactor' of https://github.com/getgrav/grav into feature/refactor
...
# Conflicts:
# CHANGELOG.md
# composer.lock
2015-11-23 09:48:30 +02:00
Flavio Copes
17f3ca6eba
Merge pull request #466 from tcsizmadia/develop
...
Updated system/languages/hu.yaml
2015-11-22 16:32:57 +01:00
Tamas Csizmadia
b29d79738b
Updated system/languages/hu.yaml
...
Tweaked translation for 'ago' - sounds less weird.
2015-11-22 12:34:44 +01:00
Andy Miller
020cdd7324
Merge pull request #464 from tcsizmadia/develop
...
Hungarian translation in system/languages/hu.yaml
2015-11-21 22:04:51 -07:00
Andy Miller
1e39f3b22d
Merge pull request #465 from MAT978/patch-1
...
Update fr.yaml
2015-11-21 22:04:45 -07:00
Djamil Legato
37035a488d
Fixed bin/plugin help output
2015-11-21 20:53:11 -08:00
Marc-Antoine Thevenet
745b418cd7
Update fr.yaml
...
update based on the version: en
Nov 17, 2015
2015-11-21 21:47:21 -04:00
Tamas Csizmadia
2a02c8bc4f
Hungarian translation in system/languages/hu.yaml
2015-11-21 21:53:03 +01:00
Flavio Copes
a15e063b92
Merge branch 'develop' into feature/introduce-user-groups
2015-11-21 16:52:51 +01:00
Andy Miller
2051fed5b7
Merge pull request #458 from benblee/patch-1
...
Prevent crawling of unnecessary directories
2015-11-20 19:57:45 -07:00
Ben Lee
268714863e
Prevent crawling of unnecessary directories
...
Prevent search engines from crawling and indexing unnecessary files and directories. The "/user/plugins/" directory may need to be added to the Allow list if plugins use frontend accessible assets. This is tested at a basic level using Google Fetch and Render.
2015-11-20 19:33:24 -07:00
Andy Miller
60c6532307
Merge branch 'release/1.0.0-rc.5' into develop
2015-11-20 17:54:40 -07:00
Andy Miller
2a0a9a225c
version update
2015-11-20 17:54:28 -07:00
Andy Miller
aee92b58c7
Updated composer.phar
2015-11-20 17:34:34 -07:00
Andy Miller
16db950009
composer updates
2015-11-20 17:34:02 -07:00
Andy Miller
bde33e7188
Lighttpd/Lightly configuration file - Thanks @Mr3ase
2015-11-20 14:59:58 -07:00
Djamil Legato
267efbe164
Merge branch 'develop' of https://github.com/getgrav/grav into develop
2015-11-20 12:40:52 -08:00
Djamil Legato
f9e137c994
Added pad filter for strings (uses str_pad)
2015-11-20 12:40:48 -08:00
Andy Miller
e7f9751403
add new Page.relativePagePath helper method
2015-11-20 08:08:39 -07:00
