Commit Graph

7920 Commits

Author SHA1 Message Date
Flavio Copes
dc56f85881 Separate sessions for site and admin 2015-07-31 18:21:43 +02:00
Flavio Copes
532e035724 Load uri before session 2015-07-31 18:21:06 +02:00
Andy Miller
c3431e1ead Merge branch 'develop' of https://github.com/getgrav/grav into develop
# By Flavio Copes
# Via Andy Miller (3) and Flavio Copes (1)
* 'develop' of https://github.com/getgrav/grav:
  Move $session_timeout & $session_path inside the if statement
  Correctly instantiate the Inflector
  Force english in admin
  Refresh session timeout
2015-07-31 08:35:46 -06:00
Andy Miller
3016e77897 loose validation so un-formed values are not lost 2015-07-31 08:35:35 -06:00
Andy Miller
cf69ba0d66 Merge pull request #236 from flaviocopes/patch-4
Correctly instantiate the Inflector
2015-07-31 08:34:27 -06:00
Andy Miller
4e82891779 Merge pull request #232 from flaviocopes/patch-2
Refresh session timeout
2015-07-31 08:33:25 -06:00
Flavio Copes
7fa3e7bf28 Move $session_timeout & $session_path inside the if statement 2015-07-31 16:06:02 +02:00
Flavio Copes
656c23a891 Correctly instantiate the Inflector
$this->grav is not what we expect here. Got a fatal error on `$ bin/gpm` execution
2015-07-31 16:01:52 +02:00
Andy Miller
00f758dd98 Merge pull request #235 from flaviocopes/patch-3
Force english in admin
2015-07-31 07:52:52 -06:00
Flavio Copes
8962d2b1e4 Force english in admin 2015-07-31 15:48:47 +02:00
Flavio Copes
eefb761e98 Refresh session timeout 2015-07-30 19:17:04 +02:00
Andy Miller
9363da137f Merge branch 'develop' of https://github.com/getgrav/grav into develop
# By Djamil Legato
# Via Djamil Legato
* 'develop' of https://github.com/getgrav/grav:
  Added support for select multiple attribute in array filter
2015-07-29 22:00:30 -06:00
Andy Miller
c4daae2f95 added new blueprintName() method that takes into account blueprint value passed via a form 2015-07-29 22:00:03 -06:00
Andy Miller
b201b21e46 added blueprint hidden field to standard blueprints 2015-07-29 21:59:24 -06:00
Andy Miller
c959fd9c48 rolled back to composer 2.7.1 due to broken CLI choice method 2015-07-29 21:58:53 -06:00
Djamil Legato
0845b5e28a Added support for select multiple attribute in array filter 2015-07-29 20:43:13 -07:00
Andy Miller
b9f9570033 minor reformatting 2015-07-29 12:19:56 -06:00
Andy Miller
baa0e73703 updated default yaml 2015-07-29 11:31:50 -06:00
Andy Miller
e97aaccfee added a cache_all option for media images 2015-07-28 20:57:16 -06:00
Andy Miller
f58cfd8571 Merge branch 'feature/blueprint-extend' into develop
Conflicts:
	system/blueprints/config/site.yaml
	system/blueprints/config/system.yaml
2015-07-28 18:36:02 -06:00
Andy Miller
1a43d31c50 whitespace removal 2015-07-28 16:23:49 -06:00
Andy Miller
d244442e70 fixed translations with multiple plugins 2015-07-28 12:11:07 -06:00
Djamil Legato
a009c56271 Supported Language and Taxonomies are now using Selectize tags in admin 2015-07-28 11:08:37 -07:00
Andy Miller
f30af37faf php tidy 2015-07-28 11:10:38 -06:00
Andy Miller
bb4eea7999 missing use statement - issue #230 2015-07-28 04:54:16 -06:00
Andy Miller
e26b80d873 removed some extraneous messages 2015-07-27 08:32:29 -06:00
Andy Miller
b23aa1bc4c tweaks to system blueprint 2015-07-24 17:29:37 -06:00
Andy Miller
e22655b440 updated site.yaml blueprint 2015-07-24 15:16:36 -06:00
Andy Miller
8e57839271 missing some init() checks 2015-07-24 10:55:57 -06:00
Andy Miller
16f779c8f5 changed Inflector from static to class + added multilang support 2015-07-24 10:26:54 -06:00
Andy Miller
bd08d787f2 typo 2015-07-24 08:20:46 -06:00
Andy Miller
df99fe0073 blueprint updates 2015-07-24 08:20:36 -06:00
Andy Miller
7a2fceaee9 renamed translations.fallback property 2015-07-24 08:08:50 -06:00
Andy Miller
bb69656bd7 added base languages config 2015-07-24 08:08:23 -06:00
Andy Miller
5be0618b4d more blueprints progress 2015-07-24 07:50:47 -06:00
Andy Miller
ad00252a4e base translations settings 2015-07-24 07:50:35 -06:00
Andy Miller
84eee30d1f fix for string/array conversion error 2015-07-24 07:50:18 -06:00
Andy Miller
8975c2936c remove unused use that is causing an error 2015-07-23 11:36:43 -06:00
Andy Miller
b64bfc9ab0 more progress on system blueprint 2015-07-23 11:36:26 -06:00
Andy Miller
cc9f5ed096 More validation updates 2015-07-22 15:31:32 -06:00
Andy Miller
2161daa398 Prettier validation messages 2015-07-22 15:31:05 -06:00
Andy Miller
f1a41394ab updates for account validation 2015-07-22 15:30:27 -06:00
Andy Miller
6d5bb6f887 Merge branch 'release/0.9.33' 0.9.33 2015-07-21 13:48:10 -06:00
Andy Miller
9bcf9a7dcd Merge branch 'release/0.9.33' into develop 2015-07-21 13:48:10 -06:00
Andy Miller
6d69f03111 version update 2015-07-21 13:48:00 -06:00
Andy Miller
0b709ddb1a cleanup 2015-07-21 11:50:18 -06:00
Andy Miller
6ba780ba3b support translate taking string or array for key 2015-07-21 11:50:08 -06:00
Andy Miller
f0f24142b2 fix for broken auto-file-extension setting 2015-07-20 18:28:58 -06:00
Andy Miller
a716da14f7 Allow extension to be set manually, else set it from the file 2015-07-20 16:35:33 -06:00
Andy Miller
d8a80479c2 more explicit check for page extension 2015-07-20 16:35:21 -06:00