Commit Graph

93 Commits

Author SHA1 Message Date
Søren Rosiak
e33e905b66 webui: Update jquery_lazyload (#8287) 2018-02-22 21:12:15 +00:00
Neil Lathwood
9a30846e01 webui: Updated vis js and moment js (#8240)
* webui: Updated MomentJS to latest version 2.20.1

* Updated vis.js to 4.20.1
2018-02-10 21:19:56 -06:00
Tony Murray
609676a9f8
Move InfluxDB to vendor and update dependencies. (#8184)
Update all dependencies

Updated event-dispatcher too far
2018-02-02 22:57:31 -06:00
Neil Lathwood
8b97d01be6
Leaflet upgrade (#7855)
* Squashed 'lib/Leaflet.markercluster/' changes from e96388d6c..584add242

584add242 Merge pull request #846 from ghybs/spiderfyLegFix
e8ca4e8c6 Refactor(Spiderfier): circle spiderfy clockwise like spiral
949d88ae6 Fix(Spiderfier): min leg distance for circle and skip 1st pos for spiral
645e3a8b3 Bump this off
ed8e05ab5 1.2.0
e8219ecd3 Merge pull request #838 from lucaswerkmeister/836
17e8cb710 Support DistanceGrid with cell size 0
cc61460fc Make DistanceGrid cells closed sets
00a24788b Merge pull request #832 from ghybs/refactorOptions
a256831f2 Refactor(examplePane): assign clusterPane option only if pane is provided
61e06292d Refactor(options): move clusterPane into options field
0a00ec3a6 Merge pull request #831 from adammertel/master
644663697 new subplugin in readme - MarkerCluster.List
f175a7cc3 1.1.0
d077f4920 Merge pull request #819 from ckrahe/panes
37bc74004 Default group clusterPane to L.Marker default
f80ee8bce Rename option for clarity
bd3748a89 Add testing section.
90004e431 Change option name to avoid collision with Leaflet. Document default. Add pane unit tests.
e8f27e469 Follow standard and fully-qualify example references.
480c78698 Create pane example. Add second link to custom example.
4fffa0aa5 Support optional pane
f1b0d8fe3 Other 1.0.6
80570d1ec Update changelog for 1.0.6
397693fa8 Be a bit more careful with minZoom. refs #789
eab34569c Merge pull request #794 from ghybs/readme-https
e2d5201d8 Merge pull request #795 from ghybs/examples-https
b5afe4fe8 Refactor(examples/debug): use HTTPS for CDN, Tiles & OSM link
77fbc29d5 Docs(README): use https for demo links
e387e1f48 Fix non-integer min/max zoom and add a test. Ref #789
4062f3768 Remove mention of custom build stuff that hasn't existed for a while
c56a60d51 Fix addressPoints2 usage in example. Fixes #781
e9cc1e29f Bump for 1.0.5
590cce513 Merge pull request #779 from timkelty/pass-fitBounds-options
4a2399606 README for fitBounds options Pass undefined
97c3bb093 Allow paddling fitBounds options to zoomToBounds
d7288c7fe Merge pull request #776 from kent1D/patch-1
fcf9e9dd5 Update CHANGELOG.md
254187999 Remove unnecessary undefined check, this is set to null by default.
f01f8b1fe Merge pull request #773 from MrCheeze/master
ea9400017 Fixed check to match coding standards (!==)
b97aa03af Fixed bug where disableClusteringAtZoom being 0 is treated the same as null
80dad1839 Bump for 1.0.4
ac052696a add subplugin Leaflet.MarkerCluster.PlacementStrategies (#766)
162f15722 Pull minZoom fetching out to fix errors removing a MCG from a map while an animation is going on.
31e413d28 Add a note about the JS files
701591250 bump readme to 1.0.3 (#756)
588765b71 Bump for 1.0.3
c82f34252 Another test and fix for #753
706d6f266 Test and fix for moving a marker while the MCG is off the map. Refs #753
848a172a5 Bump version
a44c7c402 Update CHANGELOG for 1.0.2
cf26d0190 Update changelog for 1.0.0
b67410966 If a marker is moved with an open popup on it, re-open the popup after moving it. Fixes #651
16cf328a5 Support layerremove event. fixes #647
2a88279e9 Support layeradd event. refs #647
dbdedb93e Tidy up all these event handlers we now need to add.
cbfdb9806 Fix a few more cases where negative minZoom wasn't handled. refs #704
e65cb900c Fix an issue when opening a popup inside of zoomToShowLayer. If there was an existing spiderfied marker with a popup on it, the map would scroll back to the location of that marker.
37d5143a7 Merge pull request #747 from z3ut/fix-zoom-to-show-layer
63c648177 Add support for maps with negative minZoom. Fixes #704
0f8b3d102 Bump version
ee69a43f8 Add an example with draggable markers. Fix dragging markers. Fixes #685
f6379783a Bump all examples to leaflet 1.0.3
1e81a9aba Add an ISSUE_TEMPLATE based on the leaflet one
8bb6278e7 Remove zoomToShowLayer moveStart event check
9c5fe783b Add zoomToShowLayer tests
3468278a7 Fixed zoomToShowLayer() markers disappearing bug
7db30166f Merge pull request #746 from marcianoviereck92/patch-1
fa20d91b0 Fixed leaflet 1.0.2 bug where clearLayers would throw an exception
ad023e9ef Merge pull request #738 from bertyhell/patch-1
7872b96e8 Update example map link
a1d98d65f Add example image of the marker cluster map
7b577c1b6 Add example image to readme
87cd5fd2f Add example image
e6a24dc50 Merge pull request #734 from ghybs/patch-3
76f0b0f30 README corrected iconCreateFunction
771b41b3e README improve plugin install instructions
d4d93457f README correct TOC order
29972bef5 Add install and build steps with jake (#733)
bd8f1369a Revert "npm instructions for 1.0.0 in readme"
c0ac83899 npm instructions for 1.0.0 in readme
f22d877c1 Should bump leaflet version here too
dd55b4bcc Update bower.json for 1.0.0 too
9ac8ee068 Bump package.json 1.0.0
a806d5064 Bump readme for 1.0.0
7da6fb2ad Merge pull request #656 from ghybs/recursively-simplified
bbd5dad61 Merge pull request #703 from tyleralves/patch-2
2c4123994 Merge pull request #708 from ghybs/addLayerFreezableCompatibility
4fce18cfe Added missing rounding to map._zoom
f87592144 Get zoom from internal _zoom instead of map.getZoom()
0e5c3347f Remove leaflet from peerDependencies (Leaflet/Leaflet#4534)
7c894bf72 Merge pull request #697 from qedsoftware/bulk-icon-performance
53c1f94a1 Refresh icons after bulk action, not during one
7b360f931 Merge pull request #700 from qedsoftware/travis
49a4dc445 Fix travis build
7269ac32a Merge pull request #690 from LukeSwart/patch-1
d4a2d05b9 Update README.md
05e10293d Merge pull request #672 from ghybs/patch-3
cab42e4ee Replaced links to gh-pages by github.io
5171f18bb Update npm install location
c0051f0a9 Bump version number to match leaflet
3ab1c69da Merge pull request #665 from hyperknot/rc1
c578c76ed updated peer dep to leaflet rc1
68ca95f79 Update README.md
5bb70eae9 Merge pull request #657 from ghybs/spiderfyCombinedWithDisableClustering
617b8f3f7 Merge pull request #658 from ghybs/patch-2
cc7aea0cc Replaced `dependencies` by `peerDependencies`
6ee9972ab Copied note for `spiderfyOnMaxZoom` option explanation.
e4dca376f Merged conditions for zoomOrSpiderfy to avoid no action with disableClusteringAtZoom
c78e73987 Created disableClusteringAtZoomSpec
8bdb884c8 Simplified _recursively
d91addd7b Add building instructions
cb05eb292 Merge pull request #644 from ghybs/master
44963c185 Corrected #529 in master (Leaflet 1.0.0)
a4c3bce8b Remove built files, we only ship these in tags now. BYO otherwise.
2d6b625d9 Merge pull request #617 from zverev/unspiderfy
f2ea5b5db Merge pull request #624 from ghybs/addNestedLayerGroups
33e5eec4f Clone input array at first group met
088001092 Merge pull request #626 from isedwards/geojson_semicolons
9d7731600 Added a couple of missing semi-colons to improve readability/best practice.
9b451926f Manage nested groups in removeLayer and removeLayers as well
01467aa41 Missing final blank line in AddLayersSpec
7cf8152dd Manage adding nested Layer Groups
bfc877c8a Use the new travis infrastructure hopefully
2faaba2cb Add unspiderfy test
37fce91f2 Merge branch 'master' into unspiderfy
54976bf69 fix a typo
f61cfafc0 Public unspiderfy method
ba3c95b27 Update CHANGELOG
5f88d2428 Update leaflet version in package.json and format
43b094824 Grab leaflet from https always. Fixes #614
57cf04cdc Don't return markers that need to be removed in eachLayer/getLayers.
a44af7231 Update readme for 1.0.0
1b68284d8 Add test from calvinmetcalf in #397
e18deb3a2 Add missing tests to spec/index.html runner
9f6125501 Fix spiderfySpec tests
97e27e173 Merge branch 'master' into leaflet-master-merge
8ecc49410 Merge pull request #603 from ghybs/leaflet-master-merge
822131832 Documentation for unspiderfied event
de4d3321c Test for unspiderfied event
e3017c5e4 Merge remote-tracking branch 'newmanw/master'
6a93ee3a1 Add and fix tests from #421
e5ab67d26 Merge commit 'ac8c7063af5ea8e9cce4ce595c7d8303dc595c17'
d9c131036 Merge pull request #609 from OriginalSin/OriginalSin-patch-1
58480310d Merge pull request #607 from ghybs/removeAnimClassOnMapRemovedButSpiderfied
ad78e3c02 Merge pull request #610 from ghybs/patch-1
c1b79349e Added sub-plugin MCG.Freezable
ed9f02e6a Update MarkerClusterGroup.js
fd59fa494 Added missing blank line end of file spiderfySpec
e894b31fc Added listener de-binding on remove
4360bf546 Added test in spiderfySpec for class add/remove
c4bc5759a Corrected _spiderfierOnRemove to use no animation
a0ccbe062 Merge pull request #604 from ghybs/correctUnspiderfyVector
9a212d189 Merge pull request #606 from ghybs/spiderfyOnAllChildrenInBottomMostCluster
f18b7f9da Improved methods existence checks
4bb81fda0 Correct smart tab issue
cf2f310d2 Added spiderfy test for current zoom
8bb5e64a6 Simplified spiderfy at current zoom trigger
8e2e653ac Improved _zoomOrSpiderfy
6084aa7bb Removed useless comment
c338c7777 Removed useless comment
a4ec12ceb Replaced instanceof L.Marker by .setOpacity check
088b6ae7d Replaced instanceof L.Marker by .setOpacity check
f1ec8c5e0 Correct unspiderfy L.Circle and removeOutsideVisibleBoundsSpec
6328db92f Added magic-string devDependency
d37d0ed80 Updated examples script src to v1.0.0-beta.2 (leaflet-src.js)
b0e2acf27 Merged new commits and corrected all test suites
c69219fa4 Merge pull request #602 from tomchadwin/master
79abfe1bd Formatting typo
1a7d012cd Merge remote-tracking branch 'upstream/leaflet-master-merge' into leaflet-master-merge
5fcd073a8 Merge pull request #600 from ghybs/readmeToc
1226ecb43 Corrected sub-levels indentation
6c7da0549 Added TOC into README
b348916ca Merge pull request #599 from ghybs/master
d30f3aec8 README new sub-plugins section added links
e80c1e0cd README added sub-plugins section
050145c29 Merge pull request #587 from ghybs/maxLatitude
eb71a8f84 Merge pull request #588 from ghybs/patch-1
3e21068b3 Merge pull request #585 from ghybs/animationSpiderfyNoSMIL
ab451fc3f Added reference to chunked addLayers explanation
183cb4686 Removed no longer needed code
d76e9a467 Improved naming of _checkBoundsMaxLat
aa1ba5207 Corrected test suite for max latitude check
95dbec9ec Added bounds expansion to Infinity
cd4f76dec Merge pull request #584 from ghybs/addLayers-Optimization
71ce1a184 Corrected legOptions class assignment
d6d4e7f89 Corrected spiderfy leg anim and leg opacity option
984c632ab Replaced spiderfy legs animation from SMIL to CSS transition
bf228d5f7 Removed class extension
1c4a5f62c Replaced bounds reset method extension by cluster private method
d55e21919 Merge pull request #583 from ghybs/refreshClusters
8a9f126b5 Added test for refresh singleMarkerMode reject alien markers
54c642c13 Added hasLayer check for singleMarkerMode refresh
127d367c2 Converted singleMarkerMode and animateOption specs
d9441c78c Reset bounds rather than re-create
7bbf70e47 Externalized bound and wLatLng computations
0df95323b Merge pull request #579 from ghybs/patch-1
e09833063 Refactored RefreshSpec to use before/afterEach
845f70236 Separated code for singleMarkerMode refresh
e6f36e0da Made refreshClusters to re-draw markers in singleMarkerMode
37e923719 Added getChildCount and getAllChildMarkers
3d08cb1a8 Typos
f56c4fa56 Typo and re-organized methods
7fd26abea Small punctuation improvements
4b3931f38 Corrected chunk* options description
0aaa590e4 Merge remote-tracking branch 'upstream/master' into patch-1
88233ae36 Merge branch 'patch-1' of https://github.com/ghybs/Leaflet.markercluster into patch-1
c24555196 Parse id to an int, fixes #531
29d7c6e0a Merge pull request #565 from Cyrille37/patch-1
e97134b5e Merge pull request #578 from ghybs/animateOption
739c6f10a Added spiderLegPolylineOptions in section All options
d6966aa17 Added description of chunk* options for addLayers
52d238af5 Added animate option
4aeb0dff6 Merge pull request #575 from ghybs/removeOutsideVisibleBounds
134d0a8bd Merge pull request #574 from ghybs/patch-1
60746cc16 Merge pull request #577 from ghybs/refreshClusters
69e142d65 Converted removeOutsideVisibleBoundsSpec test suite
e5fabbe0e Improved reliability of RefreshSpec test suite
957151362 Clean remote
e7efb8d76 Merge branch 'removeOutsideVisibleBounds' of https://github.com/ghybs/Leaflet.markercluster into removeOutsideVisibleBounds
f8a1ff926 Corrected effect of removeOutsideVisibleBounds option
feb518cc3 Corrected example for refreshIconOptions
cc8de424b Improved example for refreshIconOptions
603b85788 Corrected typo
43dda33b6 Don't need to keep track of the issues this was added for
63ed8842e Merge pull request #564 from ghybs/master
5b4dc71c1 Merge pull request #572 from ghybs/patch-2
50bb1a383 Merge pull request #571 from ghybs/patch-1
60360b13b Improved zoomToShowLayer with callback check
d5c7c9460 Replaced constructors by factories
61d24ffdd typo corrected
67fec60ce Added Refresh src in spec/index, newline at end of spec/suites/refresh
dea22170d Updated README
be3cacca5 Added license in package.json, trying to revert dist files
d1b11d9e6 Sync NPM dependencies so test suites are run against Leaflet 1.0.0-beta1
ac71269a4 Merge branch 'leaflet-master' into leaflet-master-merge
306ef6b62 Re-built dist files to include Refresh methods
d56061f87 Disabled animation in test suite and added new src file in spec index
3fb556586 Modified method names, added new file to build script, build dist files, added license to package.josn, created test spec suite and added it to spec index.
fe8949348 in section "Events" added "clustermouseout" event
a12254c67 Corrected compatibility with MCG and added direct refresh of MCG when refreshing Marker
a06712053 Additional methods to facilitate marker icons update and propagate to parent clusters in real-time. For issues #561, #555, #535 and #498.
49c92f8f4 placed new file in src
b91a135e5 Merge branch 'master' of https://github.com/ghybs/Leaflet.markercluster-1
afc132d21 first commit
10d440ba4 Rough contributing file, stolen from leaflet version
64a2d5711 Merge pull request #556 from Intermaps/remove-layers-fix
879aa2897 corrected explanation text
3c3a9aad9 Moved files to sub-folder and added explanation text and page formatting
2fe03885f first commit of gh-pages for leaflet marker cluster test of hierarchical tree
da64e04a1 add spec for removing layers when the group is not on the map
a6a897670 remove duplicate _arraySplice
801f6443f fix removeLayers when cluster is not on the map
a415818d4 Merge pull request #553 from cyrilchaponeverysens/master
cfb91e1c5 Revert "Added "main" property to bower.json to make it compatible with wiredep" (there was already a valid main section)
44bd117de Merge pull request #533 from olive380/patch-2
84da57e41 Update QuickHullSpec.js
3fd3e0d65 Delete showCoverageOnHover-vertically-aligned-markers.html
9a29fd0b6 Delete showCoverageOnHover-horizontally-aligned-markers.html
e2be3564b Merge pull request #532 from olive380/patch-1
8d2ae0b73 Create remove-geoJSON-when-spiderfied.html
468241db1 Create showCoverageOnHover-horizontally-aligned-markers.html
368076a14 Create showCoverageOnHover-vertically-aligned-markers.html
e6aa0b253 Update MarkerClusterGroup.js
502d8ac2c Update MarkerClusterGroup.js
a2f509ce4 Update MarkerCluster.QuickHull.js
0fe481dab Update MarkerCluster.QuickHull.js
79e65560d Update MarkerCluster.QuickHull.js
e9889719d Update MarkerCluster.QuickHull.js
59a934408 Update MarkerClusterGroup.js
102f14718 Merge pull request #472 from Eschon/leaflet-master
6e35cf74b rounded zoom to work with fractional zoom levels
53997cd3e Fire unspiderfied event
ac8c7063a Fix indention from spaces to tabs
90fbaca19 Provide more detailed context information on the spiderfied event
a1e06288d Fix for the latest leaflet master changes. fixes #289
517ba04fc We weren't using the chunked option, fixed.
920c58f09 Small bug still using old variable
530ccaf1a Specifically ignore out setLatLng calls. Should fix using this with Leaflet.Label (which out don't setLatLng hack broke)
f86404e84 Revert "Cludge around setLatLng so we don't cause 'move' events when we hack-move markers. This wants doing better."
db142ea67 Working animated spiderfying I think...
4e3b8252f Some of animated stuff works. The lines don't animate as we aren't adding the vector layer initially any more and some other bits are broken too
542892d6e get non-animated spiderfying working.
27827b5d6 Rough marker move tracking. refs #57
51014578d Cludge around setLatLng so we don't cause 'move' events when we hack-move markers. This wants doing better.
bc463e42c Change event propagation overrides to work with leaflet master code.

git-subtree-dir: lib/Leaflet.markercluster
git-subtree-split: 584add242e2a190bc30bf86e9d2bae44bd362722

* Squashed 'lib/Leaflet.awesome-markers/' changes from 4dfeef694..734042aef

734042aef Merge pull request #90 from fraulyoner/2.0/develop
23a8efa22 Fix typos in README

git-subtree-dir: lib/Leaflet.awesome-markers
git-subtree-split: 734042aef260eb3d9b72bbac5db00dfc07dbc602

* webui: Updated leaflet version
2017-12-05 08:13:13 +00:00
Tony Murray
0713963ed4 Update influx-db dependencies (#7387)
Remove dev-depencies

Note: looks like we were using the symfony/yaml from this instead of /vendor due to autoload order, but yaml is just a dev dependency here.
2017-09-25 22:38:41 +01:00
Ryan Medlyn
6077d3a3db webui: Greatly reduces application memory leak for dashboard (#7215) 2017-09-01 17:27:01 +01:00
Neil Lathwood
d9f618185e fix bootgrid tables (#6043) 2017-03-01 10:22:26 +00:00
Paul Heinrichs
097a827759 webui: display QR codes for API access (#5988)
* Generate qr code for api hash

Added qrcodejs ( https://github.com/davidshimjs/qrcodejs )

* Add head to modal window

* updated to use fontawesome
2017-02-23 22:19:22 -06:00
Søren Rosiak
61b73e8a73 webui: Update Font Awesome to 4.7.0 (#5476)
* webui: Update Font Awesome

* remove lib
2017-01-18 12:57:57 -06:00
Tony Murray
e20a242785 refactor: use Composer to manage php dependencies (#5216) 2017-01-01 09:37:15 +00:00
Neil Lathwood
3264fa5896 security: Update PHPMailer to version 5.2.19 (#5253) 2016-12-28 08:47:06 +00:00
Neil Lathwood
f5a16be0e3 refactor: Move OS definitions into yaml files (#5189) 2016-12-23 17:53:19 +00:00
Neil Lathwood
78f5c26cd6 fix: Allow html but not script, head and html tags in notes widget #4898 (#5006) 2016-11-26 20:54:49 +00:00
crcro
dd82e414b0 lib vis update 2016-09-18 15:43:37 +03:00
crcro
245a1fe015 fix for alert graph not showing 2016-09-18 15:26:44 +03:00
Neil Lathwood
4001f8c60a webui: Updated bootgrid + added syslog colouring based on priority (#4287)
* Updated bootgrid + added syslog colouring based on priority

* Updated functions and removed uneeded file
2016-09-06 07:39:53 -05:00
Tony Murray
15b0cd68ea Move libraries in /includes to /lib (#4217) 2016-08-26 14:04:21 +01:00
Tony Murray
53b07d7a2a Fix deprecated constructors
This small change should't prevent easy updates to libraries and fixes the lint check on php7
2016-08-26 00:35:09 -05:00
Neil Lathwood
b1abe91728 Merge pull request #3299 from gcoeugnet/master
Add Canopsis transport
2016-03-31 17:04:34 +01:00
Guillaume COEUGNET
fcd2aae898 Add lib/PhpAmqpLib 2016-03-30 16:09:10 +02:00
Dave Bell
79c7540fa7 Merge commit '4430658932762ead3661231492b8074f144ea4b6' into influxdb-php
Conflicts:
	lib/influxdb-php/.gitignore
	lib/influxdb-php/README.md
2016-03-29 23:06:15 +01:00
dottoremoe
9db23d8c31 malaysia map - malaysia.js 2016-02-29 01:56:22 +08:00
Eldon Koyle
da7b9f7246 Merge commit 'dd04c360082eb7e0c54425907224ecf692307906' into update_visjs_again 2016-02-17 11:57:17 -07:00
Eldon Koyle
dd04c36008 Squashed 'lib/vis/' changes from 58f0da39..46fd2ac
46fd2ac Merge branch 'develop'
4f831b1 Released version 4.14.0
1d49599 Fixed a regression: Timeline/Graph2d constructor throwing an exception when no options are provided via the constructor
cd3bb8a Fixed #1615: implemented new option `dotSizeRatio`
2adde9d Bumped version number to 4.13.1-SNAPSHOT
7df01ee Merge branch 'develop'
8fd57e3 Added images to /dist again
f24e90c Released version 4.13.0
ecca6d8 Removed version number from bower.json, it's not used by bower and can be found in package.json
82f6bc8 Fixed initial load performance issue, triggered by failing comparison on Date objects.
8f4e9e9 Several changes to get the performance on dragging back in check.
00436ab Major redesign of data axis/scales, with large focus on creating a sane slave axis setup
fc03c75 Merge branch 'develop' of github.com:almende/vis into develop
f02da0b Merge pull request #1610 from felixhayashi/fix/variable
81510b6 Fixed wrong variable reference
f171328 Fixed #1541: Timeline and Graph2d did not load synchronously anymore
717f1f1 Moved `emit('_change'...)` from Timeline.setItems to ItemSet.setItems to be consistend with ItemSet.setGroups
ea26388 Merge branch 'develop' of github.com:almende/vis into develop
bb1e008 Fix typo, default position of right hand legend is top-right.
dee98d8 Merge pull request #1599 from mauk81/patch-2
ac2c21e typo
7b434c3 reverted example
c32aa90 Fixed #1597: Allow zero borders and addressed scaling artifacts. unified border calculation. Needs to be centralized to avoid duplication.
7a83087 Fixed #1594: bug in hierarchical layout.
84b65fd Fixed #1596: correct clean up of manipulation dom elements.
5e8b98d Fixed #1585: Allow bar groups to exclude from stacking
ec89306 Fixed #1580: Invisible timeline/graph should not be drawn, as most inputs are invalid Moved initial autoscale/fit method to an handler of the "changed" event.
7cf090e Fixed #1521: Prevent items from staying stuck to the left side of the viewport.
246de7f Fix autoscale of timeline axis.
1cb691c Update HISTORY
12f1468 Fixed #1177: Fix custom range of slaved right axis.
f462072 Fixed #1592: Emit a "changed" event after each redraw. Made "change" event private (by prefixing _).
85318a5 Update HISTORY
9031dc3 Merge branch 'develop' of github.com:almende/vis into develop
aa2a2d6 minor cleanups.
f064963 Merge remote-tracking branch 'origin/develop' into develop
9136141 Fixed #1584: Navigation buttons broken
daa643e Merge branch 'develop' of github.com:almende/vis into develop
bbf04d3 Fixed #1403: Graph2d change yAxisOrientation, Cleanup of linegraph's event handling Fixed #1557: Make sure we don't default to scientific notation. Couple of minor fixes in group counts and ranges.
6b773ce Merge remote-tracking branch 'origin/develop' into develop
18e1d1f Fixed 1588, destroy now releases the dataset.
f8a6513 Merge pull request #1583 from sapegin/patch-1
f97e57b rebuilt
0fdb5bf Merge remote-tracking branch 'origin/develop' into develop
39ea3b4 - Added options to customize the hierarchical layout without the use of physics. added example. Improved handling of options for hierarchical view.
8c9d85a Point main field in package.json to non-minified script.
5c96bbc Merge pull request #1576 from felixhayashi/develop
8ed7b69 added clearfix + updated example
d6cb3b6 = Fixed #1334 (again): Network now ignores scroll when interaction:zoomView is false.
7317714 Merge remote-tracking branch 'origin/develop' into develop
d2a3c7d updated mistake in the docs
5d740ae Updated vis.js in `dist` folder (see #1556)
a2293fd Fixed #1556: Network throwing an error when clicking the "Edit" button on the manipulation toolbar
f9c2da7 reverted examples
1d2488b Merge remote-tracking branch 'origin/develop' into develop
26c8369 rebuilt
2977dfd - Improved the hierarchical layout algorithm by adding a condensing method to remove whitespace.
b6b3807 Fixed #1017: Allow overriding of the minWidth of bars while zooming out. Fix the variable month width bug. Update documentation to better describe the current behavior.
69ce07d Update HISTORY
257d876 -Fix default axis formatting function. Fixes #1557. -Keep single defaults location -Update documentation on formatting function.
6e9e4cc - Altered edges for arrows and added the arrowStrikethrough option.
d844875 Bumped version number to 4.12.1-SNAPSHOT
9a5d1a0 Merge branch 'develop'
ae4df55 Released version 4.12.0
8d575d9 Released version 4.12.0
d5f15e9 Merge remote-tracking branch 'origin/develop' into develop
27c75df Fixed #1554: wrong cursor on readonly range items
2be3235 - Fixed upscaling when the window size increases. - Accepted pull request #1544, thanks @felixhayashi! - Fixed documented bug in #1544.
dc51099 Merge pull request #1544 from felixhayashi/fix/colorpicker
3828e07 fixes positioning of colorpicker BUT ALSO HAS A BUG
a6149d2 Fixed #1543: upgraded to hammer.js 2.0.4 and propagating-hammerjs 1.4.4
d7eee22 made database shape box a rectangle
11888f2 - Added #1138, enable the user to define the color of the shadows for nodes and edges. - Fixed #1528, #1278, avoided ID's being cast to string for methods that return ID's as well as storePositions casting to string.
573d355 - Fixed #1404, made the array returned by findNode match the docs.
589093d - Fixed #1406, control nodes are now drawn immediately without a second redraw.
ceac4bf - Fixed #1529, clustering and declustering now respects the original settings of the edges for physics and hidden.
34bd031 - Fixed findNode method. It now does not return internal objects anymore.
53cc2f6 Fixed #1531 , #1335:  border distances for arrow positioning
c7aac14 Added space to console warning
5faef92 Fixed #1127: `doubleClick` event not being fired
4cae296 Fixed #1527: error when creating/updating a Timeline without data
e547401 Bumped version number to 4.11.1-SNAPSHOT
36a8594 Merge remote-tracking branch 'origin/master'
ce3f82d Released version 4.11.0
df4e3d4 Fixed #1523: end of data range wrongly determined
d9e3619 Merge pull request #1504 from almende/fix_null_pointer
01af560 Merge pull request #1508 from marlosin/develop
9b7a2de Merge pull request #1510 from synthomat/patch-1
66aa047 Tiny typo
c32a986 Fix "sources" relative location in sourcemap file
00e791a Merge remote-tracking branch 'origin/develop' into develop
d866866 Fixed #1486: Item range sometimes wrongly calculated on IE in case of old dates
4c721d4 Remove non-implemented option again.
95d46a3 Introducing "point" style as new label for "points", consistency in naming. Some fixes and cleanups after the large rewrite.
9458e04 Updated the history release notes
5d90e67 Merge branch 'develop' of github.com:almende/vis into develop
5249806 Introducing a zindex option to control the svg render order. Provide the DataView.map() method similar to the DataSet one.
590dfbf Merge pull request #1505 from ttjoseph/svg2
02a7889 Use SVGElement.getBoundingClientRect() instead of .offstHeight
c4636af Fixed #1487: DataSet cannot remove an item with id `0` correctly
5fd3efc Fixed #1491: Problem using ctrl+drag in combination with using a `DataView`, and an issue with ctrl+drag when using `snap: null`
af8971f Prevent excessive rerendering and unknown group warnings.
d4324cf Put a proper scale limit on the bar icon Minor cleanup
2eeb1ac Merge pull request #1498 from almende/newShading
81c5730 -Move icon rendering code to their specific subclass. -Draw points in bar icon if appropriate -Introduce point icon -Cleanups
6dcb5e6 Merge pull request #1496 from almende/newShading
bfa68bb Update the documentation to reflect the new stacking options.
a582f7d Fix couple of off-by-one errors Add some enhancements for stacking (especially with regard to shading)
6be82f3 Merge pull request #1495 from almende/newShading
9ebdaa9 Fix bar graph Y-axis scale with stacking bar graphs.
f53a8b7 Don't copy datapoints on every render, only add render data to existing copy.
da29bb0 Another significant scalability optimization
c4d4fd4 More cleanups, more optimisations: -Never push into arrays that have a known length -Move more functions back into the main updateGraph method
8839373 Couple of performance gains in data insertion.
57a4c1f Fix placement of points in bar's side-by-side view Fix no-group data input case.
a44e88e Introducing group based shading Separate shading from line drawing (fixes drawing order) Cleanup of draw code Fix icon-shading CSS override
486cf53 Added a debug mode to visualize the forces on nodes (very cool :))
1815737 Merge remote-tracking branch 'origin/develop' into develop
9c2dbe5 cleaned up a little
3234dba updated history
4ccd606 Merge pull request #1481 from zefrog/setselection-method-not-exposed
4d8a259 reevaluated object bridging over extending. New implementations to prevent bugs.
4a18f89 Expose publicly setSelection method
8abded7 Updated history
893c8dc Merge pull request #1478 from almende/fixDataView
44dc1f8 Merge pull request #1463 from almende/graph2d_updates
6e9228c Remove unnecessary field reduction again.
22a964d Fix DataView for Graph2d, cleanup group initialisation.
24aa860 updated jdocs
d856af1 Cleaned up code, possibilities for future custom sorting of levels. Whitespace cleaning, options for layout, documentation and examples are still required.
e98f7b9 Warn on incorrect input
6059ff3 Revert inadvertedly included commit 9bf7452041ece6e7a0b95c227d7e2fe5045872df
7087b2d Merge remote-tracking branch 'origin/develop' into develop
5ea731c improved layout hierarchical view. TODO: cleanup level allocation to use the crawler.
2f1ff1b Fixed #1470: broken url in docs
6fc2a65 Fixed #1441: Height of subgroups not immediately updated after updating data in a DataSet or DataView
83671c8 Merge remote-tracking branch 'origin/develop' into develop
f57288e wip improved layout for hierarchical
e02ce1f Bumped version number to 4.10.1-SNAPSHOT
3263082 Added missing images in /dist again
dadadba Released version 4.10.0
1dff079 Fixed broken unit test
5f0755a Fixed #1437: Restored `data` property of the update event of DataSet.
77112d8 Fixed configureOptions for new option `maxMinorChars`
6453cd0 Fixed #1449, #1393: text of minor grids sometimes not being drawn.  Implemented option `maxMinorChars` to customize the width of the grids.
1330708 improvements on hierarchical layout
d48f3d6 added 1345 to the history
c964fe2 - Fixed #1461: Reset order of SVG elements in legend icons.
22b09d2 Add shading example.
7c5ca07 Update documentation for new Shaded option. Removed some old incorrect texts.
9bf7452 Prevent potential null pointer error
050bb42 Introduce "zero" shade orientation.
349017c - Fixed #1416: Fixed error in improvedLayout.
410f83a - Fixed #1358: Fixed example for clustering on zoom. Also removed private keyword from public methods. Let physics listen to data updates instead of being called from network.
ffa3be8 - Fixed #1408: Unclustering without release function respects fixed positions now.
3c9b849 - Fixed #1414: Fixed color references for nodes and edges.
5302f74 - Fixed #1362: Layout of hierarchicaly systems no longer overlaps NODES.
2490e15 Updated history
608446e Merge pull request #1421 from zefrog/feat-network-setselection
998bfac make edges and nodes parameters optional. dead vars removal
28e2711 Updated history and docs
9a200c6 Merge pull request #1423 from hansmaulwurf23/issue_1378
a09df56 defined a read only property 'data' to avoid breaking the api
9605e5c Fixed warning message
f22eb05 Updated history
73f3be9 Merge pull request #1395 from liuqingc/develop
5009adc Rename timeline option 'allDraggable' to 'itemsAlwaysDraggable' and update documentation
1eccf09 cloning old data before updating to fix #1378
572cafb updated doc with new setSelection method
11288ef Merge branch 'develop' of https://github.com/almende/vis into feat-network-setselection
ee0300c added method setselection used by both selectNodes and selectEdges methods
603d155 Merge remote-tracking branch 'origin/develop' into develop
46dbe3a Expose `vis.timeline.Core` for customization purposes (see #1126)
c94bb05 Merge pull request #1415 from labianchin/patch-2
0a0e2e2 Fix the example link in timeline docs
ce4fec4 - Fixed #1324: Labels now scale again.
759cff0 - Fixed #1398: Support nodes start with the correct positions.
dc7fdaa Updated docs on DataSet.get() and DataView.get(). See #1401
af51794 Added accidentally removed `__any__` field from locales structure again
5e1169e add allDraggable option for timeline to support dragging unselected item
a022e56 Updated history
4822b75 Merge pull request #1381 from phimimms/develop
04d3b97 Fixed #1385: Draw lines on top of bars
627d708 Replaced for-in loops in DataSet.js and DataView.js with Object-key iteration of cached length for greater computational performance.
9744c5e Fixed #1353: Custom bundling with browserify requiring manual installation of `babelify`. Updated readme on custom bundling.
db2b1c8 Updated history
a67c245 Merge pull request #1354 from hansmaulwurf23/multiselectFiltersGroup
4b41464 renamed option from multiselectFiltersGroup to multiselectPerGroup, added docs
d882fae Removed the removed options `showMinorLines` and `showMajorLines` from the docs.
46389ae added option multiselectFiltersGroup
e91ab23 Fixed #1343: Connected edges are now deselected too when deselecting a node
2e55773 Bumped version number to 4.9.1-SNAPSHOT
a59e728 Released version 4.9.0
d7124f9 Fixed #1249: option `hiddenDates` not accepting a single hidden date
3041298 Fixed #1326: wrongly positioned dot of PointItems
60fdb07 Updated history
440065e Merge pull request #1325 from machinemetrics/master
d968da7 Bad call to getHiddenDurationBetween
9aa4aed Merge pull request #1310 from bsnote/drawpoints-styles-fix
eef2407 updated history
5f1986d Merge remote-tracking branch 'origin/develop' into develop
1131864 added images with borders and updated the manipulation css
73d3a2d Merge pull request #1307 from Abrazan/custom-timeline-title
4ac55e9 add styles option back for data points
9781185 updated docs
db598bc - Made autoscaling on container size change pick the lowest between delta height and delta width.
59a5fe8 - Fixed bug where dragging a node that is not a control node during edit edge mode would throw an error.
7a6246e - Fixed bug where a box shape could not be drawn outside of the viewable area.
bb0104b fixed self referencing edges during clustering
1b9f166 rebuilt
0ec249f updated to SNAPSHOT 4.8.3
91025a1 updated to SNAPSHOT 4.8.3
111c998 updated publish guide
db25fa6 Release 4.8.2
3733976 - Fixed deletion of options by settings them to null.
db05c2b - Fixed arrows to icon, text and circularImage shapes
fd48470 - Fixed arrows with some shapes when they are selected. #1292
985693e - Fixed stabilized event not firing if layout algorithm does very well.
1d0db57 - Fixed setting font to null so the network won't crash anymore.
ab88ca5 - Fixed scaling not doing anything to edges.
3f03ceb Added possibility to change (or hide) the title of a CustomTime element.
05a6021 Fixed an error in the configurator option `throttleRedraw`
68c1172 Fixed phantom edges during clustering #1281
6605059 Bumped version number to 4.8.2-SNAPSHOT
06811f3 Released version 4.8.1
637fc3f Fixed `onMoving` not normalizing the dates again after callback
6581f56 - Fixed bug that broke the network if drawn in a hidden div #1254
21fc483 Fixed unselectAll method
2874bea Merge remote-tracking branch 'origin/develop' into develop
3f5c71e - Fixed critical camera zoom bug #1273. #1266, #1255 - unified some methods in the networkUtil - Fixed initial zoom issues #1252
d97bb0d Fixed #1267: wrong description for `clickToUse`
7ab2015 Merge remote-tracking branch 'origin/develop' into develop
bbbaeb4 Fixed #1215: inconsistent types of properties `start` and `end` in callback functions `onMove`, `onMoving`, `onAdd`
fbd5d4e Merge pull request #1261 from Tooa/fix_doc_graph2d
5532a88 Fixed wrongly positioned row in docs
c694a8b Merge branch 'master' into develop
2c32f5a Merge pull request #1263 from littleguga/patch-1
9169559 Fixed groups.visible Description
038e786 fix broken links
1e10b1b Updated history
2b4f060 Merge pull request #1243 from Tooa/german_locale
b391dae Bumped version number to 4.8.1-SNAPSHOT
5275849 Released version 4.8.0
a74a42f Lowered stabilization iterations
0a82942 Add German locale to network
10e1ca3 More explanation for `groupOrder`, see #1241
d42bf3a Merge remote-tracking branch 'origin/develop' into develop
e24861f Merge pull request #1242 from gomezgoiri/master
7034f77 Removed a few old deprecations, fixed a typo
01e5763 Updating documentation to mention Spanish locale
00078f6 Adding Spanish locale
a328415 Added loop protection to `layoutNetwork`
2419722 Updated history
f31b58a Merge pull request #1209 from Bernd0/develop
644f8ee Fixed #1214: items wrongly marked as dirty with every `rangechange` event
f4bd6c2 safeguard stepquality
cd84247 appended history, fixed getPositions, moved color backer back to container from document root
9b6590e Introduced the Graph2d group option 'excludeFromLegend'.
0e6aac4 - Added support for Gephi directed edges, edge labels and titles.
a007ecd Merge branch 'kamadaKawai' into develop
0bcaee2 rebuilt
64c1995 added public ready versions of kamadakawai and adaptive layout, clustering bugfixes and reactive network.
26a1fc5 - Fixed bugs in clustering algorithm. - Greatly improved performance in clustering.
d019722 - added labels for edges and titles for nodes and edges in gephi import
8eea19a - cleaning up
93f1480a - improved performance
36ecb2c - added improved timestep adaption, fixed bugs in stabilization
8744d63 - added adaptive timestep to physics.
09d3dfb - made it pretty, fixed bugs in clustering
0161b22 - added kamadaKawai algorithm as prototype
dab28ee Merge pull request #1183 from vukk/network-docfix
c0a0a2a Fixes documentation for group option of node.
e95913e Merge pull request #1175 from JonathanGeoffroy/develop
84ba9e7 Merge remote-tracking branch 'origin/develop' into develop
ad0916b Point node.js "main"  file to the built ./dist/vis.min.js` (see #1180)
cc4b573 docs: the function's name was wrong
9b83e2c - Fixed dynamic updating of label properties.
2f2ec2f - Improved the positioning and CSS of the configurator and the color picker.
22bc5e0 added popup to configurator to explain the behaviour
0c59f88 rebuilt and updated history
ea59045 Merge remote-tracking branch 'origin/develop' into develop
6e01279 - Fixed #1152, updating images now works.
5822837 Updated dist files
acd52e1 Merge remote-tracking branch 'origin/develop' into develop
d922368 Implemented redraw throttling for Timeline
d87fd1d reverted selectEdge pull
9a2bec6 removed node cleanup
f7cc574 Updated history
9f665f0 Merge pull request #1109 from hansmaulwurf23/group_dragging
a2bf879 Merge pull request #1153 from JonathanGeoffroy/issue#1144-selectEdge
b129480 Merge pull request #1146 from dburdick/develop
f3bded6 Merge pull request #1148 from JonathanGeoffroy/doc
711b3de fix : selectEdge was fired even if user clicked on a node
e8a2cc8 docs: fix a typo (selcted -> selected)
2ca2202 fixed emitting groupDragged event in callback
fa7eb4a Fix misspelling in milliseconds
1f4c9a4 added groupId to groupDragged event
21d09a2 finished new example for groupEditable
6804cb5 changed docs for groupDragging
6fbfade rebuilt
401e262 Merge remote-tracking branch 'origin/develop' into develop
0bc11f9 Fixed #1140, labels and points correctly stack.
58e2157 added groupEditable example
584f266 removed updating the groups in groupOrderSwap, started docs
da26177 Merge pull request #1133 from Braincompiler/master
9163322 fix "TypeError: Cannot read property '_bound' of undefined" in angular2 environment
5ea6411 added event handlers for onAddGroup, onMoveGroup, onRemoveGroup
eb3038a Bumped version number to 4.7.1-SNAPSHOT
955dd25 Released version 4.7.0
64b2c78 Removed move callbacks
c2e7123 removed unused option groupsDraggable
448411e Dragging of Groups working now using a swap function
cfadb05 bugfix
42c2adf prepared for supernodes. Cleaned code
700e735 added cubic bezier curves.
5023511 added moveNode method
8c53e8a Merge remote-tracking branch 'origin/develop' into develop
116244c Fixed #1118: since v4.6.0, grid of time axis was wrongly positioned on some scales
dbdc21c Merge pull request #1119 from brendon1982/develop
1cb3221 Rewrote the Images.js for the network in ECMA script 6 syntax.
789f7c6 Updated history
8b70e93 Merge pull request #1114 from Fice/groupDrag
e015f7f Moved internal functions in Images.load onto the prototype
05da3df Fixed indenting issue in cirular images example
81c7e46 Fixed issue where broken images wouldn't always be rendered.
22822da group dragging works (on groups with same height) using a swap function
6f665f4 fixed doc links
1edde77 moved to v4.6.1-SNAPSHOT
1b381ec Release 4.6.0
5dba668 - prerelease.2
daba2f7 - prerelease
9966d53 - Added #936, useImageSize for images and circularImages
469b3b9 - Added #931, borderRadius in shapeProperties for the box shape.
5beeca1 - Fixed #1112, network now works in firefox on unix again.
7fdc22b Merge remote-tracking branch 'origin/develop' into develop
a9ca766 Fixed #24: Implemented support for time zones (see examples/timeline/other/timezone.html)
b75fe65 - Fixed #1111, check if edges exist was not correct on update.
228ac7e Bumped version number to 4.5.2-SNAPSHOT
f0cc3ee Released v4.5.1
fd6b70c Mentioned 2 way data binding of DataSet in the Data Format sections in the docs (see #1099)
3f19431 Fixed delete button when using multiple selected items in manipulation system.
b68030a Group Dragging in Timeline
e228ba9 different fix for clustering, this one should work :) (sounds familiar)
e9fc1a0 fixed hierarchical layout toggle issue.
5f486ee fixed clustering phantom edge problem
8c9c865 updated publish manual
6c89cbd Moved to 4.5.1--snapshot
13bd407 While dragging multiple items across groups, keep the group-offset.

git-subtree-dir: lib/vis
git-subtree-split: 46fd2accd44fb3776f5a7904acdfa226de2417f8
2016-02-17 11:57:17 -07:00
Eldon Koyle
101354e3db Revert "update VIS to ver. 4.7.0"
This reverts commit e603881113.
2016-02-17 11:57:08 -07:00
Neil Lathwood
17445292eb Merge pull request #2208 from laf/influx
InfluxDB support
2016-01-06 09:08:39 +00:00
Eldon Koyle
ff2d4ddf49 Merge commit '8a2550e7d5cd19e25616087052915e1c9978e0ad' 2016-01-05 17:35:26 -07:00
laf
0f33f6d1fa Rebased 2016-01-04 12:09:32 +00:00
laf
b31cbd8dae Code for Radius authentication added 2015-12-13 15:37:55 +00:00
laf
8e5d619439 Added influxdb library 2015-12-02 23:51:36 +00:00
laf
05e3c581b0 Removed influxdb-php library 2015-12-02 23:44:03 +00:00
laf
c5d4c0a49f Add 'lib/gridster/' from commit 'a7ed9a4adec9f7c8361ad6f392993a1f0b9c1601'
git-subtree-dir: lib/gridster
git-subtree-mainline: 80f8419dac
git-subtree-split: a7ed9a4ade
2015-11-10 21:43:44 +00:00
laf
80f8419dac Updated gridster in makefile 2015-11-10 21:43:36 +00:00
laf
7b14aada4e Rebased 2015-10-26 11:08:19 +00:00
Rosiak
65841f0013 Update Font Awesome
- Fix #2166
2015-10-16 23:30:44 +02:00
laf
bc4f90877c More updates 2015-08-19 22:15:21 +00:00
laf
471c4bacf3 More updates 2015-08-19 22:13:50 +00:00
laf
6f11ffee14 More updates 2015-08-19 22:06:50 +00:00
laf
9c4292e35e More updates 2015-08-19 22:02:59 +00:00
laf
afcb7d9dd3 More updates 2015-08-19 21:58:16 +00:00
laf
9281dd3926 More updates 2015-08-19 21:56:16 +00:00
laf
be61f522f8 More 2015-08-19 21:54:44 +00:00
laf
28d452cda4 More updates 2015-08-19 21:53:26 +00:00
laf
69706e2b72 Updated 2015-08-19 21:51:52 +00:00
laf
65d51f5e2b Added influxdb-php 2015-08-19 21:50:46 +00:00
laf
50fbedfe22 Updated influxdb 2015-08-19 21:48:44 +00:00
laf
f633d986f8 Updated influxdb-php 2015-08-19 21:47:39 +00:00
laf
98de6faf6b Added influxdb from composer 2015-08-18 19:13:40 +00:00
laf
adfcec33fd Removed influxdb-php as using composer 2015-08-18 18:59:59 +00:00
laf
087762c651 merged upstream 2015-08-18 18:48:28 +00:00