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

Alpha #1008

Merged
merged 181 commits into from
Sep 23, 2021
Merged

Alpha #1008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
181 commits
Select commit Hold shift + click to select a range
3565158
Fix SButtons_pressed.php
YuriiRadio Feb 6, 2021
93f7823
Simple Devices: option no change level
Mar 16, 2021
6e876a3
support unicode
Mar 16, 2021
62a1323
Merge branch 'alpha' of https://github.com/sergejey/majordomo into alpha
Mar 18, 2021
3ba40ff
Update SDimmers_levelUpdated.php
Aleks130699 Mar 25, 2021
ef2678b
Update SDimmers_levelWorkUpdated.php
Aleks130699 Mar 25, 2021
82e405d
Update panel.html
kvazimoda24 Mar 27, 2021
ad109f9
Merge pull request #940 from kvazimoda24/patch-6
sergejey Mar 28, 2021
c932f65
Simple Devices update
sergejey Mar 28, 2021
9ec54f5
Update objects.class.php
tarasfrompir Mar 31, 2021
6930408
Merge pull request #942 from tarasfrompir/patch-24
sergejey Mar 31, 2021
6483e00
Merge remote-tracking branch 'parent/alpha' into alpha
Apr 5, 2021
9e0bf5f
Update SOpenClose.html
Aleks130699 Apr 7, 2021
e168aad
Merge pull request #945 from Aleks130699/patch-1
sergejey Apr 7, 2021
5c1cabb
Изменил селекторы свойств
SmoKE585 Apr 13, 2021
a819402
Merge pull request #946 from SmoKE585/alpha
sergejey Apr 13, 2021
45798be
Изменен метод подсчета кол. запросов к БД
SmoKE585 Apr 13, 2021
04ee111
Merge pull request #947 from SmoKE585/alpha
sergejey Apr 13, 2021
2627231
Резервный способ подсчета запросов
SmoKE585 Apr 15, 2021
1146c26
Merge pull request #948 from SmoKE585/alpha
sergejey Apr 15, 2021
aaa46e0
Новый дизайн выбора свойств
SmoKE585 Apr 17, 2021
ee4b3ed
Update select2.min.css
SmoKE585 Apr 18, 2021
cbaaa6b
Update panel.html
SmoKE585 Apr 18, 2021
2e5f40d
Показ классов в группе
SmoKE585 Apr 18, 2021
8589003
Merge pull request #950 from SmoKE585/alpha
sergejey Apr 18, 2021
5048c91
Мелкие правки
SmoKE585 Apr 18, 2021
a6053df
Добавлена анимация загрузки
SmoKE585 Apr 18, 2021
d520c76
Merge pull request #951 from SmoKE585/alpha
sergejey Apr 19, 2021
7ffd431
Merge branch 'alpha' of https://github.com/sergejey/majordomo into alpha
Apr 19, 2021
109bdb9
Новые фишки дизайна
SmoKE585 Apr 19, 2021
4cba946
Merge pull request #952 from SmoKE585/alpha
sergejey Apr 20, 2021
234fcbd
Merge branch 'alpha' of https://github.com/sergejey/majordomo into alpha
Apr 22, 2021
fb8b6ff
Переносы строк в x-ray
SmoKE585 May 6, 2021
855ab07
Merge pull request #953 from SmoKE585/patch-4
sergejey May 7, 2021
cb55467
HomeBridge: CO2 sensor added
sergejey May 9, 2021
c00fcbd
Update market.html
SmoKE585 May 9, 2021
6f06148
Merge pull request #955 from SmoKE585/alpha
sergejey May 11, 2021
e225082
Simple Devices updates
sergejey May 15, 2021
98879bd
Update scenes.class.php
sergejey May 15, 2021
551df60
Merge branch 'alpha' of https://github.com/sergejey/majordomo into alpha
May 17, 2021
f23ff74
Update ua.php
tarasfrompir May 17, 2021
cbede2d
Update cycle.php
tarasfrompir May 18, 2021
9a85abe
Merge pull request #956 from tarasfrompir/patch-2
sergejey May 19, 2021
89ee202
Merge pull request #958 from tarasfrompir/patch-4
sergejey May 19, 2021
147d0d3
Merge pull request #939 from Aleks130699/patch-6
sergejey May 19, 2021
4143c8a
Merge pull request #895 from YuriiRadio/patch-3
sergejey May 19, 2021
77e7ce3
Добавлена возмоность частичного стирания кеша и ключи кэша переведены…
stell-hawk May 24, 2021
68dbd4e
Клас thread не нужен для мдм
tarasfrompir May 26, 2021
9349130
Merge pull request #961 from tarasfrompir/patch-6
sergejey May 26, 2021
043ac99
Merge pull request #960 from stell-hawk/alpha
sergejey May 28, 2021
b05e95b
Updates
sergejey May 28, 2021
496a06f
Update caching.class.php
Newz20 May 31, 2021
a377c06
Merge branch 'alpha' of https://github.com/sergejey/majordomo into alpha
Jun 3, 2021
59f4be0
Merge branch 'alpha' of https://github.com/sergejey/majordomo into alpha
Jun 3, 2021
77e58a0
Merge pull request #963 from Newz20/patch-2
sergejey Jun 6, 2021
34c7317
fix caching prefix
stell-hawk Jun 8, 2021
6187dfb
Merge pull request #964 from stell-hawk/alpha
sergejey Jun 8, 2021
0d1ab2d
Merge branch 'alpha' of https://github.com/sergejey/majordomo into alpha
Jun 8, 2021
5a37834
Merge pull request #930 from Anisan/alpha
sergejey Jun 8, 2021
ebe7522
Fixes
sergejey Jun 10, 2021
f541b33
Minor updates
sergejey Jun 11, 2021
702e005
Update python
tarasfrompir Jun 20, 2021
4d69b91
Update mjdm.py
tarasfrompir Jun 20, 2021
ed79d71
Update general.py
tarasfrompir Jun 20, 2021
cd4fe9a
Update general.py
tarasfrompir Jun 20, 2021
82e1b00
Update general.py
tarasfrompir Jun 20, 2021
fc739f0
Update events.py
tarasfrompir Jun 20, 2021
73ea63e
Update db.class.php
tarasfrompir Jun 20, 2021
6b32ec2
Update module.class.php
tarasfrompir Jun 20, 2021
32f9977
Update load_settings.php
tarasfrompir Jun 20, 2021
75b12a1
Update caching.class.php
tarasfrompir Jun 20, 2021
c106c76
Update session.class.php
tarasfrompir Jun 20, 2021
1cb9a4b
Update objects_edit.inc.php
tarasfrompir Jun 20, 2021
2ad654f
Update objects_edit.inc.php
tarasfrompir Jun 20, 2021
39e8ff5
Update objects_edit.inc.php
tarasfrompir Jun 20, 2021
88639b9
Update objects.class.php
tarasfrompir Jun 20, 2021
7b5511e
Update python.inc.php
tarasfrompir Jun 20, 2021
120ea72
Update python.inc.php
tarasfrompir Jun 20, 2021
56b9d20
Update module.class.php
tarasfrompir Jun 20, 2021
88a3bca
Update sqlFunctions.class.php
tarasfrompir Jun 20, 2021
6ff7aff
Update load_settings.php
tarasfrompir Jun 20, 2021
0f9a021
Update caching.class.php
tarasfrompir Jun 20, 2021
e99343a
Update objects.class.php
tarasfrompir Jun 20, 2021
67beb60
Update objects.class.php
tarasfrompir Jun 21, 2021
5fd63f1
Update load_settings.php
tarasfrompir Jun 21, 2021
853f032
Merge pull request #965 from tarasfrompir/patch-7
sergejey Jun 21, 2021
b276710
Warning: Constant DEF_TYPE_OPTIONS already defined
tarasfrompir Jun 21, 2021
a719ca6
Update pinghosts_edit.inc.php
tarasfrompir Jun 21, 2021
9f9b96e
Merge pull request #966 from tarasfrompir/patch-8
sergejey Jun 21, 2021
5745f23
Warning: Undefined array key "dynids" and 'part_load'
tarasfrompir Jun 21, 2021
cc7018d
Update admin.php
tarasfrompir Jun 21, 2021
9c06d19
Merge pull request #967 from tarasfrompir/patch-9
sergejey Jun 21, 2021
62e4379
Update devices.css
london89 Jul 7, 2021
ed41f0d
Merge pull request #969 from london89/patch-4
sergejey Jul 7, 2021
98579f2
Update SAirConditioners.html
london89 Jul 8, 2021
eef5175
Update devices_structure.inc.php
london89 Jul 8, 2021
968c8d5
Update devices_edit.html
sergejey Jul 9, 2021
73ae92a
Small error
tarasfrompir Jul 9, 2021
fdb287e
Update action_admin.html
tarasfrompir Jul 9, 2021
850b1cf
Delete warning in php8
tarasfrompir Jul 12, 2021
4f1ca7f
Update jTemplate.class.php
tarasfrompir Jul 12, 2021
607097e
Update loader.php
tarasfrompir Jul 13, 2021
e0d9d33
Merge pull request #974 from tarasfrompir/patch-14
sergejey Jul 13, 2021
7e2608c
Merge pull request #970 from london89/alpha
sergejey Jul 13, 2021
3e371f9
Merge pull request #971 from tarasfrompir/patch-11
sergejey Jul 13, 2021
412b794
Merge pull request #975 from tarasfrompir/patch-15
sergejey Jul 13, 2021
ee278c3
Update module.class.php
tarasfrompir Jul 13, 2021
f17966e
Merge pull request #980 from tarasfrompir/patch-21
sergejey Jul 14, 2021
20352de
Update caching.class.php
sergejey Jul 14, 2021
f776079
Update jTemplate.class.php
sergejey Jul 16, 2021
1728ddf
Update jTemplate.class.php
sergejey Jul 17, 2021
fb7da08
Мелкое исправление
tarasfrompir Jul 19, 2021
31208ee
Update saverestore.class.php
tarasfrompir Jul 19, 2021
91ac181
Update saverestore.class.php
tarasfrompir Jul 19, 2021
d8ac779
Update config.php.sample
tarasfrompir Jul 19, 2021
7baa14d
Update config.php.sample
tarasfrompir Jul 19, 2021
20069ee
Merge pull request #987 from tarasfrompir/patch-4
sergejey Jul 20, 2021
48fc999
Merge pull request #983 from tarasfrompir/patch-1
sergejey Jul 20, 2021
5ca10b3
Merge pull request #984 from tarasfrompir/patch-2
sergejey Jul 20, 2021
1973bbb
Merge pull request #985 from tarasfrompir/patch-3
sergejey Jul 20, 2021
374fe02
Update Server.php
tarasfrompir Jul 20, 2021
69c3beb
Update Application.php
tarasfrompir Jul 20, 2021
9e6d206
Merge pull request #989 from tarasfrompir/patch-6
sergejey Jul 20, 2021
5b1c9b4
Update cycle_states.php
tarasfrompir Jul 23, 2021
4c30b28
Merge pull request #990 from tarasfrompir/patch-1
sergejey Jul 23, 2021
700a7c7
LANG FILES
SmoKE585 Aug 2, 2021
d897b0b
Новый поиск
SmoKE585 Aug 2, 2021
09662c1
Исправление графика БД
SmoKE585 Aug 2, 2021
f88e280
Исправление перекрытия текста
SmoKE585 Aug 2, 2021
04955c5
Исправлено оповещение о старой версии
SmoKE585 Aug 2, 2021
e866c12
Кнопка пропустить обновление в маркете
SmoKE585 Aug 3, 2021
1c18ba4
Update market.class.php
SmoKE585 Aug 3, 2021
e6f360f
Новый дизайн ЛОКАЦИЙ
SmoKE585 Aug 3, 2021
5ea7f48
Update panel.html
SmoKE585 Aug 3, 2021
19ceb3d
Update panel.html
SmoKE585 Aug 3, 2021
1600ba4
Merge pull request #992 from SmoKE585/alpha
sergejey Aug 3, 2021
d82e510
Фикс кнопки в маркете
SmoKE585 Aug 4, 2021
2fc5f2f
Merge pull request #993 from SmoKE585/alpha
sergejey Aug 6, 2021
f887a2e
Оповещения для модулей
SmoKE585 Aug 9, 2021
bfd0fa0
Update module.class.php
SmoKE585 Aug 9, 2021
2cc566a
Update panel.class.php
SmoKE585 Aug 9, 2021
598713f
Update panel.html
SmoKE585 Aug 9, 2021
a48236d
Update bootstrap.min.css
SmoKE585 Aug 9, 2021
55c0e83
Update panel_default.html
SmoKE585 Aug 9, 2021
dc35879
Merge pull request #994 from SmoKE585/alpha
sergejey Aug 9, 2021
1201806
Update panel_default.html
SmoKE585 Aug 9, 2021
9d0321a
Мелкие фиксы дизайна и ноти
SmoKE585 Aug 9, 2021
5fe6ba7
Темная тема
SmoKE585 Aug 9, 2021
5fd3f3a
Merge pull request #995 from SmoKE585/alpha
sergejey Aug 10, 2021
e59f70e
Исправления темной темы
SmoKE585 Aug 13, 2021
734bec2
Merge pull request #996 from SmoKE585/alpha
sergejey Aug 13, 2021
bb17b7a
Фиксы темной темы
SmoKE585 Aug 17, 2021
aabc8b8
Update bootstrap_dark_admin.css
SmoKE585 Aug 19, 2021
e3e3c2b
Update bootstrap_dark_admin.css
SmoKE585 Aug 19, 2021
a811a09
Темная тема для селекторов
SmoKE585 Aug 19, 2021
b4a4880
Merge pull request #998 from SmoKE585/alpha
sergejey Aug 19, 2021
a101ec8
Новый дизайн
SmoKE585 Aug 21, 2021
22592a2
Новый дизайн раздела МОДУЛИ
SmoKE585 Aug 21, 2021
670542d
Update control_modules.html
SmoKE585 Aug 21, 2021
9418810
Update control_modules.class.php
SmoKE585 Aug 21, 2021
6277775
Merge pull request #999 from SmoKE585/alpha
sergejey Aug 23, 2021
d07f44b
Control Panel part load fix
sergejey Aug 23, 2021
b291b0a
Update panel.html
SmoKE585 Aug 27, 2021
1f75d9c
Update panel.html
SmoKE585 Aug 27, 2021
525a58a
Уменьшено в 20 раз количество запросов к БД
SmoKE585 Aug 30, 2021
2177b60
Merge pull request #1000 from SmoKE585/patch-7
sergejey Aug 30, 2021
fd284ef
Merge pull request #1002 from SmoKE585/alpha
sergejey Aug 30, 2021
8f9a3b1
Panel fixes
sergejey Aug 30, 2021
d96fc47
Update ua.php
tarasfrompir Aug 30, 2021
577bdb5
Merge pull request #1003 from tarasfrompir/patch-1
sergejey Aug 30, 2021
24f8e36
Update panel.class.php
tarasfrompir Sep 3, 2021
0bcb3c0
Merge pull request #1004 from tarasfrompir/patch-2
sergejey Sep 3, 2021
1c96a9b
Update saverestore.class.php
tarasfrompir Sep 6, 2021
bccc4da
Update ua.php
tarasfrompir Sep 6, 2021
1592227
Update ru.php
tarasfrompir Sep 6, 2021
31d7f89
Update default.php
tarasfrompir Sep 6, 2021
f5e06dc
Merge pull request #1006 from tarasfrompir/patch-4
sergejey Sep 6, 2021
571c4e6
performance optimization for linkedobject
Anisan Sep 15, 2021
4e41e18
Merge pull request #1007 from Anisan/patch-1
sergejey Sep 15, 2021
4ce9a1d
Minor fixes
sergejey Sep 23, 2021
19693c1
Delete package.json
sergejey Sep 23, 2021
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
12,804 changes: 6,744 additions & 6,060 deletions 3rdparty/bootstrap/css/bootstrap.min.css
View file
Open in desktop

Large diffs are not rendered by default.

8,611 changes: 8,611 additions & 0 deletions 3rdparty/bootstrap/css/bootstrap_dark_admin.css
View file
Open in desktop

Large diffs are not rendered by default.

13 changes: 0 additions & 13 deletions 3rdparty/freeboard/package.json
View file
Open in desktop

This file was deleted.

9 changes: 8 additions & 1 deletion 3rdparty/select2/css/select2.min.css
View file
Open in desktop

Large diffs are not rendered by default.

Loading