Merge branch 'master' of https://gitlab.elettra.eu/cs/gui/alarm-ng into branch-filtering (fb76a024) · Commits · cs / gui / alarm-ng · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

alarm-ng
- Activity
- Members
- Labels
- Issues
  4
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

fb76a024

Commit fb76a024 authored 2 years ago by

Giacomo Strangolino

Downloads
- Plain Diff

Merge branch 'master' of https://gitlab.elettra.eu/cs/gui/alarm-ng into branch-filtering

parents 8c3b043c f466e5d4

No related branches found

No related tags found

No related merge requests found

Changes 15

Hide whitespace changes

Inline Side-by-side

Showing

alarm-ng.pro 0 additions, 2 deletions

alarm-ng.pro
src/AlarmHistoryTree.cpp 35 additions, 18 deletions

src/AlarmHistoryTree.cpp
src/AlarmHistoryTree.h 2 additions, 0 deletions

src/AlarmHistoryTree.h
src/AlarmTreeWidget.cpp 47 additions, 104 deletions

src/AlarmTreeWidget.cpp
src/AlarmTreeWidget.h 9 additions, 4 deletions

src/AlarmTreeWidget.h
src/AlarmTreeWidgetItem.cpp 1 addition, 1 deletion

src/AlarmTreeWidgetItem.cpp
src/Sound.cpp 2 additions, 1 deletion

src/Sound.cpp
src/acmd.cpp 74 additions, 21 deletions

src/acmd.cpp
src/acmd.h 5 additions, 4 deletions

src/acmd.h
src/alarm.cpp 65 additions, 18 deletions

src/alarm.cpp
src/alarm.h 2 additions, 0 deletions

src/alarm.h
src/alarm.ui 212 additions, 241 deletions

src/alarm.ui
src/filter.h 30 additions, 29 deletions

src/filter.h
src/main.cpp 8 additions, 3 deletions

src/main.cpp
src/mysqlmodel.cpp 5 additions, 3 deletions

src/mysqlmodel.cpp

with 497 additions and 449 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment