ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-12-22 17:33:14 +01:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/AD-43-in-piece_detail-add-generic-field-' into AD-43-in-piece_detail-add-generic-field-

Browse Source
This commit is contained in:
ddejongh 2015-06-11 17:22:27 +02:00
commit 6ef233e43d
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/app.js
View File

@ -15,10 +15,6 @@ let headers = {
'Content-Type': 'application/json' 'Content-Type': 'application/json'
}; };
//if (window.DEBUG) {
// headers.Authorization = 'Basic ' + window.CREDENTIALS;
//}
fetch.defaults({ fetch.defaults({
urlMap: ApiUrls, urlMap: ApiUrls,
http: { http: {

6
js/constants/application_constants.js
View File

@ -5,10 +5,10 @@ let constants = {
//FIXME: referring to a global variable in `window` is not //FIXME: referring to a global variable in `window` is not
// super pro. What if we render stuff on the server? // super pro. What if we render stuff on the server?
'baseUrl': window.BASE_URL, //'baseUrl': window.BASE_URL,
'apiEndpoint': window.API_ENDPOINT, 'apiEndpoint': window.API_ENDPOINT,
//'baseUrl': 'http://staging.ascribe.io/api/', 'baseUrl': window.BASE_URL,
//'debugCredentialBase64': 'ZGltaUBtYWlsaW5hdG9yLmNvbTowMDAwMDAwMDAw', // dimi@mailinator:0000000000 'debugCredentialBase64': 'ZGltaUBtYWlsaW5hdG9yLmNvbTowMDAwMDAwMDAw', // dimi@mailinator:0000000000
'aclList': ['edit', 'consign', 'consign_request', 'unconsign', 'unconsign_request', 'transfer', 'aclList': ['edit', 'consign', 'consign_request', 'unconsign', 'unconsign_request', 'transfer',
'loan', 'loan_request', 'share', 'download', 'view', 'delete', 'del_from_collection', 'add_to_collection'] 'loan', 'loan_request', 'share', 'download', 'view', 'delete', 'del_from_collection', 'add_to_collection']
}; };