Jeremy Stretch 02e89d77bb Merge branch 'develop' into api2 ...

Conflicts:
	netbox/dcim/api/views.py

2017-03-07 14:08:06 -05:00

..

api

Re-implemented CustomFieldSerializer (read-only for now)

2017-02-09 16:55:54 -05:00

fixtures

…

management

Fixes #941: Corrected old references to rack.site on Device

2017-03-06 10:23:24 -05:00

migrations

Fixes #632: Use semicolons instead of commas to separate regexes in topology maps

2016-11-03 14:49:02 -04:00

tests

…

__init__.py

…

admin.py

Fixes #720: Display user action links properly in admin UI

2016-12-06 13:16:42 -05:00

filters.py

Closes #552: Added a None filter option for custom select fields

2016-09-16 13:42:07 -04:00

forms.py

Fixes #769: Show default value for boolean custom fields

2017-01-04 09:47:26 -05:00

models.py

Basic Support for Python 3 (#827)

2017-01-23 16:44:29 -05:00

rpc.py

…