mirror of
https://github.com/nottinghamtec/PyRIGS.git
synced 2026-03-07 04:28:23 +00:00
Compare commits
30 Commits
hotfix/ica
...
travis-fix
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ad3b38d222 | ||
|
|
a26e65073c | ||
|
|
7f3d628d01 | ||
|
|
abdf785723 | ||
|
|
85edba03a2 | ||
|
|
d61b21df0a | ||
|
|
7e68dfb851 | ||
|
|
69cbac31e7 | ||
|
|
ce4e0f5630 | ||
|
|
c99c5d573f | ||
|
|
221ef739b9 | ||
|
|
aa98039c35 | ||
|
|
7ef923b89f | ||
|
|
9ac86a6ad0 | ||
|
|
c0c143a166 | ||
|
|
0abfa2fd0c | ||
|
|
3333b29f24 | ||
|
|
880509d611 | ||
|
|
387f5b0d8e | ||
|
|
27b12d6bf4 | ||
|
|
c511f2f528 | ||
|
|
a61165f301 | ||
|
|
98245939fe | ||
|
|
b203832f79 | ||
|
|
c6846b85c7 | ||
|
|
0c15718d31 | ||
|
|
0f1db22452 | ||
|
|
e3970929e4 | ||
|
|
a64bf8e16f | ||
|
|
cf8edc8a1c |
@@ -4,10 +4,10 @@ python:
|
|||||||
cache: pip
|
cache: pip
|
||||||
|
|
||||||
addons:
|
addons:
|
||||||
chrome: beta
|
chrome: stable
|
||||||
|
|
||||||
install:
|
install:
|
||||||
- wget http://chromedriver.storage.googleapis.com/2.32/chromedriver_linux64.zip
|
- wget https://chromedriver.storage.googleapis.com/2.36/chromedriver_linux64.zip
|
||||||
- unzip chromedriver_linux64.zip
|
- unzip chromedriver_linux64.zip
|
||||||
- export PATH=$PATH:$(pwd)
|
- export PATH=$PATH:$(pwd)
|
||||||
- chmod +x chromedriver
|
- chmod +x chromedriver
|
||||||
|
|||||||
@@ -162,8 +162,8 @@ LOGOUT_URL = '/user/logout/'
|
|||||||
ACCOUNT_ACTIVATION_DAYS = 7
|
ACCOUNT_ACTIVATION_DAYS = 7
|
||||||
|
|
||||||
# reCAPTCHA settings
|
# reCAPTCHA settings
|
||||||
RECAPTCHA_PUBLIC_KEY = os.environ.get('RECAPTCHA_PUBLIC_KEY', None)
|
RECAPTCHA_PUBLIC_KEY = os.environ.get('RECAPTCHA_PUBLIC_KEY', "6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI") # If not set, use development key
|
||||||
RECAPTCHA_PRIVATE_KEY = os.environ.get('RECAPTCHA_PRIVATE_KEY', None)
|
RECAPTCHA_PRIVATE_KEY = os.environ.get('RECAPTCHA_PRIVATE_KEY', "6LeIxAcTAAAAAGG-vFI1TnRWxMZNFuojJ4WifJWe") # If not set, use development key
|
||||||
NOCAPTCHA = True
|
NOCAPTCHA = True
|
||||||
|
|
||||||
# Email
|
# Email
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
<div class="col-sm-4 text-right">
|
<div class="col-sm-4 text-right">
|
||||||
<div class="btn-group btn-page">
|
<div class="btn-group btn-page">
|
||||||
<a href="{% url 'invoice_delete' object.pk %}" class="btn btn-default" title="Void Invoice">
|
<a href="{% url 'invoice_delete' object.pk %}" class="btn btn-default" title="Delete Invoice">
|
||||||
<span class="glyphicon glyphicon-remove"></span> <span
|
<span class="glyphicon glyphicon-remove"></span> <span
|
||||||
class="hidden-xs">Delete</span>
|
class="hidden-xs">Delete</span>
|
||||||
</a>
|
</a>
|
||||||
@@ -19,7 +19,7 @@
|
|||||||
<span class="glyphicon glyphicon-ban-circle"></span> <span
|
<span class="glyphicon glyphicon-ban-circle"></span> <span
|
||||||
class="hidden-xs">Void</span>
|
class="hidden-xs">Void</span>
|
||||||
</a>
|
</a>
|
||||||
<a href="{% url 'invoice_print' object.pk %}" target="_blank" class="btn btn-default"><span
|
<a href="{% url 'invoice_print' object.pk %}" target="_blank" title="Print Invoice" class="btn btn-default"><span
|
||||||
class="glyphicon glyphicon-print"></span> <span
|
class="glyphicon glyphicon-print"></span> <span
|
||||||
class="hidden-xs">Print</span></a>
|
class="hidden-xs">Print</span></a>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -32,6 +32,7 @@ def create_browser():
|
|||||||
options.add_argument("--window-size=1920,1080")
|
options.add_argument("--window-size=1920,1080")
|
||||||
if os.environ.get('CI', False):
|
if os.environ.get('CI', False):
|
||||||
options.add_argument("--headless")
|
options.add_argument("--headless")
|
||||||
|
options.add_argument("--no-sandbox")
|
||||||
driver = webdriver.Chrome(chrome_options=options)
|
driver = webdriver.Chrome(chrome_options=options)
|
||||||
return driver
|
return driver
|
||||||
|
|
||||||
|
|||||||
@@ -3,31 +3,31 @@ contextlib2==0.5.5
|
|||||||
diff-match-patch==20121119
|
diff-match-patch==20121119
|
||||||
dj-database-url==0.4.2
|
dj-database-url==0.4.2
|
||||||
dj-static==0.0.6
|
dj-static==0.0.6
|
||||||
Django==1.11.5
|
Django==1.11.7
|
||||||
django-debug-toolbar==1.8
|
django-debug-toolbar==1.9.1
|
||||||
django-ical==1.4
|
django-ical==1.4
|
||||||
django-recaptcha==1.3.1
|
django-recaptcha==1.3.1
|
||||||
django-registration-redux==1.7
|
django-registration-redux==1.9
|
||||||
django-reversion==2.0.10
|
django-reversion==2.0.11
|
||||||
django-toolbelt==0.0.1
|
django-toolbelt==0.0.1
|
||||||
premailer==3.1.1
|
premailer==3.1.1
|
||||||
django-widget-tweaks==1.4.1
|
django-widget-tweaks==1.4.1
|
||||||
gunicorn==19.7.1
|
gunicorn==19.7.1
|
||||||
icalendar==3.11.7
|
icalendar==4.0.0
|
||||||
lxml==4.0.0
|
lxml==4.1.1
|
||||||
Markdown==2.6.9
|
Markdown==2.6.9
|
||||||
Pillow==4.2.1
|
Pillow==4.3.0
|
||||||
psycopg2==2.7.3.1
|
psycopg2==2.7.3.2
|
||||||
Pygments==2.2.0
|
Pygments==2.2.0
|
||||||
PyPDF2==1.26.0
|
PyPDF2==1.26.0
|
||||||
python-dateutil==2.6.1
|
python-dateutil==2.6.1
|
||||||
pytz==2017.2
|
pytz==2017.3
|
||||||
raven==6.2.1
|
raven==6.3.0
|
||||||
reportlab==3.4.0
|
reportlab==3.4.0
|
||||||
selenium==3.5.0
|
selenium==3.11.0
|
||||||
simplejson==3.11.1
|
simplejson==3.13.2
|
||||||
six==1.11.0
|
six==1.11.0
|
||||||
sqlparse==0.2.3
|
sqlparse==0.2.4
|
||||||
static3==0.7.0
|
static3==0.7.0
|
||||||
svg2rlg==0.3
|
svg2rlg==0.3
|
||||||
yolk==0.4.3
|
yolk==0.4.3
|
||||||
|
|||||||
Reference in New Issue
Block a user