Commit Graph

451 Commits

Author SHA1 Message Date
Daniel Sheppard
f46453f271 Fixes: #3532 - add device to graph type for documentation 2019-09-24 08:45:31 -05:00
Jeremy Stretch
f2b5d00f7f Fixes #3439: Add a note about the Swagger API interface 2019-09-18 16:41:08 -04:00
Jeremy Stretch
8c12522975 Fixes #3429: Update installation docs for Redis 2019-09-18 16:35:45 -04:00
Daniel Sheppard
48e2941e7e Closes: #3495 2019-09-13 12:08:48 -05:00
Jeremy Stretch
f9749ba707 Tweak docs for custom scripts 2019-09-04 16:21:21 -04:00
Jeremy Stretch
27e93b7859 Add documentation for custom links 2019-08-28 12:39:11 -04:00
Jeremy Stretch
0a18c86bfa Merge pull request #3423 from netbox-community/3415-custom-scripts
Add custom scripting
2019-08-26 14:06:22 -04:00
John Anderson
8bd1a48973 fixes #3428 - caching invalidation issues
Mitgate invalidation issues by using prefetch_related instead of select_related.
Also use invalidated_update instead of just update.
2019-08-19 01:53:39 -04:00
Jeremy Stretch
d643dde3a0 Updated docs for IPNetworkVar and FileVar 2019-08-16 15:31:29 -04:00
Jeremy Stretch
bfd73db5b6 Change fields to field_order 2019-08-15 16:19:25 -04:00
Jeremy Stretch
244d3b7883 Docs updates 2019-08-15 16:07:15 -04:00
Jeremy Stretch
f1e12213e7 Allow user to override module name 2019-08-13 09:09:12 -04:00
Jeremy Stretch
eeacd04483 Move script attributes under a Meta class 2019-08-12 13:16:18 -04:00
Jeremy Stretch
042f6bc8bd Extend example custom script to generate output 2019-08-12 11:13:16 -04:00
Jeremy Stretch
1da82905c0 Example script tweak 2019-08-12 11:13:16 -04:00
Jeremy Stretch
1331072d92 Fix form field ordering 2019-08-12 11:13:16 -04:00
Jeremy Stretch
6cc074b1e4 Added documentation for custom scripts 2019-08-12 11:13:16 -04:00
Jeremy Stretch
c924561006 Merge pull request #3325 from lassebm/fix-3324
Fixes #3324: Doc incorrectly states child devices shown as non-racked
2019-07-17 16:27:55 -04:00
Robert Ellegate
95bee19161 Replacing references to digitalocean org
s/(?<=:\/\/github.com\/)digitalocean(?=\/netbox)/netbox-community/g
2019-07-10 09:23:43 -04:00
Lasse Bang Mikkelsen
348365e6d4 Fixes #3324: Doc incorrectly states child devices shown as non-racked 2019-07-04 17:28:25 +02:00
Jeremy Stretch
aab17dbcf5 Updated django-cors-headers to v3.0.2 2019-06-20 09:48:34 -04:00
John Anderson
a9c751faca prometheus docs updates 2019-06-20 00:04:44 -04:00
John Anderson
bdf95b2e34 closes #3161 - prometheus env var docs and set prometheus to not be enabled by default 2019-06-17 16:38:05 -04:00
Jeremy Stretch
87f4986aae Updated documentation 2019-05-07 14:23:02 -04:00
Jeremy Stretch
e70111353c Merge branch 'develop' into develop-2.6 2019-05-01 11:53:44 -04:00
Jeremy Stretch
1a84531964 Fix broken link 2019-04-29 16:55:17 -04:00
Jeremy Stretch
595a7fe950 Promote django-rq to a required dependency 2019-04-25 14:25:16 -04:00
John Anderson
5489f42681 closes #3104 - add support for exposing prometheus metrics 2019-04-25 01:09:19 -04:00
John Anderson
524e7e5f08 changelog and docs updates for 2.6 2019-04-19 02:32:50 -04:00
Jeremy Stretch
66aa5830c1 Enable dictionary specification of related objects in API 2019-04-16 18:02:52 -04:00
Jeremy Stretch
3243249073 Update 'form_factor' in docs 2019-04-12 13:46:37 -04:00
Jeremy Stretch
f801143a72 Implement custom auth backend and EXEMPT_VIEW_PERMISSIONS setting 2019-04-11 22:01:26 -04:00
Alexander Kinneer
2db6af0a1e Add support for configuring use of an SSL connection to Redis.
Requires a build or release of django-rq containing
44f3fdd7cb
2019-03-18 11:26:37 -05:00
dansheps
5780403c4c API Filtering Documentation Changes
* Fixed typo
* Clarified documentation regarding filtering multiple times (some filters can, some cannot)
2019-03-11 15:11:16 -05:00
Brian Candler
df7fe9be71 Clarify use of "runreport" CLI 2019-02-13 08:54:04 +00:00
Jeremy Stretch
4dc8ddecfb Merge pull request #2793 from candlerb/candlerb/doc-inventory
Clarify how chassis-based switches/routers are supposed to be modelled
2019-02-06 10:02:05 -05:00
Jeremy Stretch
ac614130b2 Closes #2805: Allow null route distinguisher for VRFs 2019-01-31 13:47:24 -05:00
TheTrafficNetwork
11fd6b205b Typo (#2822) 2019-01-30 14:20:40 -05:00
fouram
cafab4c445 Updated optional-settings.md - Webhook links (#2818)
Corrected (../miscellaneous/webhooks/) to (../additional-features/webhooks/) in two place
2019-01-29 13:38:05 -05:00
Brian Candler
c9dac9237c Clarify how chassis-based switches and routers are supposed to be modelled 2019-01-24 13:35:37 +00:00
Jeremy Stretch
9408e50eb4 Minor tweaks 2018-12-20 09:54:59 -05:00
Jeremy Stretch
3fd61dcc95 Merge pull request #2667 from Jemikwa/develop
#2656 Updating LDAP documentation
2018-12-20 09:53:21 -05:00
Jeremy Stretch
ebb5b60ab0 Fixes #2709: Update example report for compatibility with v2.5 2018-12-19 16:34:35 -05:00
Jeremy Stretch
6b32d67b9a Closes #2537: Added AUTH_LDAP_MIRROR_GROUPS setting to LDAP docs 2018-12-19 16:24:41 -05:00
Jeremy Stretch
8cb2b428f6 Closes #2671: Add documentation of API brief format 2018-12-12 10:27:18 -05:00
Jemikwa
943728e1a7 Updating LDAP documentation
Adding information on service restarts and logging LDAP queries for troubleshooting.
2018-12-11 11:45:45 -06:00
Jeremy Stretch
60dc9e9fc2 Change pip command to pip3 2018-12-10 09:57:37 -05:00
Jeremy Stretch
15a1f377cf Updated installation docs for v2.5 release 2018-12-07 15:29:18 -05:00
Jeremy Stretch
13edc47a4d Merge v2.5 work 2018-12-07 10:51:28 -05:00
Jeremy Stretch
174dfab2b2 Add reminder to update static field choices 2018-12-04 15:19:38 -05:00
Jeremy Stretch
72f6e14c74 Closes #2641: Restored link to NetBox shell documentation 2018-12-04 09:19:32 -05:00
mmahacek
3093b5fbb8 #2635 - Update documentation for python3 update (#2636)
Add reference to reinstalling the django-rq module
2018-12-03 09:56:43 -05:00
Jeremy Stretch
a19943d6c7 Closes #2617: Explicitly mention that test service runs on port 8000 2018-11-28 09:35:33 -05:00
Jeremy Stretch
5d7f316f4f Add developer guidance for the introduction of new dependencies 2018-11-27 10:45:10 -05:00
Jeremy Stretch
3acb0ef865 Closes #2053: Introduced the LOGIN_TIMEOUT configuration setting 2018-11-14 14:18:32 -05:00
Jeremy Stretch
b2243977ed Closes #2426: Introduced SESSION_FILE_PATH configuration setting for authentication without write access to database 2018-11-13 10:31:44 -05:00
Jeremy Stretch
6a85f38f11 Merge branch 'develop' into develop-2.5 2018-11-12 16:03:52 -05:00
Jeremy Stretch
cbdd0e3678 Expanded the development style guide 2018-11-12 14:36:09 -05:00
Jeremy Stretch
6a582413e2 Added development docs for extending a model 2018-11-12 13:59:58 -05:00
Jeremy Stretch
10c3d51096 Merge release v2.4.7 into develop-2.5 2018-11-06 11:19:38 -05:00
Ben Bleything
3bd5b7f724 fix prefix length for 172.16.0.0/12 (#2548) 2018-11-06 09:26:05 -05:00
Jeremy Stretch
b4960fa5fc Added cables documentation 2018-11-01 12:22:25 -04:00
Jeremy Stretch
5d9b820a6c Updated documentation 2018-10-30 15:12:14 -04:00
Jeremy Stretch
6854819788 Merge branch 'develop' into develop-2.5 2018-10-19 13:34:03 -04:00
mmahacek
182f5a8e86 Expand Webhook Documentation #2347 (#2524)
* #2347 - Expand Webhook Documentation

Move "Install Python Packages" section up one header level.  Should make Napalm/Webhook sections appear in table of contents for direct linking.

*  #2347 - Expand Webhook Documentation

Add text for installation to link to other documentation sections with instructions.
2018-10-16 13:19:33 -04:00
Chris James
f6b7f41d7a Fix "cusomizable" typo 2018-10-16 11:36:32 -05:00
Jeremy Stretch
16b7b8064c Fixes #2508: Removed invalid link 2018-10-10 09:49:35 -04:00
Jeremy Stretch
26ebed03d0 Merge release v2.4.6 2018-10-10 09:36:51 -04:00
Jeremy Stretch
e70840a88d Closes #2479: Add user permissions for creating/modifying API tokens 2018-10-05 11:06:59 -04:00
Jeremy Stretch
66db32fefd Merged release v2.4.5 2018-10-03 11:23:21 -04:00
Jeremy Stretch
2ab9230a73 Merge pull request #2445 from digitalocean/local-config-context
Local config context
2018-09-28 14:03:28 -04:00
Veit Heller
8b19803698 docs: typo fix in devices 2018-09-19 10:57:09 +02:00
John Anderson
7997b70ba1 implemnted #2392 - local config context for devices and VMs 2018-09-16 00:25:20 -04:00
Jeremy Stretch
1d37a9d0e6 Merge branch 'develop' into develop-2.5 (v2.4.4 release) 2018-08-22 12:10:44 -04:00
Jeremy Stretch
493091519a Added note about CHANGELOG to release checklist 2018-08-22 11:50:25 -04:00
Jeremy Stretch
754b273c2b #2376: Add libapache2-mod-wsgi-py3 to CentOS installation section 2018-08-22 11:46:13 -04:00
Jimmy Taylor
aa23a78e33 Fixed typo for supervisorctl 2018-08-21 08:28:23 -06:00
Jeremy Stretch
1724491366 Closes #2000: Remove support for Python 2 2018-08-14 11:48:12 -04:00
Jeremy Stretch
4569fa1b4c Added tip about exlcuding the changelog when exporting the database 2018-08-08 09:04:48 -04:00
Jeremy Stretch
7c129d106e Added release checklist to development docs 2018-08-02 11:53:31 -04:00
Jeremy Stretch
b68755fbb9 Extended developer docs 2018-08-01 12:38:57 -04:00
Jeremy Stretch
d8856d9a4e Docs fixes 2018-07-30 17:19:22 -04:00
Jeremy Stretch
16e2445799 Added a style section 2018-07-30 14:16:45 -04:00
Jeremy Stretch
514a7c887d Additional documentation cleanup 2018-07-27 13:42:18 -04:00
Jeremy Stretch
5bb8262a79 Added instructions for replicating NetBox 2018-07-20 15:26:01 -04:00
Jeremy Stretch
c6cd083eab Tweaked Python3 guide to be less disruptive 2018-07-18 17:40:08 -04:00
Jeremy Stretch
fdf6bc29d2 Misc cleanup 2018-07-18 09:36:05 -04:00
Jeremy Stretch
70bed34a94 Started v2.4 documentation refresh 2018-07-17 17:23:10 -04:00
Jeremy Stretch
e879d09b0f Split webhooks documentation into the data model and installation sections 2018-07-16 16:21:46 -04:00
Jeremy Stretch
bacc183f1d Quick docs update (more to come prior to the v2.4 release) 2018-07-16 14:53:57 -04:00
Jeremy Stretch
38f302acc1 Merged v2.3.6 2018-07-16 12:03:32 -04:00
mmahacek
c1c85a7ee5 Update sample report
Reference to STATUS_ACTIVE does not work in the current version.  Needs to be changed to DEVICE_STATUS_ACTIVE.
2018-07-11 11:52:33 -07:00
Jeremy Stretch
5e3cec717c Merge pull request #2218 from alexjhart/develop
More verbose LDAP nested groups documentation
2018-07-05 13:11:56 -04:00
Jeremy Stretch
ed55d43b68 Closes #2062: Added a note about parent/child device type role 2018-07-05 12:02:32 -04:00
Jeremy Stretch
05b1516a9f Closes #2138: Added documentation for filtering on custom fields 2018-07-05 11:58:07 -04:00
Alex Hart
9444ecf186 More verbose LDAP nested groups documentation 2018-07-03 15:53:58 -07:00
Jeremy Stretch
519b9773d6 Closes #2211: Removed Python 2 instructions from the installation docs 2018-07-02 16:33:18 -04:00
Jeremy Stretch
1d1af4cf1a Implemented changelog retention setting, automatic purging 2018-06-22 16:18:41 -04:00
Jeremy Stretch
4aa7600615 Merge branch 'develop' into develop-2.4 2018-06-07 16:23:57 -04:00
Matt Layher
fd52b22f1e docs: fix circuits typo 2018-06-01 16:04:44 -04:00
Matt Layher
86b6d525fd docs: fix typos and markdownlint warnings in webhooks docs 2018-06-01 15:07:18 -04:00
Jeremy Stretch
8cfafc9f07 Tweaked webhooks and Redis settings 2018-05-30 14:51:59 -04:00
John Anderson
80a1b23f6f Implements #81 - webhook event backend (#1640)
* merge branch develop

* bugfix, signals for virtualization's class wasn't correctly defined

* updated webhooks for 2.4 and cleanup

* updated docs to cover changes to supervisor config

* review changes and further cleanup

* updated redis connection settings

* cleanup settings
2018-05-30 11:19:10 -04:00
Reimann, Timo
56b65d7341 Changed upgrading documentation for ease of use 2018-05-22 16:20:10 -04:00
Jeremy Stretch
53af4fd7ce Merge pull request #1939 from dougthor42/patch-1
Add note about copying reports to `upgrading.md`
2018-05-22 16:16:43 -04:00
Jeremy Stretch
34c47ac0a8 Merge pull request #1985 from lampwins/docs/apache-header
added X-Forwarded-Proto header to apache config
2018-03-22 11:43:43 -04:00
John Anderson
b090b84363 added X-Forwarded-Proto header to apache config 2018-03-22 10:51:12 -04:00
Douglas Thor
268b145f21 Add note about copying reports to upgrading.md
The `upgrading.md` file does not mention reports. If the user created reports in the old version's default directory (`./netbox/reports`), then the reports will not be transferred to the new version.
2018-03-01 15:05:51 -08:00
Jeremy Stretch
54a2b3bc13 Closes #1918: Add note about copying media directory to upgrade doc 2018-02-27 15:54:25 -05:00
Jeremy Stretch
10e1ac1b36 Merge branch 'develop-2.3' into develop 2018-02-26 14:14:47 -05:00
Jeremy Stretch
5394ec1c9b Formatting correction 2018-02-26 13:20:28 -05:00
Jeremy Stretch
1499d46bd1 Merge branch 'develop' into develop-2.3 2018-02-21 16:16:20 -05:00
John Eismeier
0d3cf16dce Propose fix typos (#1897) 2018-02-21 12:39:29 -05:00
Jeremy Stretch
ea86fc21f3 Merge branch 'develop' into develop-2.3 2018-01-25 14:21:25 -05:00
Jeremy Stretch
6257aac67b Merge pull request #1833 from lampwins/api-docs
added statement and example for using ForeignKey ID's in write actions in api docs
2018-01-22 16:57:08 -05:00
Jeremy Stretch
d77d2c1790 Added VirtualChassis to the docs 2018-01-22 16:54:39 -05:00
John Anderson
01d1b94738 fixed duplicate api docs example and grammar 2018-01-22 16:26:51 -05:00
Jeremy Stretch
a34917ec32 Closes #1828: Added warning about media directory permissions 2018-01-22 16:04:19 -05:00
John Anderson
b620e6d79e added statement and exaple for using ForeignKey ID's in write actions 2018-01-22 10:43:19 -05:00
Adrian Frühwirth
6afa763099 Fixes #1802: Typo in ldap.md 2017-12-29 13:29:07 +01:00
Jeremy Stretch
51b2faadc2 Closes #1775: Added instructions for enabling STARTTLS for LDAP authentication 2017-12-20 14:48:42 -05:00
Jeremy Stretch
36dd744a22 Fixed typo 2017-12-06 12:17:04 -05:00
Jeremy Stretch
17528294fe Closes #1631: Added a post_run method to the Report class 2017-10-27 10:02:27 -04:00
Jeremy Stretch
1c10f14734 Merge pull request #1545 from digitalocean/mdl-ldap-docs-formatting
Minor LDAP documentation formatting cleanup
2017-10-12 23:42:29 -04:00
Jeremy Stretch
5f917c9ba3 Added reports CLI documentation 2017-10-12 13:48:08 -04:00
Jeremy Stretch
43eff596c3 Refreshed installation docs 2017-10-12 13:38:23 -04:00
Jeremy Stretch
2ea55f8c7f Reorganized the docs 2017-10-12 10:59:39 -04:00
Jeremy Stretch
b55d9566fa Fixed up reports documentation 2017-10-11 17:05:01 -04:00
Jeremy Stretch
8508258c26 Added info about API _choices endpoints 2017-10-11 16:41:16 -04:00
Jeremy Stretch
f1a7c87a0b Added warning for PostgreSQL 9.4 requirement 2017-10-11 16:20:50 -04:00
Jeremy Stretch
6671ded02f Introduced the REPORTS_ROOT config parameter; Python2 fixes 2017-10-11 14:03:35 -04:00
Jeremy Stretch
d7c09a1fa0 Tweaked PostgreSQL version number in example 2017-10-11 13:12:49 -04:00
Jeremy Stretch
aaf18ae4df Updated install docs to install pip using setuptools 2017-10-11 12:22:35 -04:00
Jeremy Stretch
23e829b30e Updated the docs to call out PostgreSQL 9.4+ as a requirement 2017-09-29 14:36:55 -04:00
Matt Layher
4b07218b02 Minor LDAP documentation formatting cleanup 2017-09-29 13:22:42 -04:00
Jeremy Stretch
3328895c75 Removed deprecated NETBOX_USERNAME and NETBOX_PASSWORD configuration parameters 2017-09-29 10:18:18 -04:00
Jeremy Stretch
c5eaaae9e7 Merge pull request #1544 from digitalocean/reports
Closes #1511: Implemented reports
2017-09-28 17:16:10 -04:00
Jeremy Stretch
e2746a31f8 Added docs for reports 2017-09-28 16:25:42 -04:00
Jeremy Stretch
f9f272426c Restrict the running of reports via API to POST requests 2017-09-28 16:04:37 -04:00
Jeremy Stretch
8936528bb0 Merge branch 'develop' of github.com:digitalocean/netbox into develop-2.2 2017-09-25 15:12:47 -04:00
Lars Hartmann
54425300bf mentioned support of nested groups in LDAP installation documentation. 2017-09-21 16:36:25 +02:00
Ryan Breaker
ed01b8c67f Added missing package for CentOS and Fedora (#1470)
Without the added package, installation fails during `pip install -r requirements.txt` on the pycrypto package for me in CentOS 6 and 7 and Fedora.
2017-09-18 16:37:51 -04:00
Chris Howells
85d5e4f0c6 Document the PATCH method. Closes #1481. (#1482) 2017-09-18 16:37:09 -04:00
Jeremy Stretch
edcb1f120b Closes #1485: Added LOGIN_BANNER configuration setting to display a banner on the login page 2017-09-15 15:28:09 -04:00
Jeremy Stretch
ac8ee2a06d Started documenting utility views 2017-09-12 13:53:15 -04:00
Jeremy Stretch
8e3be8f8df Added documentation for virtualization data model 2017-08-31 13:22:12 -04:00
Jeremy Stretch
38089f3cc4 Closes #1341: Added a MEDIA_ROOT configuration setting to specify where uploaded files are stored on disk 2017-08-30 11:11:59 -04:00
Marko Mudrinić
d6cb87166d docs: web-server link to new ssl tutorials for 16.04 2017-08-15 23:39:10 +02:00
Jeremy Stretch
6f517f4a98 Corrected HTTP verb in API docs 2017-08-10 11:41:25 -04:00
Jeremy Stretch
f2a1d29310 Expanded API overview documentation 2017-08-09 16:55:49 -04:00
Jeremy Stretch
274be0e4ce Tweaked installation docs to better accommodate Python 3 2017-08-09 14:19:33 -04:00
bdlamprecht
4ded2f2afc Updated ldap.md
Add mapping of `email` field to `mail` value in LDAP.  Also remove duplicate entries of such mapping information.
2017-08-02 08:45:00 -06:00
Jeremy Stretch
3aeeb9fe09 Closes #1374: Added NAPALM_ARGS and NAPALM_TIMEOUT configiuration parameters 2017-07-26 11:47:59 -04:00
Jeremy Stretch
bf90349538 Closes #1375: Renamed NETBOX_USERNAME and NETBOX_PASSWORD configuration parameters to NAPALM_USERNAME and NAPALM_PASSWORD 2017-07-26 11:24:19 -04:00
Jeremy Stretch
f47c314a23 Tweaked NAPALM integration instructions 2017-07-25 10:17:28 -04:00
Jeremy Stretch
0078f1c7d6 Added note about NAPALM integration 2017-07-25 10:09:44 -04:00
Jeremy Stretch
5f3e530a3b Added "Migrating to Python3" to the docs index 2017-07-25 09:44:15 -04:00
vanderaaj
9e8fd813bd How to migrate from Py2 to Py3 (#1355)
* How to migrate from Py2 to Py3

The commands done to migrate Ubuntu from Py2 to Py3.

* Update Migrating-to-Python3
2017-07-25 09:40:51 -04:00
Jeremy Stretch
4e3e1bd85d Added docs for using the NetBox shell 2017-07-24 13:26:31 -04:00
Jeremy Stretch
bf4e4b2c18 Fixed typo in example 2017-07-06 13:14:10 -04:00
Jeremy Stretch
947b35ea77 Removed 'update-alternatives' from Python3 instructions 2017-06-13 14:28:38 -04:00
Jeremy Stretch
b207f31c85 Removed Debian/RHEL references from installation docs 2017-06-12 10:06:19 -04:00
Jeremy Stretch
0ce7bb8f2b Closes #990: Enable logging configuration in configuration.py 2017-06-09 15:03:10 -04:00
Jeremy Stretch
5af8746701 Formatting cleanup 2017-06-09 12:19:32 -04:00
Jeremy Stretch
a4116bd39a Fixes #1253: Improved upgrade.sh to allow forcing Python2 2017-06-09 12:13:47 -04:00
Jeremy Stretch
1bf319fae2 Fixed formatting and typos 2017-06-08 10:02:16 -04:00
Jeremy Stretch
3b54bc790d Merge pull request #1080 from bellwood/patch-2
Enhance LDAP documentation
2017-06-08 09:55:17 -04:00
Markus Witt
8b0ace8618 upgrading.md: fix typo 2017-06-08 10:58:30 +02:00
Brian Ellwood
2d6ef60290 Update ldap.md
Wrap code in code block
2017-06-05 20:37:09 -04:00
Brian Ellwood
3f3fae6f9f Update ldap.md
Capitalization
2017-06-05 20:35:05 -04:00
Jeremy Stretch
6a4e7695a6 Closes #1237: Enabled setting limit=0 to disable pagination in API requests; added MAX_PAGE_SIZE configuration setting 2017-05-30 23:24:21 -04:00
Jeremy Stretch
0ab74fc8d1 Added a warning to note "untracked migrations" warnings during an upgrade 2017-05-23 22:36:40 -04:00
Jeremy Stretch
cb52d71995 Added WSGIPassAuthorization to example Apache config 2017-05-17 17:23:08 -04:00
Jeremy Stretch
73c9903b17 Fixes #1130: Added zlib1g-dev to Ubuntu/Debian packages list 2017-05-17 12:48:31 -04:00
Jeremy Stretch
f4c4e25d03 Added client_max_body_size to nginx config; removed statement disabling access logging 2017-05-10 11:11:03 -04:00
Jeremy Stretch
04fc9d76ba Merge branch 'develop' into v2-develop
Conflicts:
	netbox/circuits/models.py
	netbox/netbox/settings.py
	upgrade.sh
2017-04-21 15:07:48 -04:00
Jeremy Stretch
2b2e09dfad #1090: Python3 tweaks for installation on CentOS 2017-04-21 14:37:47 -04:00
Jeremy Stretch
ecc4f7ad01 #1090: Tweaked docs for Python3 on Ubuntu 2017-04-21 13:30:18 -04:00
Jeremy Stretch
8396da2031 Closes #1008: Moved Docker components into their own repository 2017-04-19 10:58:42 -04:00
bellwood
d7f594f7fb Enhance LDAP documentation
Incorporating @marvnrawley's enhancements from #518
2017-04-13 17:03:58 -04:00
Jeremy Stretch
dfa0275908 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
bellwood
9f2cdc4f39 Python3 fixes for CentOS/RHEL
1) python3 should be python34
2) python34-pip does does exist, you must install python34-setuptools and then: easy_install-3.4 pip
2017-04-12 09:42:48 -04:00
Jeremy Stretch
60a1e4b0a3 Documented image attachments 2017-04-03 15:56:04 -04:00
Jeremy Stretch
2cf5ce04dd Removed duplicate 'Regions' section 2017-03-30 10:27:20 -04:00
Jeremy Stretch
5452953e03 Markdown fixes 2017-03-22 10:49:20 -04:00
Jeremy Stretch
1919ece30f Added API doc for working with secrets 2017-03-21 16:00:02 -04:00
Jeremy Stretch
6825813876 Added section on pagination 2017-03-21 14:34:52 -04:00
Jeremy Stretch
fb8ac4e816 Fixes #843: Implemented CORS headers for API 2017-03-21 13:53:07 -04:00
Jeremy Stretch
be56d01a1d Renamed Module to InventoryItem (prep for #824) 2017-03-21 12:54:08 -04:00
Jeremy Stretch
c786517119 Expanded API documentation 2017-03-20 12:18:18 -04:00
Jeremy Stretch
9ca5f7df0f Merge branch 'develop' into api2 2017-03-17 17:06:01 -04:00
Jeremy Stretch
474e770132 Removed old API doc 2017-03-15 13:15:09 -04:00
Jeremy Stretch
28c77b183b Added examples to the graphs documentation 2017-03-15 12:16:46 -04:00
Jeremy Stretch
6b22ba63d0 Updated API docs 2017-03-13 10:00:13 -04:00
Jeremy Stretch
5a7630e560 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
4a244847c2 Documentation refresh 2017-03-02 13:21:56 -05:00
Jeremy Stretch
691ea87444 Merged develop 2017-02-28 16:10:53 -05:00
Jeremy Stretch
b92f7aa8f1 Implemented recursive regions with django-mptt 2017-02-28 14:15:15 -05:00
Jeremy Stretch
26263f5bcb Initial work on regions 2017-02-28 12:11:43 -05:00
Jeremy Stretch
eddb8a2fbc Merge branch 'develop' into api2
Conflicts:
	netbox/dcim/api/serializers.py
	netbox/dcim/api/views.py
	netbox/dcim/filters.py
2017-02-27 17:04:08 -05:00