+2 -1

README.rst

reviewed

··· 38 38 39 39 cd /usr/local/lib/ 40 40 ln -s $ORACLE_HOME/libclntsh.dylib.12.1 libclntsh.dylib.12.1 41 41 + ln -s $ORACLE_HOME/libclntsh.dylib.12.1 libclntsh.dylib 41 42 ln -s $ORACLE_HOME/libocci.dylib.12.1 libocci.dylib.12.1 42 43 ln -s $ORACLE_HOME/libnnz12.dylib libnnz12.dylib 43 44 44 45 Install ``cx_Oracle`` from PIP:: 45 46 46 46 - env ARCHFLAGS="-arch $ARCH" pip install cx_Oracle 47 47 + env ARCHFLAGS="-arch $ARCH" pip install cx-Oracle==5.2.1 47 48 48 49 Environment Variables 49 50 ---------------------

+5 -1

package.json

reviewed

··· 7 7 "dependencies": { 8 8 "underscore": "^1.8.3" 9 9 }, 10 10 + "scripts": { 11 11 + "watch": "gulp", 12 12 + "build": "gulp build" 13 13 + }, 10 14 "devDependencies": { 11 15 "angular": "^1.5.5", 12 16 "angular-cookies": "^1.5.7", ··· 20 24 "babel-preset-es2015": "^6.6.0", 21 25 "babel-preset-react": "^6.5.0", 22 26 "babelify": "^7.3.0", 23 23 - "bootstrap": "^4.0.0-alpha.4", 27 27 + "bootstrap": "4.0.0-alpha.5", 24 28 "bootstrap-ui-datetime-picker": "^2.4.1", 25 29 "browserify": "^13.0.1", 26 30 "browserify-shim": "^3.8.12",

+1 -1

requirements/base.txt

reviewed

··· 1 1 - django==1.10.2 1 1 + workon django==1.10.2 2 2 django-environ==0.4.0 3 3 django-braces==1.8.1 4 4 django-floppyforms==1.6.2

+1

upvcarshare/config/settings/base.py

reviewed

··· 360 360 361 361 # UPV CREDENTIALS 362 362 # ------------------------------------------------------------------------------ 363 363 + UPV_LOGIN_IGNORE = False 363 364 UPV_LOGIN_DATA_USERNAME = env("UPV_LOGIN_DATA_USERNAME") 364 365 UPV_LOGIN_DATA_PASSWORD = env("UPV_LOGIN_DATA_PASSWORD")

+6

upvcarshare/config/settings/local.py

reviewed

··· 38 38 NOTEBOOK_ARGUMENTS = [ 39 39 '--port=8000', 40 40 ] 41 41 + 42 42 + # UPV CREDENTIALS 43 43 + # ------------------------------------------------------------------------------ 44 44 + UPV_LOGIN_IGNORE = True 45 45 + UPV_LOGIN_DATA_USERNAME = env("UPV_LOGIN_DATA_USERNAME") 46 46 + UPV_LOGIN_DATA_PASSWORD = env("UPV_LOGIN_DATA_PASSWORD")

+3

upvcarshare/users/models.py

reviewed

··· 1 1 # -*- coding: utf-8 -*- 2 2 from __future__ import unicode_literals, print_function, absolute_import 3 3 4 4 + from django.conf import settings 4 5 from django.contrib.auth.base_user import AbstractBaseUser 5 6 from django.contrib.auth.models import PermissionsMixin, AbstractUser, UserManager 6 7 from django.contrib.gis.db import models ··· 90 91 91 92 def update_groups(self): 92 93 """Updates the groups using the UPV service.""" 94 94 + if settings.UPV_LOGIN_IGNORE: 95 95 + return 93 96 username = self.email.split("@")[0] 94 97 user_data = UPVLoginDataService.user_data(username=username) 95 98 roles = user_data.get("roles")