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

使用 python-decouple 加载配置等 #26

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

使用 python-decouple 加载配置等 #26

wants to merge 88 commits into from

Conversation

liut
Copy link

@liut liut commented Jan 5, 2017

  • 允许使用环境变量加载配置，以便于打包安装和生成docker镜像
  • 重命名 requirements
  • UI优化：checkbox 右侧的标签也能点击
  • 规范编辑器配置

chyeh and others added 30 commits October 26, 2015 06:50
@chyeh
Modules should always get session values from SSO
5042f42
@chyeh
Don't need the session variable anymore
ef06c52
@hitripod
Merge pull request #2 from chyeh/master
b20ea21 
[OWL-82] Fix the SSO mechanism
[OWL-144] Add grafana-style sidemenu and navbar.
841620c 
1. Add 'fonts/' and 'grafana_statics/'
2. Modify related html files.
[OWL-144] Use the absolute URL for falcon-dashboard
552ded3
[OWL-144] Use the absolute URL for UIC.
f92b934
Remove a redundant character.
41af7d9
[OWL-144] Clicking outside also closes the UIC dropdown menu.
5fdbef3
[OWL-144] Replace href with 'Shortcut' defined in config.py.
9e16b24 
1. Add 'shortcut' in config.py
2. Pass config for all views(render_template), which is referenced as 'config.JSONCFG.shortcut.falconDashboard'
Fix Uncaught TypeError: $.layer is not a function.
500ab2b
Remove href of fav32.png to avoid jumping out when collapsing sidemenu.
533dfd5
@chyeh @myhung
Modules should always get session values from SSO
74c78f0
@chyeh @myhung
Don't need the session variable anymore
be54103
@myhung
[OWL-144] Add grafana-style sidemenu and navbar.
d37d4c8 
1. Add 'fonts/' and 'grafana_statics/'
2. Modify related html files.
@myhung
[OWL-144] Use the absolute URL for falcon-dashboard
ddd3c69
@myhung
[OWL-144] Use the absolute URL for UIC.
f887166
@myhung
Remove a redundant character.
98809e2
@myhung
[OWL-144] Clicking outside also closes the UIC dropdown menu.
6cf9cfc
@myhung
[OWL-144] Replace href with 'Shortcut' defined in config.py.
980db9f 
1. Add 'shortcut' in config.py
2. Pass config for all views(render_template), which is referenced as 'config.JSONCFG.shortcut.falconDashboard'
@myhung
Fix Uncaught TypeError: $.layer is not a function.
1190725
@myhung
Remove href of fav32.png to avoid jumping out when collapsing sidemenu.
5606b01
@myhung
Merge branch 'master' of https://github.com/myhung/portal
8e0fafa 
Conflicts:
	web/__init__.py
	web/controller/api.py
@hitripod
Merge pull request #3 from myhung/master
d07544f 
[OWL-166] Add nodata
@minimum-hsu
Fix error when inserting data into mockcfg table.
982e2b0 
MySQL datetime format is '1900-01-01 12:00:00'.
@hitripod
Merge pull request #5 from minimum-hsu/master
dc91fd8 
[OWL-166] Fix error when inserting data into mockcfg table.
@chuanxd
[OWL-182] unify font style with grafana
2cb1293
@hitripod
Merge pull request #6 from chuanxd/fix_portal_sidebar_font_style
8adc6d2 
[OWL-182] unify font style with grafana
@chuanxd
[OWL-157] fix scroll display
260585f 
 - move grafana scroll into portal
@hitripod
Merge pull request #7 from chuanxd/fix_scroll_display
11f48ae 
[OWL-157] fix scroll display
@hitripod
[OWL-212] Merge remote-tracking branch 'open-falcon/portal/master'
f132c7b
hitripod and others added 30 commits March 7, 2016 16:53
@hitripod
Merge branch 'develop' into upstream-merged
fd65cba
@hitripod
Merge pull request #9 from Cepave/upstream-merged
1815145 
[OWL-359] merged with Open-Falcon v0.1.0
@hitripod
fix user submenu not shown
a7e0e30
@hitripod
Merge branch 'develop'
9b4ac70
@hitripod
[OWL-459] note field is mandatory for display
c11fa1d
@hitripod
Merge branch 'develop'
69a0af6
@masato25
integrated alarm adjust api of fe
37861b8
@hitripod
Merge pull request #10 from masato25/develop
1740d0d 
[OWL-833] support automatic update event_cases status when the strategy/template/hostgroup is changed
@masato25
integrate with alarm adjust api - WhenEndpointOnMaintain
36116ef 
* also fixed some error of host_remove_post funcation
@hitripod
Merge pull request #11 from masato25/develop
1873388 
[OWL-833] integrate with alarm adjust api - WhenEndpointOnMaintain
@hitripod
Merge branch 'develop'
cc1eb7c
@masato25
add time range for avoiding wrong status set of alarm adjust api
bb4c99f
@hitripod
Merge pull request #12 from masato25/develop
2f4f5b5 
[OWL-764] Fix issue of wrong time of maintain still will change alaram case
@hitripod
Merge branch 'develop'
ad827ee
@masato25
add retry for auto ignored request
35cb463
@hitripod
Merge pull request #13 from masato25/develop
df6ceb9 
[OWL-896] add http post retry mechanism for auto ignored
@hitripod
Merge branch 'develop'
e99a302
[OWL-1045] Unified print msg format.
887a48f
[OWL-1045] Unified log msg format.
2d2bbe8
@hitripod
Merge pull request #14 from crosserclaws/unified_msg
8cf7355 
[OWL-1045] Unified log format
@hitripod
Merge pull request #15 from Cepave/develop
16d4873 
[OWL-1045] Unified message format.
@masato25
add checking to avoiding update status issue of event_cases
6f641ef
@masato25
remove debug info print and merged condition checking into one
a3d5d07
@hitripod
Merge pull request #16 from masato25/develop
dc14982 
[OWL-1280][portal]add checking to avoiding update status issue of event_cases
@masato25
fix create issue on strategy
6d9415c
@hitripod
Merge pull request #17 from masato25/develop
3d93fb5 
[OWL-1280][portal] fix create item issue on strategy
@hitripod
Merge branch 'develop'
93e6faa
tag显示为蓝色；当用户在metric中输入metric/tags时，自动填充 metric和tags的值。
f774fdb
@qudongfang
trim host before add
2e2f975
使用 python-decouple 加载配置
66cdc04 
- 重命名 requirements
- 模板：checkbox 右侧的标签也能点击
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@liut @chyeh @hitripod @myhung @minimum-hsu @chuanxd @masato25 @qudongfang