Commit Graph

2658 Commits

Author SHA1 Message Date
Aaron Eikenberry
8f5af542c5 update docker-engine on travis 2016-03-03 09:20:20 -06:00
Aaron Eikenberry
5659cf302c Trying with hard-coded version :( 2016-03-02 22:52:00 -06:00
Aaron Eikenberry
c084e6e905 fixes typo in travis.yml 2016-03-02 22:46:49 -06:00
Aaron Eikenberry
76e23d2cf5 customize docker-compose version on travis-ci 2016-03-02 22:43:17 -06:00
Aaron Eikenberry
45bbd27f39 updates docker-compose format to version 2 #483 2016-03-02 22:16:25 -06:00
Cristian Vargas
bd39eddf77 Update file storages and put them in separate folders 2016-03-02 16:02:28 -05:00
Cristian Vargas
b368dd7e36 Make sure that STATIC_URL != MEDIA_URL 2016-03-02 09:49:34 -05:00
Fábio C. Barrionuevo da Luz
1d731ae48a Merge pull request #494 from pydanny/update-requirements
Update requirements
2016-03-01 23:10:29 -03:00
Fabio C. Barrioneuvo da Luz
018560e27a update Hitch test requirements 2016-03-01 22:47:38 -03:00
Fabio C. Barrioneuvo da Luz
047c497113 update django version in setup.py 2016-03-01 22:16:36 -03:00
Fabio C. Barrioneuvo da Luz
9ea65968c1 update requirements 2016-03-01 22:13:07 -03:00
Daniel Roy Greenfeld
1407f8a491 Merge pull request #489 from juliancantillo/master
Added NEW_RELIC_APP_NAME env var for app.json
2016-02-29 21:51:54 -08:00
solvire
04f852ca65 pylint-django gets "no-member" error: known issue: implemented suggested workaround
A known issue with pylint-django

https://github.com/landscapeio/pylint-django/issues/53

2939cb1d1a

Tested on:
pylint==1.5.4
pylint-django==0.7.1
2016-02-28 01:18:33 -08:00
Matt Menzenski
260bbb0a30 fix minor typos in project README 2016-02-27 21:27:27 -06:00
Fábio C. Barrionuevo da Luz
528423fe67 Merge pull request #491 from Eraldo/patch-3
Fixed missing closing tag for container on user_list.html
2016-02-24 18:53:36 -03:00
Eraldo Energy
2e5e361c13 Fixed missing closing tag for container. 2016-02-24 22:50:32 +01:00
Daniel Roy Greenfeld
084d187b7b Fixed borked pytest-sugar requirement 2016-02-24 12:49:06 -08:00
Daniel Roy Greenfeld
05abf3582c Added beginning support for py.test 2016-02-24 12:22:22 -08:00
Jannis Gebauer
d614351d12 Update CHANGELOG.md 2016-02-18 21:49:25 +01:00
Jannis Gebauer
1d6edb6f2b resolved merge conflict 2016-02-18 21:44:08 +01:00
Jannis Gebauer
af9baa50eb Merge pull request #488 from Eraldo/patch-2
Environment aware registration switch setting
2016-02-18 21:38:43 +01:00
Julian Andres Cantillo
893ccec900 Merge pull request #1 from juliancantillo/juliancantillo-patch-1
Added NEW_RELIC_APP_NAME env var for app.json
2016-02-18 15:22:21 -05:00
Julian Andres Cantillo
6ef60301d1 Added NEW_RELIC_APP_NAME env var for app.json
When using the one-click deployment to Heroku the building process fails if the app uses NewRelic.
2016-02-18 15:21:47 -05:00
Eraldo Energy
c7627f4c54 Added account registration switch to env example 2016-02-18 00:46:45 +01:00
Eraldo Energy
22acc55bcc Update settings.rst 2016-02-16 19:07:20 +01:00
Eraldo Energy
96a4ae33b5 Environment aware registration switch setting
The status of the registration (open or closed) is now read from the project environment instead of hardcoded in the common settings file.
2016-02-16 18:53:37 +01:00
Eraldo Energy
5c51acd570 Updated contributors file 2016-02-16 18:38:44 +01:00
Eraldo Energy
643b0aa2f3 Updated the path to the user adapters.
(see previous commit)
2016-02-16 18:05:14 +01:00
Eraldo Energy
1c82d59381 Renamed the file adapter.py to adapters.py
The rename took place to be consistent with the default django style ('view*s*.py', 'manager*s*.py', etc).
2016-02-16 18:02:29 +01:00
Fabio C. Barrioneuvo da Luz
6cd4ab6e81 update changelog 2016-02-15 22:50:40 -03:00
Fábio C. Barrionuevo da Luz
be01daefc8 Merge pull request #486 from oryx2/patch-1
fix is_open_for_signup missing param
2016-02-15 22:31:29 -03:00
blueness
25b0544c2f fix is_open_for_signup missing param
add a missing param to SocialAccountAdapter.is_open_for_signup
2016-02-16 09:23:57 +08:00
Daniel Roy Greenfeld
7c4a753b8d Merge pull request #485 from crdoconnor/master
Upgraded hitchreqs.txt
2016-02-15 16:07:13 -08:00
Colm O'Connor
47c3fa749b Make hitch tests pause on success in TDD mode. 2016-02-15 22:54:02 +00:00
Colm O'Connor
4490d08659 Remove click: djHideToolBarButton step and put it in load_website. 2016-02-15 22:46:07 +00:00
Colm O'Connor
a5e127b9a1 Shrink window size when running selenium tests to something smaller and easier to view. 2016-02-15 22:45:43 +00:00
Colm O'Connor
c917ab5057 Upgraded hitchreqs.txt (decorator version specified was taken down off pypi) 2016-02-15 22:40:30 +00:00
Jannis Gebauer
0d342210af Update CHANGELOG.md 2016-02-12 19:27:52 +01:00
Jannis Gebauer
391971c6d5 Merge pull request #484 from yunti/patch-3
Fixed typo on 403 exception
2016-02-12 19:25:07 +01:00
yunti
d6962a890d Fixed typo on 403 exception 2016-02-09 18:36:56 +00:00
Daniel Roy Greenfeld
f35412248b Update CHANGELOG.md 2016-02-08 09:29:26 -08:00
Daniel Roy Greenfeld
e0a1bf8f8c Fixes #184, allows for license choices 2016-02-07 20:56:28 -08:00
Fábio C. Barrionuevo da Luz
8826620bd4 Merge pull request #482 from pydanny/update-requirements
update requirements and CHANGELOG
2016-02-07 02:55:20 -03:00
Fabio C. Barrioneuvo da Luz
b5f82d41f2 update requirements and CHANGELOG 2016-02-07 02:44:19 -03:00
Fábio C. Barrionuevo da Luz
2cdf8bdb70 Merge pull request #480 from yunti/patch-2
use LoginRequiredMixin from Django 1.9
2016-02-07 01:49:29 -03:00
Fábio C. Barrionuevo da Luz
9d76faa42c Merge pull request #481 from crdoconnor/master
Fix for issue #389 (and related issues).
2016-02-07 01:48:10 -03:00
Colm O'Connor
f44b9fad41 Fix for issue #389 (and related issues). For when different distributions have different package names (e.g. libtiff5-dev for ubuntu wily and libtiff4-dev for ubuntu trusty). Ensures that the correct one is installed for the distribution the user is on. 2016-02-06 16:29:10 +00:00
yunti
9f08e59d16 Changed LoginRequiredMixin import
Mixin now part of djanog core from 1.9
2016-02-04 18:41:03 +00:00
Fabio C. Barrioneuvo da Luz
7779c726a0 update django, django-floppyforms, hitchpython and selenium version 2016-02-01 18:10:33 -03:00
Fabio C. Barrioneuvo da Luz
5c9b01ae87 update flake8 version 2016-01-30 17:32:01 -03:00