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

[i18n] Fix watcher - > watch_edit_execute_detail template #28922

Merged
merged 97 commits into from
Jan 23, 2019
Merged

[i18n] Fix watcher - > watch_edit_execute_detail template #28922

Changes from all commits
Commits
Show all changes
97 commits
Select commit Hold shift + click to select a range
c7ec189
Merge pull request #1 from elastic/master
Nox911 Sep 24, 2018
fa01b88
Merge pull request #2 from elastic/master
Nox911 Sep 27, 2018
70f6c7e
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Sep 27, 2018
68587a0
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Sep 28, 2018
42aa7d3
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Oct 2, 2018
efeaefe
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Oct 2, 2018
8a054ed
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Oct 8, 2018
b0d1660
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Oct 16, 2018
62b6ad1
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Oct 17, 2018
acbad4b
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Oct 18, 2018
a850650
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Oct 22, 2018
0a200ce
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Oct 25, 2018
b2a8244
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Oct 29, 2018
b4b979e
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Oct 30, 2018
d349a4f
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Oct 31, 2018
ae285b9
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Nov 2, 2018
3051641
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Nov 5, 2018
6231971
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Nov 8, 2018
f86a3d4
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Nov 9, 2018
cf813c7
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Nov 13, 2018
1aba03f
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Nov 14, 2018
491009b
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Nov 15, 2018
e243126
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Nov 22, 2018
e74bd61
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Nov 22, 2018
8bc5ffa
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Nov 23, 2018
5787937
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Nov 23, 2018
f17fa1e
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Nov 24, 2018
c63b0a6
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Nov 26, 2018
ed62b5b
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Nov 26, 2018
df4fab4
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Nov 26, 2018
46d284a
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Nov 27, 2018
d1fd49e
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Nov 29, 2018
ec1ad76
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Nov 29, 2018
6ebd934
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Nov 30, 2018
332d867
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Dec 3, 2018
4a99411
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Dec 3, 2018
4cdec42
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Dec 4, 2018
5d44df7
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Dec 4, 2018
c6e63aa
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Dec 4, 2018
8182d1f
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Dec 4, 2018
aefb90f
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Dec 5, 2018
e4e7120
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Dec 6, 2018
a9a6043
Merge branch 'master' of https://github.com/elastic/kibana
Dec 7, 2018
9d247e6
Merge branch 'master' of https://github.com/elastic/kibana
Dec 10, 2018
bd707af
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Dec 11, 2018
71fb60d
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Dec 12, 2018
4d95475
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Dec 13, 2018
62e824d
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Dec 13, 2018
4463796
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Dec 14, 2018
876e358
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Dec 14, 2018
231a859
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Dec 14, 2018
2af5dc9
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Dec 14, 2018
8a24575
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Dec 14, 2018
aa0b988
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Dec 14, 2018
1bd465e
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Dec 14, 2018
9c43f68
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Dec 14, 2018
45ea012
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Dec 17, 2018
b20b0be
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Dec 19, 2018
279bfed
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Dec 19, 2018
d4f3e72
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Dec 19, 2018
917da91
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Dec 21, 2018
6beb6fe
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Dec 26, 2018
a1bcdb5
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Dec 28, 2018
f4c8246
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Jan 2, 2019
28c57ae
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Jan 3, 2019
4b5e283
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Jan 3, 2019
38b6a15
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Jan 3, 2019
5f5ee45
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Jan 3, 2019
f905f69
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Jan 3, 2019
f1b48ce
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Jan 4, 2019
e0d4ace
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Jan 4, 2019
4eaa66e
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Jan 4, 2019
fbc9ba5
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Jan 4, 2019
accf399
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Jan 8, 2019
a4ebe6d
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Jan 9, 2019
18c7b48
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Jan 9, 2019
75b985c
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Jan 9, 2019
c738a16
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Jan 9, 2019
b81bc62
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Jan 10, 2019
8bb5062
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Jan 11, 2019
86c3cfa
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Jan 11, 2019
fc3cbb5
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Jan 14, 2019
1479425
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Jan 14, 2019
29cfa20
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Jan 15, 2019
88a1688
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Jan 15, 2019
a5dc747
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Jan 16, 2019
91ddca9
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Jan 16, 2019
54d50eb
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Jan 17, 2019
f3d438e
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Jan 17, 2019
ea34e00
Fix template
Nox911 Jan 17, 2019
172f5bf
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Jan 21, 2019
d8af7d6
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Jan 21, 2019
e5909c7
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Jan 22, 2019
2488ea3
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Jan 22, 2019
12c4fb2
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Jan 23, 2019
5896929
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Jan 23, 2019
d397a7a
Merge branch 'master' into feature/fix-watcher-label_template
Nox911 Jan 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion ...c/sections/watch_edit/components/watch_edit_execute_detail/watch_edit_execute_detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,12 @@
type="checkbox"
ng-model="watchEditExecuteDetail.executeDetails.ignoreCondition"
class="kuiCheckBox"
/>
<span
i18n-id="xpack.watcher.sections.watchEdit.executeDetail.conditionOverrides.ignoreConditionLabel"
i18n-default-message="Ignore Condition (Condition is always true)"
></label>
></span>
</label>
</div>
</toggle-panel>
</form>
Expand Down