Skip to content
This repository has been archived by the owner on Jan 3, 2023. It is now read-only.

Solve mouse mark #900

Merged
merged 19 commits into from
Aug 8, 2017
Merged

Solve mouse mark #900

merged 19 commits into from
Aug 8, 2017

Commits on Jul 19, 2017

  1. merge the 'zeppelin' app.js to 'trunk'.

    zhiqiangx committed Jul 19, 2017
    Configuration menu
    Copy the full SHA
    96d1f02 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/trunk' into trunk 

    Conflicts:
	smart-zeppelin/zeppelin-web/src/app/app.js
    zhiqiangx committed Jul 19, 2017
    Configuration menu
    Copy the full SHA
    77d5648 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2017

  1. Change button style of rules (#747)

    @littlezhou
    yanpingyou authored and littlezhou committed Jul 20, 2017
    Configuration menu
    Copy the full SHA
    6d690cc View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2017

  1. Add tooltip for action (#765) 

    * Fix #741 Remove the usage of view

* change button to phglyphicon, start and stop button combine into one

* add tooltip

* add tooltip for rules and actions
    yanpingyou authored and zhiqiang committed Jul 26, 2017
    Configuration menu
    Copy the full SHA
    504a5ad View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2017

  1. Change home.html (#786) 

    * Fix #741 Remove the usage of view

* change button to phglyphicon, start and stop button combine into one

* add tooltip

* add tooltip for rules and actions

* change home.html

* change about smart modal content
    yanpingyou authored and zhiqiang committed Jul 27, 2017
    Configuration menu
    Copy the full SHA
    bdbf424 View commit details
    Browse the repository at this point in the history

  2. Add help for actions (#794)

    @littlezhou
    yanpingyou authored and littlezhou committed Jul 27, 2017
    Configuration menu
    Copy the full SHA
    9903862 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2017

  1. #778 Add Rule format description on UI (#810) 

    * Fix #741 Remove the usage of view

* change button to phglyphicon, start and stop button combine into one

* add tooltip

* add tooltip for rules and actions

* change home.html

* change about smart modal content

* add help for actions

* #778 Add Rule format description on UI

* #778 Add Rule format description on UI

* #778 Add Rule format description on UI

* #778 Add Rule format description on UI
    yanpingyou authored and zhiqiang committed Jul 31, 2017
    Configuration menu
    Copy the full SHA
    135a6ff View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2017

  1. Add SmartNotebook (#831) 

    * Add SmartNotebook

* Add SmartNotebook
    zhiqiang authored Aug 2, 2017
    Configuration menu
    Copy the full SHA
    05e50d2 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2017

  1. Merge branch 'trunk' into smart-notebook

    zhiqiangx committed Aug 3, 2017
    Configuration menu
    Copy the full SHA
    4d614d6 View commit details
    Browse the repository at this point in the history

  2. Fix build bugs and web UI

    zhiqiangx committed Aug 3, 2017
    Configuration menu
    Copy the full SHA
    7582b24 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'trunk' of https://github.com/Intel-bigdata/SSM into sma… 

    …rt-notebook
    zhiqiangx committed Aug 3, 2017
    Configuration menu
    Copy the full SHA
    a641c08 View commit details
    Browse the repository at this point in the history

  4. change the home page.

    zhiqiangx committed Aug 3, 2017
    Configuration menu
    Copy the full SHA
    68c0396 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'trunk' of https://github.com/Intel-bigdata/SSM into sma… 

    …rt-notebook
    zhiqiangx committed Aug 3, 2017
    Configuration menu
    Copy the full SHA
    79fb8cb View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2017

  1. Merge branch 'trunk' of https://github.com/Intel-bigdata/SSM into sma… 

    …rt-notebook
    zhiqiangx committed Aug 4, 2017
    Configuration menu
    Copy the full SHA
    37acaf2 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'trunk' of https://github.com/Intel-bigdata/SSM into sma… 

    …rt-notebook
    zhiqiangx committed Aug 4, 2017
    Configuration menu
    Copy the full SHA
    a546f75 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2017

  1. Merge branch 'trunk' of https://github.com/Intel-bigdata/SSM into sma… 

    …rt-notebook
    zhiqiangx committed Aug 7, 2017
    Configuration menu
    Copy the full SHA
    1cbf816 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'trunk' of https://github.com/Intel-bigdata/SSM into sma… 

    …rt-notebook
    zhiqiangx committed Aug 7, 2017
    Configuration menu
    Copy the full SHA
    dbd7e1e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'trunk' of https://github.com/Intel-bigdata/SSM into sma… 

    …rt-notebook
    zhiqiangx committed Aug 7, 2017
    Configuration menu
    Copy the full SHA
    9d2948f View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2017

  1. remove 'zeppelin-web' from 'smart-zeppelin' default module.

    zhiqiangx committed Aug 8, 2017
    Configuration menu
    Copy the full SHA
    7160f99 View commit details
    Browse the repository at this point in the history