Compare commits

...

30 Commits

Author SHA1 Message Date
David Taylor
ad3b38d222 Use new RECAPTCHA testing keys 2018-03-24 23:45:43 +00:00
David Taylor
a26e65073c Add no sandbox flag
See https://github.com/travis-ci/docs-travis-ci-com/pull/1671 for more info
2018-03-24 22:19:10 +00:00
David Taylor
7f3d628d01 Bump selenium 2018-03-12 18:06:49 +00:00
David Taylor
abdf785723 Bump chrome and chromedriver 2018-03-12 18:06:13 +00:00
David Taylor
85edba03a2 Merge pull request #315 from nottinghamtec/requires-io-master
[requires.io] dependency update on master branch
2017-11-29 15:03:28 +00:00
David Taylor
d61b21df0a Merge branch 'master' into requires-io-master 2017-11-29 14:56:00 +00:00
Johnathan Graydon
7e68dfb851 Fix hover text on invoice page 2017-11-29 14:40:11 +00:00
requires.io
69cbac31e7 [requires.io] dependency update 2017-11-27 09:21:59 +00:00
requires.io
ce4e0f5630 [requires.io] dependency update 2017-11-24 19:19:49 +00:00
requires.io
c99c5d573f [requires.io] dependency update 2017-11-24 02:55:03 +00:00
requires.io
221ef739b9 [requires.io] dependency update 2017-11-17 02:49:10 +00:00
requires.io
aa98039c35 [requires.io] dependency update 2017-11-15 18:16:25 +00:00
requires.io
7ef923b89f [requires.io] dependency update 2017-11-13 19:53:55 +00:00
requires.io
9ac86a6ad0 [requires.io] dependency update 2017-11-08 13:25:37 +00:00
requires.io
c0c143a166 [requires.io] dependency update 2017-11-08 13:09:23 +00:00
requires.io
0abfa2fd0c [requires.io] dependency update 2017-11-07 09:19:06 +00:00
requires.io
3333b29f24 [requires.io] dependency update 2017-11-05 19:41:14 +00:00
requires.io
880509d611 [requires.io] dependency update 2017-11-04 08:27:51 +00:00
requires.io
387f5b0d8e [requires.io] dependency update 2017-11-03 01:15:17 +00:00
requires.io
27b12d6bf4 [requires.io] dependency update 2017-11-02 02:27:15 +00:00
requires.io
c511f2f528 [requires.io] dependency update 2017-10-30 14:24:44 +00:00
requires.io
a61165f301 [requires.io] dependency update 2017-10-29 19:18:00 +00:00
requires.io
98245939fe [requires.io] dependency update 2017-10-24 21:49:12 +01:00
requires.io
b203832f79 [requires.io] dependency update 2017-10-13 18:30:28 +01:00
requires.io
c6846b85c7 [requires.io] dependency update 2017-10-05 19:35:42 +01:00
requires.io
0c15718d31 [requires.io] dependency update 2017-10-04 16:39:53 +01:00
requires.io
0f1db22452 [requires.io] dependency update 2017-10-02 16:39:04 +01:00
requires.io
e3970929e4 [requires.io] dependency update 2017-09-27 08:30:01 +01:00
requires.io
a64bf8e16f [requires.io] dependency update 2017-09-25 23:43:31 +01:00
David Taylor
cf8edc8a1c Merge pull request #314 from nottinghamtec/hotfix/ical
Fix ical end dates being wrong by 24 hours
2017-09-25 23:16:54 +01:00
5 changed files with 20 additions and 19 deletions

View File

@@ -4,10 +4,10 @@ python:
cache: pip
addons:
chrome: beta
chrome: stable
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
- export PATH=$PATH:$(pwd)
- chmod +x chromedriver

View File

@@ -162,8 +162,8 @@ LOGOUT_URL = '/user/logout/'
ACCOUNT_ACTIVATION_DAYS = 7
# reCAPTCHA settings
RECAPTCHA_PUBLIC_KEY = os.environ.get('RECAPTCHA_PUBLIC_KEY', None)
RECAPTCHA_PRIVATE_KEY = os.environ.get('RECAPTCHA_PRIVATE_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', "6LeIxAcTAAAAAGG-vFI1TnRWxMZNFuojJ4WifJWe") # If not set, use development key
NOCAPTCHA = True
# Email

View File

@@ -11,7 +11,7 @@
<div class="col-sm-4 text-right">
<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
class="hidden-xs">Delete</span>
</a>
@@ -19,7 +19,7 @@
<span class="glyphicon glyphicon-ban-circle"></span> <span
class="hidden-xs">Void</span>
</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="hidden-xs">Print</span></a>
</div>

View File

@@ -32,6 +32,7 @@ def create_browser():
options.add_argument("--window-size=1920,1080")
if os.environ.get('CI', False):
options.add_argument("--headless")
options.add_argument("--no-sandbox")
driver = webdriver.Chrome(chrome_options=options)
return driver

View File

@@ -3,31 +3,31 @@ contextlib2==0.5.5
diff-match-patch==20121119
dj-database-url==0.4.2
dj-static==0.0.6
Django==1.11.5
django-debug-toolbar==1.8
Django==1.11.7
django-debug-toolbar==1.9.1
django-ical==1.4
django-recaptcha==1.3.1
django-registration-redux==1.7
django-reversion==2.0.10
django-registration-redux==1.9
django-reversion==2.0.11
django-toolbelt==0.0.1
premailer==3.1.1
django-widget-tweaks==1.4.1
gunicorn==19.7.1
icalendar==3.11.7
lxml==4.0.0
icalendar==4.0.0
lxml==4.1.1
Markdown==2.6.9
Pillow==4.2.1
psycopg2==2.7.3.1
Pillow==4.3.0
psycopg2==2.7.3.2
Pygments==2.2.0
PyPDF2==1.26.0
python-dateutil==2.6.1
pytz==2017.2
raven==6.2.1
pytz==2017.3
raven==6.3.0
reportlab==3.4.0
selenium==3.5.0
simplejson==3.11.1
selenium==3.11.0
simplejson==3.13.2
six==1.11.0
sqlparse==0.2.3
sqlparse==0.2.4
static3==0.7.0
svg2rlg==0.3
yolk==0.4.3