extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-02 20:19:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert unintentional changes to mrconfig and ContentSecurityPolicy from commitacdf079fb180490d8659fad0f4c20dd74ea78503

Browse Source
This commit is contained in:
Hadi Nategh 2017-01-05 15:04:53 +01:00
parent acdf079fb1
commit c7089cadd9
2 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
.mrconfig
View File

@ -46,17 +46,17 @@ checkout = git clone ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed '
# projectmanagement and Ganttcharts # projectmanagement and Ganttcharts
checkout = git clone ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/projectmanager.git checkout = git clone ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/projectmanager.git
[bookmarks] #[bookmarks]
# record and share bookmarks # record and share bookmarks
checkout = git clone ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/bookmarks.git #checkout = git clone ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/bookmarks.git
[news_admin] #[news_admin]
# publish and agregate RSS or ATOM feeds # publish and agregate RSS or ATOM feeds
checkout = git clone ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/news_admin.git #checkout = git clone ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/news_admin.git
[registration] #[registration]
# allows (after configuration!) to selfregister accounts and recover lost passwords # allows (after configuration!) to selfregister accounts and recover lost passwords
checkout = git clone ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/registration.git #checkout = git clone ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/registration.git
#[archive] #[archive]
# allows to integrate a Benno mail-archive into EGroupware # allows to integrate a Benno mail-archive into EGroupware
@ -65,33 +65,33 @@ checkout = git clone ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed '
### ###
### Older apps requiring to install phpgwapi and etemplate! ### Older apps requiring to install phpgwapi and etemplate!
### ###
[phpgwapi] #[phpgwapi]
# old api used by non 16.1 apps # old api used by non 16.1 apps
checkout = git clone ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/phpgwapi.git #checkout = git clone ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/phpgwapi.git
[jdots] #[jdots]
# alternative "Stylite" template set # alternative "Stylite" template set
checkout = git clone ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/jdots.git #checkout = git clone ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/jdots.git
[etemplate] #[etemplate]
# old templating system superseeded by eTemplate2 in 16.1+ api # old templating system superseeded by eTemplate2 in 16.1+ api
checkout = git clone ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/etemplate.git #checkout = git clone ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/etemplate.git
[phpbrain] #[phpbrain]
# knowledge base # knowledge base
checkout = git clone ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/phpbrain.git #checkout = git clone ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/phpbrain.git
[wiki] #[wiki]
# wiki application # wiki application
checkout = git clone ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/wiki.git #checkout = git clone ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/wiki.git
#[sambaadmin] #[sambaadmin]
# keeps passwords in sync with Samba3 using same LDAP as EGroupware (for Samba4 use Active Directory) # keeps passwords in sync with Samba3 using same LDAP as EGroupware (for Samba4 use Active Directory)
#checkout = git clone ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/sambaadmin.git #checkout = git clone ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/sambaadmin.git
[sitemgr] #[sitemgr]
# content managment application # content managment application
checkout = git clone ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/sitemgr.git #checkout = git clone ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/sitemgr.git
#[phpfreechat] #[phpfreechat]
# chat application # chat application
@ -102,14 +102,10 @@ checkout = git clone ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed '
### EPL apps not publicly available ### EPL apps not publicly available
### ###
[stylite] #[stylite]
checkout = git clone git@github.com:EGroupwareGmbH/epl.git stylite #checkout = git clone git@github.com:EGroupwareGmbH/epl.git stylite
update = test -d .svn && { rm -rf * .svn; git clone git@github.com:EGroupwareGmbH/epl.git .; } || git pull --rebase #update = test -d .svn && { rm -rf * .svn; git clone git@github.com:EGroupwareGmbH/epl.git .; } || git pull --rebase
[esyncpro] #[esyncpro]
checkout = git clone git@github.com:EGroupwareGmbH/esyncpro.git #checkout = git clone git@github.com:EGroupwareGmbH/esyncpro.git
update = test -d .svn && { rm -rf * .svn; git clone git@github.com:EGroupwareGmbH/esyncpro.git .; } || git pull --rebase #update = test -d .svn && { rm -rf * .svn; git clone git@github.com:EGroupwareGmbH/esyncpro.git .; } || git pull --rebase
[profitbricks]
# profitbricks managed servers
checkout = git clone ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/profitbricks.git

2
api/src/Header/ContentSecurityPolicy.php
View File

@ -52,7 +52,7 @@ class ContentSecurityPolicy
// set frame-src attrs of API and apps via hook // set frame-src attrs of API and apps via hook
if ($source == 'frame-src' && !isset($attrs)) if ($source == 'frame-src' && !isset($attrs))
{ {
$attrs = array('*.egroupware.org'); $attrs = array('www.egroupware.org');
if (($app_additional = Api\Hooks::process('csp-frame-src'))) if (($app_additional = Api\Hooks::process('csp-frame-src')))
{ {
foreach($app_additional as $addtional) foreach($app_additional as $addtional)