Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
iberculturaviva
iberculturaviva-mapas
Commits
c190c85a
Commit
c190c85a
authored
6 years ago
by
Rafael Chaves Freitas
Browse files
Options
Download
Plain Diff
Merge branch 'master' into develop
parents
7ccc2aee
1546806e
master
develop
v1.12.3
v1.12.2
v1.12.1
v1.12.0
v1.11.0
v1.10.0
v1.9.17
v1.9.16
v1.9.15
v1.9.14
v1.9.13
v1.9.12
v1.9.11
v1.9.10
v1.9.9
v1.9.8
v1.9.7
v1.9.6
v1.9.5
v1.9.4
v1.9.3
v1.9.2
v1.9.1
v1.9.0
v1.8.0
v1.7.10
v1.7.9
v1.7.8
v1.7.7
v1.7.6
v1.7.5
v1.7.4
v1.7.3
v1.7.2
v1.7.1
v1.7.0
v1.6.0
v1.5.2
v1.5.1
v1.5.0
v1.4.11
v1.4.10
v1.4.9
v1.4.8
v1.4.7
v1.4.6
v1.4.5
v1.4.4
v1.4.3
v1.4.2
v1.4.1
v1.4.0
v1.3.7
v1.3.6
v1.3.5
v1.3.4
v1.3.3
v1.3.2
v1.3.1
v1.3.0
v1.2.7
v1.2.6
v1.2.5
v1.2.4
v1.2.3
v1.2.2
v1.2.1
v1.2.0
v1.1.13
v1.1.12
v1.1.11
v1.1.10
v1.1.9
v1.1.8
v1.1.7
v1.1.6
v1.1.5
v1.1.4
v1.1.3
v1.1.2
v1.1.1
v1.1.0
v1.0.1
v1.0.0
v0.10.1
v0.10.0
v0.9.2
v0.9.1
v0.9.0
v0.8.1
v0.8.0
v0.8.0-1
No related merge requests found
Pipeline
#5257
passed with stages
in 1 minute and 53 seconds
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
14 deletions
+16
-14
compose/config.d/0.defaults.php
compose/config.d/0.defaults.php
+3
-1
compose/config.d/authentication.php
compose/config.d/authentication.php
+13
-13
No files found.
compose/config.d/0.defaults.php
View file @
c190c85a
<?php
define
(
'APP_BASE_URL'
,
(
isset
(
$_SERVER
[
'HTTPS'
])
?
'https://'
:
'http://'
)
.
@
$_SERVER
[
'HTTP_HOST'
]
.
'/'
);
switch
(
env
(
'LOG_LEVEL'
,
'NOTICE'
)){
case
'ALERT'
:
$loglevel
=
\
Slim\Log
::
ALERT
;
...
...
@@ -38,7 +40,7 @@ return [
'themes.active'
=>
env
(
'ACTIVE_THEME'
,
'MapasCulturais\Themes\BaseV1'
),
'app.lcode'
=>
env
(
'APP_LCODE'
,
'pt_BR'
),
'app.lcode'
=>
env
(
'APP_LCODE'
,
'
es_ES,
pt_BR'
),
'namespaces'
=>
array
(
'MapasCulturais\Themes'
=>
THEMES_PATH
,
...
...
This diff is collapsed.
Click to expand it.
compose/config.d/authentication.php
View file @
c190c85a
...
...
@@ -6,26 +6,26 @@ return [
'timeout'
=>
'24 hours'
,
'strategies'
=>
[
'Facebook'
=>
array
(
'app_id'
=>
'SUA
_APP_ID'
,
'app_secret'
=>
'SUA
_APP_SECRET'
,
'scope'
=>
'email'
'app_id'
=>
env
(
'AUTH_FACEBOOK
_APP_ID'
,
null
),
'app_secret'
=>
env
(
'AUTH_FACEBOOK
_APP_SECRET'
,
null
),
'scope'
=>
env
(
'AUTH_FACEBOOK_SCOPE'
,
'email'
),
),
'LinkedIn'
=>
array
(
'api_key'
=>
'SUA
_API_KEY'
,
'secret_key'
=>
'SUA
_SECRET_KEY'
,
'redirect_uri'
=>
URL_DO_SEU_SITE
.
'
/
autenticacao/linkedin/oauth2callback'
,
'scope'
=>
'r_emailaddress'
'api_key'
=>
env
(
'AUTH_LINKEDIN
_API_KEY'
,
null
),
'secret_key'
=>
env
(
'AUTH_LINKEDIN
_SECRET_KEY'
,
null
),
'redirect_uri'
=>
APP_BASE_URL
.
'autenticacao/linkedin/oauth2callback'
,
'scope'
=>
env
(
'AUTH_LINKEDIN_SCOPE'
,
'r_emailaddress'
)
),
'Google'
=>
array
(
'client_id'
=>
'SEU
_CLIENT_ID'
,
'client_secret'
=>
'SEU
_CLIENT_SECRET'
,
'redirect_uri'
=>
URL_DO_SEU_SITE
.
'
/
autenticacao/google/oauth2callback'
,
'scope'
=>
'email'
'client_id'
=>
env
(
'AUTH_GOOGLE
_CLIENT_ID'
,
null
),
'client_secret'
=>
env
(
'AUTH_GOOGLE
_CLIENT_SECRET'
,
null
),
'redirect_uri'
=>
APP_BASE_URL
.
'autenticacao/google/oauth2callback'
,
'scope'
=>
env
(
'AUTH_GOOGLE_SCOPE'
,
'email'
),
),
'Twitter'
=>
array
(
'app_id'
=>
'SUA
_APP_ID'
,
'app_secret'
=>
'SUA
_APP_SECRET'
,
'app_id'
=>
env
(
'AUTH_TWITTER
_APP_ID'
,
null
),
'app_secret'
=>
env
(
'AUTH_TWITTER
_APP_SECRET'
,
null
),
),
]
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment