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

Merged
merged 75 commits into from Feb 6, 2020
Merged

Alpha #9

merged 75 commits into from Feb 6, 2020

Conversation

Alexandr-logrus
Copy link
Owner

No description provided.

sergejey and others added 30 commits September 24, 2019 10:28
@sergejey
Merge pull request #630 from sergejey/alpha
08b4b6d 
Alpha
@sergejey
Merge pull request #631 from sergejey/alpha
71277b6 
Alpha
@sergejey
Merge pull request #632 from sergejey/alpha
512f621 
Alpha
@sergejey
Merge pull request #643 from sergejey/alpha
ad8bdf1 
Alpha
@sergejey
Merge pull request #644 from sergejey/alpha
8a70e3b 
Cross-link warning fix
@sergejey
Merge pull request #645 from Alexandr-logrus/alpha
020caf5 
Alpha
@xor2016
Update freeboard.widgets.js
68ec554 
Восстановление работы виджета Гуглмэпс добавлением ключа АПИ в настройки, убран неработающий ключ в вызове
@sergejey
Linked modules fix
591336e 
Fixing call for linked modules with property update
@sergejey
Merge pull request #647 from xor2016/alpha
9d4143d 
Update freeboard.widgets.js
@sergejey
Update api.php
51c21bd 
Minor api fix
@sergejey
Simple Devices: dimming fix
5e7732a 
Minor fix for dimmers
@sergejey
Simple Devices homekit fixes
45239a5 
* Status update fix
@sergejey
Updates
273db3b 
* "MySQL server gone" error better processing
* Language files warning disabled (for old PHP versions)
* New config.php option DISABLE_FORK (for low-memory systems)
@tarasfrompir
Update hooks.inc.php
0de1636
@sergejey
Merge pull request #649 from tarasfrompir/patch-5
fa94170 
Update hooks.inc.php
@sergejey
Simple Devices fixes
4b23963 
* Openable fix
* XRay: filter fix
@tarasfrompir
Исправление выдачи терминала с которого пришла команда
9addda5
@sergejey
Merge pull request #650 from tarasfrompir/patch-6
b88e8fa 
Исправление выдачи терминала с которого пришла команда
@sergejey
Updates
f249fec 
* Simple Devices: ability to filter devices by groups (Is ON now, Is OPEN now, Is HEATING now)
* Scenes: container state update fix
@palacex
add simple check for input param
32cd008 
move lowercase from cycle
@tarasfrompir
Update common.class.php
26b98aa
@sergejey
Merge pull request #651 from palacex/upstream_alpha
0c7e3f9 
add simple check for input param and move lowercase transformation outside cycle
@sergejey
Merge pull request #652 from tarasfrompir/patch-7
762f63e 
Update common.class.php
@tarasfrompir
Исправление передачи длительности команды через консоль
60bd6df
@sergejey
Merge pull request #653 from tarasfrompir/patch-8
3f87bc4 
Исправление передачи длительности команды через консоль
@palacex
move scandir outside cycle
5547255
@palacex
move scandir outside cycle
0a1e543
@sergejey
Merge pull request #659 from palacex/upstream_alpha
4f61646 
Upstream alpha
@sergejey
New feature: auto-update
46b9212 
* Auto-update feature (highly experimental!)
@tarasfrompir
Update common.class.php
5c3a7e6
tarasfrompir and others added 29 commits January 28, 2020 16:23
@tarasfrompir
Update terminals_edit.html
9e8bb23
@tarasfrompir
Update terminals_edit.inc.php
be6b811
@tarasfrompir
Update processCommand.inc.php
29ab471
@tarasfrompir
Update terminals_edit.inc.php
fe60901
@tarasfrompir
Update terminals_edit.inc.php
bc358be
@sergejey
Merge pull request #668 from tarasfrompir/patch-15
58dd2c4 
Добавлено местоположение терминала
@sergejey
Update mysqli.class.php
083854e 
Error processing updated
@sergejey
Updates
9a8d3e3 
* Blockly: turn on/turn off blocks changed to switch block
* Linked object field now have "AllScripts" virtual object
@sergejey
Fixes
2d52b4a 
Minor tweaks
@Aleks130699
Update SMotions_motionDetected.php
5e72c7a
@sergejey
Optimizing
4897d9c
@sergejey
Merge pull request #670 from Aleks130699/patch-2
089323b 
Update SMotions_motionDetected.php
@kvazimoda24
Fixed. Writing empty values to the database.
dca210a
@kvazimoda24
Update SCameras_takeSnapshot.php
b1b5d1c 
При работе из подкаталога этот подкаталог учитывался два раза. Исправил таким не очень чистым способом, т.к. так и не понял где в ;snapshotPreviewURL добавляется ROOTHTML, да и есть подозрение, что оно там добавляется неспроста.
@kvazimoda24
Update SCameras_takeSeries.php
56d0c8e
@sergejey
Merge pull request #672 from kvazimoda24/kvazimoda24-patch-1
6e01078 
Fixed. Writing empty values to the database.
@sergejey
Merge pull request #673 from kvazimoda24/patch-1
817e22d 
Скриншоты с камеры при работе из подкаталога.
@sergejey
Minor updates
53f1934 
* Link to module page in Connect
@kvazimoda24
Update stl_dark.css
b1b3d28 
Иначе не удаётся изменять цвет текста в сценах.
@sergejey
Merge pull request #677 from kvazimoda24/patch-2
9a21272 
Update stl_dark.css
@sergejey
Merge branch 'alpha' of https://github.com/sergejey/majordomo into alpha
100ddbc
@tarasfrompir
Update panel.html
758a835
@tarasfrompir
Add button LogOut
ec35a3e
@tarasfrompir
Update default.html
3dfbba1
@sergejey
Merge pull request #679 from tarasfrompir/patch-17
1053f9d 
Add button LogOut
@sergejey
Merge pull request #678 from tarasfrompir/patch-16
0462d8d 
Update panel.html
@tarasfrompir
Update shoutbox.class.php
18e3ba7
@tarasfrompir
Update shouts_search.inc.php
7d55c37
@sergejey
Merge pull request #680 from tarasfrompir/patch-19
4f0a4ad 
Убран дубляж - $session->data['logged_user'] все перенесено в $session->data['SITE_USER_ID']
@Alexandr-logrus Alexandr-logrus merged commit 51c15bd into Alexandr-logrus:alpha Feb 6, 2020
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
7 participants
@Alexandr-logrus @sergejey @tarasfrompir @xor2016 @palacex @kvazimoda24 @Aleks130699