Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge from rubo77/gluon-alfred-vis #1

Open
wants to merge 43 commits into
base: master
Choose a base branch
from
Open

Merge from rubo77/gluon-alfred-vis #1

wants to merge 43 commits into from

Commits on May 22, 2014

  1. Update README.md 

    typo
    @rubo77
    rubo77 committed May 22, 2014
    Configuration menu
    Copy the full SHA
    6d7a249 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2014

  1. Added GEO coordinates

    @rubo77
    rubo77 committed Jun 5, 2014
    Configuration menu
    Copy the full SHA
    a15d23c View commit details
    Browse the repository at this point in the history

  2. list, graph and map linked to http://freifunk.in-kiel.de/ffmap/

    @rubo77
    rubo77 committed Jun 5, 2014
    2 Configuration menu
    Copy the full SHA
    16e1de7 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2014

  1. show all available info for each node

    @rubo77
    rubo77 committed Jul 22, 2014
    Configuration menu
    Copy the full SHA
    8683408 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2014

  1. Merge remote-tracking branch 'origin/master' into more_info

    @rubo77
    rubo77 committed Jul 29, 2014
    Configuration menu
    Copy the full SHA
    3be450e View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' into more_info

    @rubo77
    rubo77 committed Jul 29, 2014
    Configuration menu
    Copy the full SHA
    b7dfafb View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2014

  1. Added try catch block around each element from json string, in case i… 

    …t doesn't exist
    @rubo77
    rubo77 committed Jul 30, 2014
    Configuration menu
    Copy the full SHA
    45a538e View commit details
    Browse the repository at this point in the history

  2. pathon script that logs all nodes in folder and creates an alfred_off… 

    …line.json file with all offline nodes
    @rubo77
    rubo77 committed Jul 30, 2014
    Configuration menu
    Copy the full SHA
    b9d504b View commit details
    Browse the repository at this point in the history

  3. restructured bin and www for binaries and html pages

    @rubo77
    rubo77 committed Jul 30, 2014
    Configuration menu
    Copy the full SHA
    a80c6f9 View commit details
    Browse the repository at this point in the history

  4. added option to pass python path to bash file

    @rubo77
    rubo77 committed Jul 30, 2014
    Configuration menu
    Copy the full SHA
    37dcc88 View commit details
    Browse the repository at this point in the history

  5. clean up alfred-log.py, and make it directly executable

    @wklaebe
    wklaebe committed Jul 30, 2014
    Configuration menu
    Copy the full SHA
    f7d1f09 View commit details
    Browse the repository at this point in the history

  6. * clean up update-json.sh 

    * pull crontab remark out of update-json.sh into actual crontab file
* generalize even more
    @wklaebe
    wklaebe committed Jul 30, 2014
    Configuration menu
    Copy the full SHA
    d6936b5 View commit details
    Browse the repository at this point in the history

  7. correct minor f*up

    @wklaebe
    wklaebe committed Jul 30, 2014
    Configuration menu
    Copy the full SHA
    6e697fa View commit details
    Browse the repository at this point in the history

  8. exlracted function for each node in javascript

    @rubo77
    rubo77 committed Jul 30, 2014
    Configuration menu
    Copy the full SHA
    7b26912 View commit details
    Browse the repository at this point in the history

  9. correct url to URL

    @wklaebe
    wklaebe committed Jul 30, 2014
    Configuration menu
    Copy the full SHA
    76f2651 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'more_info' of git://github.com/ffnord/gluon-alfred-vis … 

    …into more_info
    @wklaebe
    wklaebe committed Jul 30, 2014
    Configuration menu
    Copy the full SHA
    0c85dbf View commit details
    Browse the repository at this point in the history

  11. corrected offline node list alfred_offline.json

    @rubo77
    rubo77 committed Jul 30, 2014
    Configuration menu
    Copy the full SHA
    661df8e View commit details
    Browse the repository at this point in the history

  12. add clarification that this page needs JavaScript

    @wklaebe
    wklaebe committed Jul 30, 2014
    Configuration menu
    Copy the full SHA
    ac864b2 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'more_info' of git://github.com/ffnord/gluon-alfred-vis … 

    …into more_info
    @wklaebe
    wklaebe committed Jul 30, 2014
    Configuration menu
    Copy the full SHA
    47ca07b View commit details
    Browse the repository at this point in the history

  14. added offline nodes to list with new column

    @rubo77
    rubo77 committed Jul 30, 2014
    Configuration menu
    Copy the full SHA
    12ec18a View commit details
    Browse the repository at this point in the history

  15. enhanced README and call with --help

    @rubo77
    rubo77 committed Jul 30, 2014
    Configuration menu
    Copy the full SHA
    267180e View commit details
    Browse the repository at this point in the history

  16. colspan="0" to always span whole colgroup

    @wklaebe
    wklaebe committed Jul 30, 2014
    Configuration menu
    Copy the full SHA
    f0c986a View commit details
    Browse the repository at this point in the history

  17. reverted change in list.css and excluded to alfred.css, so list.css s… 

    …tays the same as in ffmap-d3
    @rubo77
    rubo77 committed Jul 30, 2014
    Configuration menu
    Copy the full SHA
    240cc6c View commit details
    Browse the repository at this point in the history

  18. Tidied indentation

    @rubo77
    rubo77 committed Jul 30, 2014
    Configuration menu
    Copy the full SHA
    008252c View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2014

  1. * added date of latest check 

     * added nodecount online, offline and total
 * added link to jsonfile in node logs
    @rubo77
    rubo77 committed Jul 31, 2014
    Configuration menu
    Copy the full SHA
    578f1ba View commit details
    Browse the repository at this point in the history

  2. add modified time for offline nodes

    @rubo77
    rubo77 committed Jul 31, 2014
    Configuration menu
    Copy the full SHA
    672cbf9 View commit details
    Browse the repository at this point in the history

  3. sarted: show legacy nodes #5

    @rubo77
    rubo77 committed Jul 31, 2014
    Configuration menu
    Copy the full SHA
    aff0e29 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2014

  1. reordered ajax calls

    @rubo77
    rubo77 committed Aug 2, 2014
    Configuration menu
    Copy the full SHA
    75fd0c5 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2014

  1. Added Legacy nodes.json to list 

    closes #5 show legacy nodes #5
    @rubo77
    rubo77 committed Aug 3, 2014
    Configuration menu
    Copy the full SHA
    849017f View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2014

  1. add links to map from geo coords #6

    @rubo77
    rubo77 committed Aug 4, 2014
    Configuration menu
    Copy the full SHA
    7517cb8 View commit details
    Browse the repository at this point in the history

  2. only try to download node detail json for alfred-nodes

    @rubo77
    rubo77 committed Aug 4, 2014
    Configuration menu
    Copy the full SHA
    26e6b4a View commit details
    Browse the repository at this point in the history

  3. show distribution instead of firmware on gateways

    @rubo77
    rubo77 committed Aug 4, 2014
    Configuration menu
    Copy the full SHA
    6def6a4 View commit details
    Browse the repository at this point in the history

  4. more-info: Increment month of offline date by one.

    @sargon
    sargon committed Aug 4, 2014
    Configuration menu
    Copy the full SHA
    4232964 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2014

  1. fixed: offline vpn gateways crashed the alfred_offline generation

    @rubo77
    rubo77 committed Aug 5, 2014
    Configuration menu
    Copy the full SHA
    0e72bdb View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2014

  1. Log legacy nodes also

    @rubo77
    rubo77 committed Aug 13, 2014
    Configuration menu
    Copy the full SHA
    4f341e5 View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2014

  1. show how many are offline and how many legacy were online

    @rubo77
    rubo77 committed Aug 16, 2014
    Configuration menu
    Copy the full SHA
    d390ab9 View commit details
    Browse the repository at this point in the history

  2. show how many legacy nodes are online

    @rubo77
    rubo77 committed Aug 16, 2014
    Configuration menu
    Copy the full SHA
    4cb0d6e View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2014

  1. Link to wiki page of kiel

    @rubo77
    rubo77 committed Aug 17, 2014
    Configuration menu
    Copy the full SHA
    f49cbd9 View commit details
    Browse the repository at this point in the history

  2. started localisation for different communities

    @rubo77
    rubo77 committed Aug 17, 2014
    Configuration menu
    Copy the full SHA
    ca89c17 View commit details
    Browse the repository at this point in the history

  3. added nodeplot statistic

    @rubo77
    rubo77 committed Aug 17, 2014
    Configuration menu
    Copy the full SHA
    66930b0 View commit details
    Browse the repository at this point in the history

  4. replace colons in link no nodes in luebeck links

    @rubo77
    rubo77 committed Aug 17, 2014
    Configuration menu
    Copy the full SHA
    a686e12 View commit details
    Browse the repository at this point in the history

  5. if there are no offline nodes, ",".join(ons) must return {}

    @rubo77
    rubo77 committed Aug 17, 2014
    Configuration menu
    Copy the full SHA
    c9da228 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2014

  1. setTimeout set to 10s because sometimes it takes some time to load al… 

    …l data to calculate the number of seen offline nodes
    @rubo77
    rubo77 committed Aug 21, 2014
    Configuration menu
    Copy the full SHA
    147aa23 View commit details
    Browse the repository at this point in the history