mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code
1,494 Commits 19 Branches 297 Tags
Commit Graph

38 Commits

Author SHA1 Message Date
Jeremy Stretch
5ca87c0f20 Merge branch 'develop' into v2-develop 2017-05-08 15:02:06 -04:00
Brian Ellwood
4035b87693 Allow responsive tables (#1124) 
* Make tables responsive #1115

Resolves #1115
 2017-05-03 14:30:05 -04:00
Jeremy Stretch
b01bf6089c Merge branch 'develop' into v2-develop 
Conflicts:
	netbox/dcim/forms.py
	netbox/dcim/views.py
	netbox/ipam/forms.py
	netbox/templates/_base.html
	netbox/utilities/views.py
 2017-04-13 15:42:50 -04:00
Jeremy Stretch
f9a33bfc14 Fixes #1074: Require ncclient 0.5.3 (Python 3 fix) 2017-04-13 15:34:35 -04:00
Jeremy Stretch
f3eee25527 Fixes #1051: Upgraded django-rest-swagger 2017-04-06 11:54:13 -04:00
Jeremy Stretch
ee11775425 Fixes #1051: Upgraded django-rest-swagger 2017-04-06 09:40:09 -04:00
Jeremy Stretch
78b0072051 Limit <v2.0 installations to Django 1.10 2017-04-05 11:34:04 -04:00
Jeremy Stretch
280d98bad9 #1033: Updated requirements.txt for Django 1.11 2017-04-04 14:42:00 -04:00
Jeremy Stretch
b643939cc4 Initial work on #152: Image attachments 2017-03-30 21:55:57 -04:00
Jeremy Stretch
7ba6e320e7 Fixes #843: Implemented CORS headers for API 2017-03-21 13:53:07 -04:00
Jeremy Stretch
be0a3fb1f2 Corrected merge conflict 2017-03-07 16:55:49 -05:00
Jeremy Stretch
9b39ba169c Merge branch 'develop' into api2 
Conflicts:
	netbox/dcim/api/serializers.py
	netbox/dcim/api/urls.py
	netbox/dcim/api/views.py
	netbox/dcim/filters.py
	netbox/dcim/tables.py
	requirements.txt
 2017-03-02 16:01:25 -05:00
Jeremy Stretch
1adae67dd7 Closes #927: Upgrade to django-filter 1.0 2017-03-01 13:09:19 -05:00
Jeremy Stretch
c0152940f9 Merged develop 2017-02-28 16:10:53 -05:00
Jeremy Stretch
9313ba08ed Implemented recursive regions with django-mptt 2017-02-28 14:15:15 -05:00
Jeremy Stretch
9e670d318c Relaxed version requirements 2016-12-26 15:33:08 -05:00
Jeremy Stretch
1882d832c3 Bumped django-tables2 version 2016-12-26 14:34:13 -05:00
Jeremy Stretch
a5fe4468d0 Upgraded django-filter to 0.15.3 2016-12-26 11:58:27 -05:00
Jeremy Stretch
65d8bb8c26 Bumped Markdown version 2016-12-26 11:05:46 -05:00
Jeremy Stretch
cf796fb40f Fixes #751: Relax version constraint on python-cryptography 2016-12-26 10:55:14 -05:00
Jeremy Stretch
0ac3e91e3b Updated middleware for Django 1.10 2016-12-26 10:48:15 -05:00
Jeremy Stretch
9b8bae501b Fixes #677: Add cffi as an explicit dependency to avoid setuptools error on Debian 2016-11-30 11:19:28 -05:00
Jeremy Stretch
041a166217 Revert "Changes to Dockerfile to make the build faster" 2016-08-18 15:31:31 -04:00
Robert Drake
6ed33af063 Changes to Dockerfile to make the build faster 
To download a new version with docker, I've been running

	git pull
	docker-compose build --no-cache

This is slow, but no-cache is needed so that "git clone" pulls the
latest copy.

Most of the slowness comes from pulling down apt files each time a
rebuild needs to be done.  If we move that into a docker image then only
the local changes need to be rebuilt.

Further refinements could be done.  If the python dependencies that are
brought in from requirements.txt could be moved to an image then nothing
would change between updates as long as dependant versions hadn't
changed.  This would probably be more trouble than it's worth, unless
you're recreating netbox containers 10-20 times a day.
 2016-08-17 15:19:56 -04:00
Jeremy Stretch
6bf8a7707c Reverting to psycopg2==2.6.1 due to pip installation issues 2016-08-10 17:30:31 -04:00
Jeremy Stretch
8ff752a58b Updated requirements for v1.5 2016-08-10 16:42:42 -04:00
Jeremy Stretch
9a9e3c1479 Upgrade to Django 1.9.8 (security fix) 2016-07-20 17:17:39 -04:00
Joel
173a4cde8b Update the requirements file to include the natsort library requirement. 2016-07-08 23:27:00 -07:00
Pit Kleyersburg
522a0c20e7 Replace pydot by graphviz 
This is in an effort to support Python 3: pydot is not compatible with
Python 3, while graphviz is.
 2016-06-29 11:25:36 +02:00
Jeremy Stretch
0c8e9e5825 Downgrade to pydot-1.0.2 to fix unknown graph rendering error 2016-06-24 14:00:29 -04:00
Zach Moody
5d4add119c Cherry-pick from 13d9be4. 
Refactor rpc.py and removed dependency on Exscript.
 2016-06-21 13:18:50 -05:00
Jeremy Stretch
298567e082 Added missing package 2016-06-17 12:09:50 -04:00
Jeremy Stretch
769aa92a7a Added missing package 2016-06-17 12:07:39 -04:00
Jeremy Stretch
0b2e66927e Package updates 2016-06-15 15:47:39 -04:00
Jeremy Stretch
889bd9c8b3 Upgraded REST Framework and Swagger to resolve deprecation warnings 2016-05-02 14:49:25 -04:00
Jeremy Stretch
d4d381d4fb Upgraded Django to 1.9.5 2016-04-29 11:27:22 -04:00
Jeremy Stretch
f9c70424f6 Removed corsheaders 2016-03-02 22:34:51 -05:00
Jeremy Stretch
27b289ee3b Initial push to public repo 2016-03-01 11:23:03 -05:00