Commit Graph

Select branches

Hide Pull Requests

GK-branch

GM-branch

SCADA

alarms-statistics-search

beka

beka-branch

beka-branch-2

guga

main

nk-branch

nk-branch-2

nk-branch-3

nk-branch-4

#1

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#3

#4

#5

#6

#7

#8

#9

Mono Color

• fd77de1417 update backup and tags beka b.makharadze 2025-09-21 15:41:15 +04:00
• 1e65bdd97f Update MCM04 and MCM05 and symbol library b.makharadze 2025-09-21 14:56:16 +04:00
• 9808dc49a3 Update queries, alarms, detailed views, tags, sorter, carriers, main overview and more. b.makharadze 2025-09-19 12:18:37 +04:00
• c7d2115b08 sorter.svg b.makharadze 2025-09-11 16:48:17 +04:00
• a52d79f91c Update Statistics and Overview page b.makharadze 2025-09-11 16:44:17 +04:00
• 99e55d3c4c Change MCM bmidf 2025-09-08 17:38:22 +04:00
• 835b0ad79d Update Queries beka makharadze 2025-09-08 17:05:18 +04:00
• aa2acf3e5b Update everything b.makharadze 2025-09-07 15:54:55 +04:00
• 48ddcf16d1 Updated Status MCM01, MCM02, MCM03 b.makharadze 2025-09-06 14:20:03 +04:00
• 99a63aca49 Update MCM01, MCM02, MCM03, DPMs and tags b.makharadze 2025-09-05 18:54:46 +04:00
• f81b5c0a4e Merge pull request 'UPDATE WHOLE PROJECT' (#22) from beka into main main ilia.gurielidze 2025-09-04 00:39:27 +00:00
• 922410eba6 Add tags and backup file b.makharadze 2025-09-04 04:38:19 +04:00
• 57d51dbf46 Update Tipper and MCM01, MCM02 b.makharadze 2025-09-04 04:36:47 +04:00
• 01fc2db279 Fix thumbnails and resources to all files b.makharadze 2025-09-01 15:53:57 +04:00
• 012f7b21dd Update whole project b.makharadze 2025-09-01 13:55:43 +04:00
• 4f4dae8056 Merge pull request 'SAT9-236, SAT9-239, SAT9-237, SAT9-238, SAT9-241' (#21) from alarms-statistics-search into main gigi.mamaladze 2025-08-06 12:57:03 +00:00
• 3120744bb5 change tagprops alarms-statistics-search b.makharadze 2025-08-06 13:21:29 +04:00
• d325489641 Apply tags b.makharadze 2025-08-06 13:19:12 +04:00
• ce78ab8ffa Add statuses, fix views. b.makharadze 2025-08-06 12:29:02 +04:00
• 193d5a309a Add thumbnails b.makharadze 2025-08-05 16:19:49 +04:00
• 5226f1da1c Add resources b.makharadze 2025-08-05 16:09:18 +04:00
• cecec88011 Fix search, docked-east and symbols on all views b.makharadze 2025-08-05 15:41:00 +04:00
• 9cc78c5b27 SAT9-236, SAT9-239, SAT9-237 b.makharadze 2025-08-04 19:34:47 +04:00
• 848644c03a Added Docked East Views gigi.mamaladze 2025-08-01 19:17:51 +04:00
• 74005f7126 Updated Parent Project gigi.mamaladze 2025-08-01 17:46:39 +04:00
• a23c3dcaf8 Merge pull request 'SAT9-32' (#20) from guga into main gigi.mamaladze 2025-05-23 14:40:27 +00:00
• 6819fa396c fixed filter error guga gugak 2025-05-22 19:04:06 +04:00
• 9ed9c0354b Merge pull request 'SAT9-30, SAT9-31' (#16) from beka-branch-2 into main gigi.mamaladze 2025-05-22 14:54:26 +00:00
• 01b7da9c2d Merge pull request 'SAT9-33' (#19) from SCADA into main gigi.mamaladze 2025-05-22 14:50:45 +00:00
• dfd97f22ff SAT9-33 SCADA gigi.mamaladze 2025-05-22 18:49:48 +04:00
• 31d179234f Merge pull request 'SAT9-29, SAT9-28,SAT9-27,SAT9-26' (#18) from guga into main gigi.mamaladze 2025-05-22 14:31:14 +00:00
• a0abbb0921 Removed extra devices from SCADA and corrected names gugak 2025-05-22 18:19:17 +04:00
• 812761c394 Merge pull request 'SAT9-29, SAT9-28, SAT9-27, SAT9-26' (#17) from guga into main gigi.mamaladze 2025-05-22 13:49:08 +00:00
• 4387c2d491 Added missing devices and corrected names gugak 2025-05-22 17:42:06 +04:00
• e8702101b6 Add MCM02 DPM devices beka-branch-2 b.makharadze 2025-05-22 17:33:34 +04:00
• d3648490ca Add MCM01 DPM devices b.makharadze 2025-05-22 17:32:55 +04:00
• c22ea334de Add DPMs and Ethernet b.makharadze 2025-05-22 17:31:34 +04:00
• e3dbfa8231 SAT9-30, SAT9-31 b.makharadze 2025-05-22 17:29:26 +04:00
• 758fb7a77c Changed dash to underscore gigi.mamaladze 2025-05-19 18:15:41 +04:00
• eacd66edd4 Merge pull request 'Fixed MCM04' (#15) from beka-branch into main GigiMamaladze 2025-05-06 10:18:57 +00:00
• eb0e449ada Fixed MCM04 beka-branch b.makharadze 2025-05-06 14:07:54 +04:00
• e1d8513dc7 Merge pull request 'SAT9-28, SAT9-29, SAT9-32, SAT9-35, SAT9-37' (#14) from beka-branch into main GigiMamaladze 2025-05-06 10:01:18 +00:00
• 46dfb12b69 SAT9-28, SAT9-29, SAT9-32, SAT9-35, SAT9-37 b.makharadze 2025-05-06 13:22:40 +04:00
• 00b1086530 Deleted unecessary files/views Gigi Mamaladze 2025-05-01 14:44:50 +04:00
• 43cd7c5dea Added views, configured tags and fixed buttons Gigi Mamaladze 2025-05-01 14:38:04 +04:00
• 37d47123af Added resources files nk-branch-4 nika 2025-05-01 00:04:09 -07:00
• 32d800d9e5 SAT9: 22-23-24-25 nika 2025-04-30 23:58:56 -07:00
• dd9a78840e Merge pull request 'Review and update chute/fio/estop names' (#12) from nk-branch-3 into main GigiMamaladze 2025-04-30 16:51:51 +00:00
• 641191587a Review and update chute/fio/estop names nk-branch-3 nika 2025-04-30 07:14:18 -07:00
• 7df8a2f684 Added perent project, tags, status and statistics windows Gigi Mamaladze 2025-04-30 16:33:24 +04:00
• 907805b5c1 Merge pull request 'SAT9-19, SAT9-20, SAT9-21' (#11) from nk-branch-2 into main GigiMamaladze 2025-04-30 10:50:40 +00:00
• 7bb8952f9e Add Elements nk-branch-2 nika 2025-04-24 06:23:02 -07:00
• d208c56486 SAT9-19, SAT9-20, SAT9-21 Gigi Mamaladze 2025-04-22 19:13:43 +04:00
• 96007f24be Merge pull request 'SAT9-18' (#10) from beka-branch3 into main GigiMamaladze 2025-04-22 08:39:22 +00:00
• 13bb6f00bb SAT9-18 b.makharadze 2025-04-22 12:29:41 +04:00
• 7234ac724b Merge pull request 'SAT9-17' (#9) from GK-branch into main GigiMamaladze 2025-04-21 17:53:25 +00:00
• 261fb9f4e1 fixed names GK-branch gugak 2025-04-21 10:51:20 -07:00
• b88719f42e navigation buttons gugak 2025-04-21 10:45:15 -07:00
• 0f573839a0 Merge pull request 'SAT9-16' (#8) from nk-branch into main GigiMamaladze 2025-04-21 07:48:38 +00:00
• 6bc5ce9f56 Returned expresion nk-branch Nika 2025-04-21 11:47:23 +04:00
• 2991f19ba0 deleted duplicated SCADA folder Gigi Mamaladze 2025-04-21 11:10:00 +04:00
• 5b3baad990 SAT9-16 Nika 2025-04-21 11:08:35 +04:00
• c4642a9506 Merge pull request 'Updated chutes to NonPowered' (#7) from beka-branch into main GigiMamaladze 2025-04-21 06:57:35 +00:00
• dbaeb09144 Updated chutes to NonPowered b.makharadze 2025-04-21 10:54:29 +04:00
• e7c7b4f55f Merge pull request 'SAT9-14' (#6) from beka-branch into main GigiMamaladze 2025-04-21 06:51:09 +00:00
• a8b4b0c51c SAT9-14 b.makharadze 2025-04-21 10:47:50 +04:00
• 7c21700891 Merge pull request 'Added missing chevrons and updated svg' (#5) from GM-branch into main GM-branch GigiMamaladze 2025-04-18 19:55:50 +00:00
• 683cb1fafe Added missing chevrons and updated svg Gigi Mamaladze 2025-04-18 23:55:04 +04:00
• 74504ac934 Merge pull request 'Renamed SAT9' (#4) from GM-branch into main GigiMamaladze 2025-04-18 19:23:26 +00:00
• 134b4129c3 Renamed SAT9 Gigi Mamaladze 2025-04-18 23:21:57 +04:00
• f78fe4bead Merge pull request 'SAT9-13' (#3) from GM-branch into main GigiMamaladze 2025-04-18 18:45:03 +00:00
• d171466f45 SAT9-13 Gigi Mamaladze 2025-04-18 22:43:54 +04:00
• 5611c9dd0a Merge pull request 'SAT9-12' (#2) from GK-branch into main GigiMamaladze 2025-04-18 16:52:18 +00:00
• db906e83ab fix the names in mcm02-mcm03 gugak 2025-04-18 09:38:40 -07:00
• 2fb4c78bc1 Changed dataprovider Gigi Mamaladze 2025-04-18 20:30:57 +04:00
• f685c7a8ab Merge pull request 'SAT9-11' (#1) from GK-branch into main GigiMamaladze 2025-04-18 16:25:28 +00:00
• 54b2c985e3 fix: chute gugak 2025-04-18 09:22:07 -07:00
• d7ab4c51e3 Chutes fix on mcm1 and overview gugak 2025-04-18 09:16:09 -07:00
• b7b1178a1e Added .gitignore Gigi Mamaladze 2025-04-18 19:48:22 +04:00
• fb688060d6 Created Project Gigi Mamaladze 2025-04-18 19:44:27 +04:00