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

Fix the ace editor bug. #946

Merged
merged 34 commits into from
Aug 18, 2017
Merged

Fix the ace editor bug. #946

merged 34 commits into from
Aug 18, 2017

Conversation

zhiqiangx
Copy link

No description provided.

zhiqiangx and others added 30 commits July 19, 2017 09:51
Conflicts:
	smart-zeppelin/zeppelin-web/src/app/app.js
* 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
* 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
* 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
* Add SmartNotebook

* Add SmartNotebook
@zhiqiangx zhiqiangx merged commit a806ee1 into trunk Aug 18, 2017
duzhen1996 referenced this pull request in duzhen1996/SSM Aug 18, 2017
* merge the 'zeppelin' app.js to 'trunk'.

* Change button style of rules (#747)

* 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

* 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

* Add help for actions (#794)

* #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

* Add SmartNotebook (#831)

* Add SmartNotebook

* Add SmartNotebook

* Fix build bugs and web UI

* change the home page.

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

* Update the web UI "Smart Manager" to "Smart Storage Manager"

* Add mover and copy view.

* Merge trunk

* Fix the googlefonts build bug.

* Delete the ActionSevice and RuleService from 'smart-server'

* Delete .flattened-pom.xml

* Fix the ace editor's cursor bug.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant