summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1760 from dschult/fix-layoutv1.10.1Dan Schult2015-09-063-164/+237
|\
| * Add layout tests and minor docsDan Schult2015-09-062-2/+36
| * Fix python3 numpy wont read in {}.values to array.Dan Schult2015-09-041-1/+1
| * Add tests, convert center to np.array, fix domain_sizeDan Schult2015-09-042-29/+75
| * Reinstate v1.10 layout except center. Fix bugsDan Schult2015-09-043-135/+198
| * Re-add scaling inside fruchterman_reingoldDan Schult2015-09-031-0/+4
| * Remove spurious line due to typo.Dan Schult2015-09-031-1/+0
| * Revert some API changes in layout.py due to bugs.Dan Schult2015-09-021-171/+98
* | Merge pull request #1761 from dschult/no-linksDan Schult2015-09-065-3/+335
|\ \ | |/ |/|
| * Remove all the symbolic links from the 'examples/' directoryHimanshu Mishra2015-09-065-3/+335
|/
* Skip doctest if pandas not foundAric Hagberg2015-08-021-0/+4
* Merge pull request #1660 from jtorrents/release-1.10ysitu2015-07-192-18/+5
|\
| * Tag this branch as a release.Jordi Torrents2015-07-131-1/+1
| * Remove some tests for k_components approximation.Jordi Torrents2015-07-131-20/+4
| * Remove a test that only fails sporadically for k_components approximation.Jordi Torrents2015-07-131-5/+8
|/
* Correct version number to 1.10networkx-1.10rc2ysitu2015-06-271-2/+2
* Merge pull request #1607 from dschult/fix_digraph_degreeDan Schult2015-06-164-12/+23
|\
| * remove python2-ism introduced by mistakeDan Schult2015-06-161-1/+1
| * Fix big for iterator input for digraph.degreeDan Schult2015-06-164-12/+23
|/
* Minor docstring fixes.chebee7i2015-06-156-82/+85
* Adjust build command for documentation.chebee7i2015-06-151-2/+2
* Merge pull request #1600 from OrkoHunter/product_docschebee7i2015-06-154-41/+54
|\
| * pep8 fixes for modules in algorithms.operatorsHimanshu Mishra2015-06-144-28/+37
| * Update documentation of cartesian and tensor product of graphsHimanshu Mishra2015-06-141-15/+19
* | Merge pull request #1601 from chebee7i/docdraftAric Hagberg2015-06-155-23/+83
|\ \ | |/ |/|
| * Add pydotplus to doc build.chebee7i2015-06-141-0/+1
| * Fix paths for RTD build.chebee7i2015-06-141-2/+25
| * Adjust paths for RTD build.chebee7i2015-06-143-4/+15
| * Add doc status badge.chebee7i2015-06-141-3/+7
| * Configure documentation for readthedocs.orgchebee7i2015-06-142-16/+37
|/
* Update link to historical contributions.chebee7i2015-06-131-1/+1
* Merge pull request #1597 from hagberg/doc-fixeschebee7i2015-06-1323-176/+68
|\
| * Underline too shortAric Hagberg2015-06-131-2/+2
| * Underline length too shortAric Hagberg2015-06-131-1/+1
| * Don't use double colonAric Hagberg2015-06-131-2/+2
| * Use raw stringsAric Hagberg2015-06-131-1/+2
| * Bad indentAric Hagberg2015-06-131-2/+1
| * Fix latexAric Hagberg2015-06-132-15/+17
| * Missing spaceAric Hagberg2015-06-131-1/+1
| * Typos and formatting errorsAric Hagberg2015-06-133-15/+15
| * "Warning" is not a numpydoc sectionAric Hagberg2015-06-133-12/+6
| * Remove old creditsAric Hagberg2015-06-131-92/+0
| * Doc spelling errorsAric Hagberg2015-06-131-4/+4
| * Spelling fixesAric Hagberg2015-06-133-7/+5
| * Spelling error ExamplesAric Hagberg2015-06-131-2/+2
| * Add missing reference to triadsAric Hagberg2015-06-131-0/+1
| * Underline too shortAric Hagberg2015-06-131-1/+1
| * Over/underline length adjustmentAric Hagberg2015-06-131-2/+2
| * Fix doc title spelling errorsAric Hagberg2015-06-131-4/+4
| * Remove doc reference to generators.hybrid (in algorithms now).Aric Hagberg2015-06-131-11/+0