summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Revert "fix compatible issue with new numpy"revert-1806-patch-numpy-compatiblechebee7i2015-10-181-1/+1
* Merge pull request #1806 from wuhaochen/patch-numpy-compatiblechebee7i2015-10-181-1/+1
|\
| * fix type issueHaochen Wu2015-10-171-1/+1
|/
* Merge pull request #1795 from dschult/fix-sphinx-errorsDan Schult2015-10-0439-139/+163
|\
| * Two more doc formating changes.Dan Schult2015-10-042-17/+2
| * Fix some sphinx formatting errorsDan Schult2015-10-0438-122/+161
* | Merge pull request #1794 from dschult/fix-examplesDan Schult2015-10-0410-20/+20
|\ \ | |/ |/|
| * Update examples for iterator edges and nodes methodsDan Schult2015-10-0410-20/+20
|/
* Merge pull request #1767 from dschult/fix-flow-docsDan Schult2015-10-031-9/+13
|\
| * Add flow functions from utils to __all__Dan Schult2015-10-031-0/+1
| * Make sure __all__ variables loaded in flow __init__.pyDan Schult2015-09-141-9/+12
* | Merge pull request #1792 from dschult/count-fringeDan Schult2015-10-031-1/+3
|\ \
| * | Change comments about fringe tuples in dijkstraDan Schult2015-10-031-1/+3
* | | Merge pull request #1791 from dschult/dschult-installDan Schult2015-10-031-12/+9
|\ \ \ | |/ / |/| |
| * | Update install.rstDan Schult2015-10-031-12/+9
* | | Merge pull request #1790 from networkx/dschult-patch-3Dan Schult2015-10-031-19/+11
|\ \ \ | |/ / |/| |
| * | Rewrite harmonic_centrality to better use iteratorDan Schult2015-10-021-19/+11
* | | Merge pull request #1753 from MridulS/installdocDan Schult2015-10-021-2/+20
|\ \ \
| * | | Update install documentationMridul Seth2015-09-101-2/+20
* | | | Merge pull request #1788 from networkx/dschult-patch-1Dan Schult2015-10-021-26/+23
|\ \ \ \ | |_|/ / |/| | |
| * | | Clarify docstring and return code for _djikstra()Dan Schult2015-10-021-26/+23
|/ / /
* | | Merge pull request #1777 from MridulS/weighted_shortestDan Schult2015-10-026-46/+46
|\ \ \
| * | | Update all_pairs_dijkstra_path_length and single_source_dijkstra_path_lengthMridul Seth2015-09-276-46/+46
* | | | Merge pull request #1781 from wasade/issue1780Dan Schult2015-10-022-1/+85
|\ \ \ \
| * | | | BUG(ish): allow '_' in keys to support cytoscapeDaniel McDonald2015-09-291-1/+1
| * | | | TST: test that creates the bugDaniel McDonald2015-09-291-0/+84
| |/ / /
* | | | Merge pull request #1778 from MridulS/coverageDan Schult2015-10-022-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Update nx_shp for Python 3.5Mridul Seth2015-10-021-1/+1
| * | | Add coverage for python 3.5Mridul Seth2015-09-271-0/+1
| * | | Drop coverage for python 3.2Mridul Seth2015-09-271-1/+0
|/ / /
* | | Merge pull request #1772 from jfinkels/stochastic-multigraphchebee7i2015-09-192-59/+88
|\ \ \ | |_|/ |/| |
| * | Makes stochastic_graph work for multigraphs.Jeffrey Finkelstein2015-09-162-59/+88
|/ /
* | Merge pull request #1756 from MisterSheik/topo-fixedDan Schult2015-09-016-152/+208
|\ \
| * | Fixed old tests and re-added them.Neil2015-08-311-3/+16
| * | Update misc.pyNeil2015-08-311-2/+0
| * | topolgical_sort, lexicographical_topological_sortNeil2015-08-311-3/+2
| * | Updated documentation building.Neil2015-08-311-1/+1
| * | .Neil2015-08-311-20/+19
| * | topolgical_sort, lexicographical_topological_sortNeil2015-08-315-152/+199
* | | Merge pull request #1734 from aureooms/faster-maximal-matchingDan Schult2015-08-311-4/+4
|\ \ \
| * | | constant factor improvement for maximal_matchingaureooms2015-08-121-4/+4
* | | | Merge pull request #1735 from aureooms/weight-parameter-for-max-weight-matchingDan Schult2015-08-312-42/+54
|\ \ \ \ | |_|/ / |/| | |
| * | | update notes in max_weight_matchingaureooms2015-08-311-1/+1
| * | | test for weight parameter in max_weight_matchingaureooms2015-08-121-36/+43
| * | | update docstring of max_weight_matchingaureooms2015-08-121-1/+6
| * | | add weight attribute param in max_weight_matchingaureooms2015-08-121-4/+4
| |/ /
* | | Merge pull request #1722 from chrisnatali/masterDan Schult2015-08-292-29/+118
|\ \ \ | |_|/ |/| |
| * | adding MultiLineString support to read_shpchrisnatali2015-08-072-29/+118
* | | Merge pull request #1747 from grail/masterDan Schult2015-08-251-2/+2
|\ \ \
| * | | dag: add more information to exception message when cycle detectedEden G. Adogla2015-08-251-2/+2
|/ / /