Skip to content

Commit 882b0c7

Browse files
jw-kerrjw-kerr
committed
Squashed commit of the following:
commit 865a35f Author: Paul Philippov <[email protected]> Date: Tue Aug 8 22:48:57 2023 -0400 add telegram translation info commit 795ad5d Author: Paul Philippov <[email protected]> Date: Tue Jun 13 13:51:02 2023 -0400 calculate overlay size from flash size less overlay offset commit cad93eb Author: Igor Zalatov <[email protected]> Date: Fri Jun 9 22:19:38 2023 +0300 Fix some info commit 0cd88e7 Author: Paul Philippov <[email protected]> Date: Thu Jun 8 15:45:27 2023 -0400 up locks commit 4ce32cf Author: Paul Philippov <[email protected]> Date: Thu Jun 8 15:45:12 2023 -0400 up packages commit b57de2f Author: Paul Philippov <[email protected]> Date: Thu Jun 8 15:44:53 2023 -0400 up rails commit 4a3b929 Author: Paul Philippov <[email protected]> Date: Thu Jun 8 15:44:16 2023 -0400 change VFAT to FAT32 commit 33019d4 Author: Paul Philippov <[email protected]> Date: Thu Jun 8 15:43:23 2023 -0400 add a warning about downloads commit d0ff9fa Merge: 6ddc2c4 c09ec04 Author: Paul Philippov <[email protected]> Date: Sat Jun 3 10:21:39 2023 -0400 Merge pull request OpenIPC#19 from Droid-MAX/master [fix(locales)] Fixed some translation errors about zh_CN OpenIPC#7 commit c09ec04 Author: Droid-MAX <[email protected]> Date: Sat Jun 3 22:12:13 2023 +0800 [fix(locales)] Fixed some translation errors about zh_CN OpenIPC#7 commit 6ddc2c4 Merge: bc31b59 82221d4 Author: Paul Philippov <[email protected]> Date: Wed May 31 23:58:34 2023 -0400 Merge pull request OpenIPC#18 from Droid-MAX/master [fix(locales)] Fixed some translation errors about zh_CN OpenIPC#6 commit 82221d4 Author: Droid-MAX <[email protected]> Date: Thu Jun 1 11:52:16 2023 +0800 [fix(locales)] Fixed some translation errors about zh_CN OpenIPC#6 commit bc31b59 Merge: 843b95a 8db4972 Author: Paul Philippov <[email protected]> Date: Wed May 31 21:44:21 2023 -0400 Merge pull request OpenIPC#17 from Droid-MAX/master [fix(locales)] Fixed some translation errors about zh_CN OpenIPC#5 commit 8db4972 Author: Droid-MAX <[email protected]> Date: Thu Jun 1 09:32:38 2023 +0800 [fix(locales)] Fixed some translation errors about zh_CN OpenIPC#5 commit 843b95a Merge: caf2705 d89ec4e Author: Paul Philippov <[email protected]> Date: Wed May 31 13:21:22 2023 -0400 Merge pull request OpenIPC#16 from Droid-MAX/master [fix(locales)] Fixed some translation errors about zh_CN commit caf2705 Author: Paul Philippov <[email protected]> Date: Wed May 31 13:02:41 2023 -0400 typo commit d89ec4e Author: Droid-MAX <[email protected]> Date: Thu Jun 1 00:57:45 2023 +0800 [fix(locales)] Fixed some translation errors about zh_CN OpenIPC#4 commit fc4a5ac Author: Droid-MAX <[email protected]> Date: Thu Jun 1 00:42:35 2023 +0800 [fix(locales)] Fixed some translation errors about zh_CN OpenIPC#3 commit d51e537 Merge: d2594ba 96331ae Author: Paul Philippov <[email protected]> Date: Wed May 31 03:32:20 2023 -0400 Merge pull request OpenIPC#15 from Droid-MAX/master [fix(locales)] Fixed some translation errors about zh_CN OpenIPC#2 commit 96331ae Author: Droid-MAX <[email protected]> Date: Wed May 31 15:25:15 2023 +0800 [fix(locales)] Fixed some translation errors about zh_CN OpenIPC#2 commit d2594ba Merge: bad9f77 01475c6 Author: Paul Philippov <[email protected]> Date: Tue May 30 20:43:29 2023 -0400 Merge pull request OpenIPC#14 from Droid-MAX/master [fix(locales)] Fixed some translation errors about zh_CN OpenIPC#1 commit 01475c6 Author: Droid-MAX <[email protected]> Date: Wed May 31 08:34:32 2023 +0800 [fix(locales)] Fixed some translation errors about zh_CN OpenIPC#1 commit bad9f77 Merge: 96f5410 8a576b0 Author: Paul Philippov <[email protected]> Date: Tue May 30 18:18:23 2023 -0400 Merge pull request OpenIPC#13 from Droid-MAX/master Fixed another translation errors about zh_CN commit 8a576b0 Author: Droid-MAX <[email protected]> Date: Tue May 30 18:00:44 2023 +0800 [fix(locales)] Fixed some translation errors about zh_CN commit a41097f Author: Droid-MAX <[email protected]> Date: Tue May 30 17:35:36 2023 +0800 Fixed another translation errors about zh_CN commit 96f5410 Merge: 6d318c0 9273b35 Author: Paul Philippov <[email protected]> Date: Tue May 30 05:17:58 2023 -0400 Merge pull request OpenIPC#12 from Droid-MAX/master Fixed some translation errors about zh_CN commit 9273b35 Author: Droid-MAX <[email protected]> Date: Tue May 30 17:13:24 2023 +0800 Fixed some translation errors about zh_CN commit 6d318c0 Merge: e730ffc 6b540f4 Author: Paul Philippov <[email protected]> Date: Tue May 30 02:18:44 2023 -0400 Merge pull request OpenIPC#11 from zhuwei/master Corrected some Chinese syntax error # Conflicts: # app/views/pages/_donate.zh.html.erb # app/views/pages/introduction.zh.html.erb # config/locales/pages.zh.yml
1 parent 8f8f1fc commit 882b0c7

24 files changed

+496
-322
lines changed

‎Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
44
ruby '3.1.2'
55

66
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails', branch: 'main'
7-
gem 'rails', '~> 7.0.4', '>= 7.0.4.3'
7+
gem 'rails', '~> 7.0.5'
88

99
# The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
1010
gem 'sprockets-rails'

‎Gemfile.lock

+55-55
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,70 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (7.0.4.3)
5-
actionpack (= 7.0.4.3)
6-
activesupport (= 7.0.4.3)
4+
actioncable (7.0.5)
5+
actionpack (= 7.0.5)
6+
activesupport (= 7.0.5)
77
nio4r (~> 2.0)
88
websocket-driver (>= 0.6.1)
9-
actionmailbox (7.0.4.3)
10-
actionpack (= 7.0.4.3)
11-
activejob (= 7.0.4.3)
12-
activerecord (= 7.0.4.3)
13-
activestorage (= 7.0.4.3)
14-
activesupport (= 7.0.4.3)
9+
actionmailbox (7.0.5)
10+
actionpack (= 7.0.5)
11+
activejob (= 7.0.5)
12+
activerecord (= 7.0.5)
13+
activestorage (= 7.0.5)
14+
activesupport (= 7.0.5)
1515
mail (>= 2.7.1)
1616
net-imap
1717
net-pop
1818
net-smtp
19-
actionmailer (7.0.4.3)
20-
actionpack (= 7.0.4.3)
21-
actionview (= 7.0.4.3)
22-
activejob (= 7.0.4.3)
23-
activesupport (= 7.0.4.3)
19+
actionmailer (7.0.5)
20+
actionpack (= 7.0.5)
21+
actionview (= 7.0.5)
22+
activejob (= 7.0.5)
23+
activesupport (= 7.0.5)
2424
mail (~> 2.5, >= 2.5.4)
2525
net-imap
2626
net-pop
2727
net-smtp
2828
rails-dom-testing (~> 2.0)
29-
actionpack (7.0.4.3)
30-
actionview (= 7.0.4.3)
31-
activesupport (= 7.0.4.3)
32-
rack (~> 2.0, >= 2.2.0)
29+
actionpack (7.0.5)
30+
actionview (= 7.0.5)
31+
activesupport (= 7.0.5)
32+
rack (~> 2.0, >= 2.2.4)
3333
rack-test (>= 0.6.3)
3434
rails-dom-testing (~> 2.0)
3535
rails-html-sanitizer (~> 1.0, >= 1.2.0)
36-
actiontext (7.0.4.3)
37-
actionpack (= 7.0.4.3)
38-
activerecord (= 7.0.4.3)
39-
activestorage (= 7.0.4.3)
40-
activesupport (= 7.0.4.3)
36+
actiontext (7.0.5)
37+
actionpack (= 7.0.5)
38+
activerecord (= 7.0.5)
39+
activestorage (= 7.0.5)
40+
activesupport (= 7.0.5)
4141
globalid (>= 0.6.0)
4242
nokogiri (>= 1.8.5)
43-
actionview (7.0.4.3)
44-
activesupport (= 7.0.4.3)
43+
actionview (7.0.5)
44+
activesupport (= 7.0.5)
4545
builder (~> 3.1)
4646
erubi (~> 1.4)
4747
rails-dom-testing (~> 2.0)
4848
rails-html-sanitizer (~> 1.1, >= 1.2.0)
49-
activejob (7.0.4.3)
50-
activesupport (= 7.0.4.3)
49+
activejob (7.0.5)
50+
activesupport (= 7.0.5)
5151
globalid (>= 0.3.6)
52-
activemodel (7.0.4.3)
53-
activesupport (= 7.0.4.3)
54-
activerecord (7.0.4.3)
55-
activemodel (= 7.0.4.3)
56-
activesupport (= 7.0.4.3)
52+
activemodel (7.0.5)
53+
activesupport (= 7.0.5)
54+
activerecord (7.0.5)
55+
activemodel (= 7.0.5)
56+
activesupport (= 7.0.5)
5757
activerecord-reset-pk-sequence (0.2.1)
58-
activestorage (7.0.4.3)
59-
actionpack (= 7.0.4.3)
60-
activejob (= 7.0.4.3)
61-
activerecord (= 7.0.4.3)
62-
activesupport (= 7.0.4.3)
58+
activestorage (7.0.5)
59+
actionpack (= 7.0.5)
60+
activejob (= 7.0.5)
61+
activerecord (= 7.0.5)
62+
activesupport (= 7.0.5)
6363
marcel (~> 1.0)
6464
mini_mime (>= 1.1.0)
6565
activestorage-validator (0.2.2)
6666
rails (>= 6.0.4.1)
67-
activesupport (7.0.4.3)
67+
activesupport (7.0.5)
6868
concurrent-ruby (~> 1.0, >= 1.0.2)
6969
i18n (>= 1.6, < 2)
7070
minitest (>= 5.1)
@@ -192,20 +192,20 @@ GEM
192192
rack (2.2.6.4)
193193
rack-test (2.1.0)
194194
rack (>= 1.3)
195-
rails (7.0.4.3)
196-
actioncable (= 7.0.4.3)
197-
actionmailbox (= 7.0.4.3)
198-
actionmailer (= 7.0.4.3)
199-
actionpack (= 7.0.4.3)
200-
actiontext (= 7.0.4.3)
201-
actionview (= 7.0.4.3)
202-
activejob (= 7.0.4.3)
203-
activemodel (= 7.0.4.3)
204-
activerecord (= 7.0.4.3)
205-
activestorage (= 7.0.4.3)
206-
activesupport (= 7.0.4.3)
195+
rails (7.0.5)
196+
actioncable (= 7.0.5)
197+
actionmailbox (= 7.0.5)
198+
actionmailer (= 7.0.5)
199+
actionpack (= 7.0.5)
200+
actiontext (= 7.0.5)
201+
actionview (= 7.0.5)
202+
activejob (= 7.0.5)
203+
activemodel (= 7.0.5)
204+
activerecord (= 7.0.5)
205+
activestorage (= 7.0.5)
206+
activesupport (= 7.0.5)
207207
bundler (>= 1.15.0)
208-
railties (= 7.0.4.3)
208+
railties (= 7.0.5)
209209
rails-dom-testing (2.0.3)
210210
activesupport (>= 4.2.0)
211211
nokogiri (>= 1.6)
@@ -214,9 +214,9 @@ GEM
214214
rails-i18n (7.0.6)
215215
i18n (>= 0.7, < 2)
216216
railties (>= 6.0.0, < 8)
217-
railties (7.0.4.3)
218-
actionpack (= 7.0.4.3)
219-
activesupport (= 7.0.4.3)
217+
railties (7.0.5)
218+
actionpack (= 7.0.5)
219+
activesupport (= 7.0.5)
220220
method_source
221221
rake (>= 12.2)
222222
thor (~> 1.0)
@@ -308,7 +308,7 @@ DEPENDENCIES
308308
kaminari (~> 1.2)
309309
mysql2 (~> 0.5)
310310
puma (~> 5.0)
311-
rails (~> 7.0.4, >= 7.0.4.3)
311+
rails (~> 7.0.5)
312312
sassc-rails
313313
selenium-webdriver
314314
sprockets-rails

‎app/assets/images/a-part-of-openipc-project.svg

+99
Loading

‎app/assets/images/telegram-translation.png

472 KB
Loading

‎app/assets/stylesheets/application.bootstrap.scss

+6-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
@import 'bootstrap/scss/bootstrap';
66
@import 'bootstrap-icons/font/bootstrap-icons';
7-
//@import "rails_bootstrap_forms";
7+
//@import 'rails_bootstrap_forms';
88

99
/* debugging start */
1010
@media (max-width: 575.98px) { body.debug:before {content: "xs"} }
@@ -60,8 +60,7 @@ body.admin > header {
6060

6161
i.bi-github { font-size: 2.3rem; line-height: 1; }
6262

63-
.discord img,
64-
.gitter img { height: 2.5rem; }
63+
.tg img { height: 2.5rem; }
6564

6665
html:not([lang="ru"]) article.introduction .col.logo.ru { display: none; }
6766

@@ -192,3 +191,7 @@ table.binaries {
192191
tr.bloated { td:nth-child(2) {background-color: yellow;} }
193192
tr.slim { td:nth-child(2) {color: green;} }
194193
}
194+
195+
.img-zoom:hover {
196+
cursor: zoom-in;
197+
}

‎app/javascript/application.js

+15-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,20 @@ window.onload = (event) => {
55
// location.href = location.href.replace(location.search, '').concat('?locale=ru');
66
// }
77

8+
const modalZoom = document.getElementById('modalZoom');
9+
const zoom = new bootstrap.Modal(modalZoom, {});
10+
document.querySelectorAll('.img-zoom').forEach(el => {
11+
el.addEventListener('click', ev => {
12+
let b = modalZoom.querySelector('.modal-body');
13+
b.textContent = '';
14+
let i = document.createElement('img');
15+
i.src = ev.target.src;
16+
i.classList.add('img-fluid');
17+
b.appendChild(i);
18+
zoom.show();
19+
});
20+
});
21+
822
document.querySelectorAll('a[href^="http"], a[rel^="external"]').forEach(el => {
923
el.target = '_blank';
1024
el.classList.add('external-link');
@@ -20,7 +34,7 @@ window.onload = (event) => {
2034
document.querySelectorAll('.btn-danger, .btn-warning, .confirm').forEach(el => {
2135
// for input or button, find parent form and attach listener to its submit event
2236
if (el.nodeName === 'INPUT' || el.nodeName === 'BUTTON') {
23-
while (el.nodeName !== "FORM") el = el.parentNode
37+
while (el.nodeName !== 'FORM') el = el.parentNode
2438
el.addEventListener('submit', ev => (!confirm('Are you sure?')) ? ev.preventDefault() : null)
2539
} else {
2640
el.addEventListener('click', ev => (!confirm('Are you sure?')) ? ev.preventDefault() : null)

‎app/models/camera.rb

+1-8
Original file line numberDiff line numberDiff line change
@@ -141,14 +141,7 @@ def rootfs_offset
141141
end
142142

143143
def overlay_max_size
144-
case firmware_version
145-
when 'lite'
146-
'0xB0000'
147-
when 'ultimate'
148-
'0x2B0000'
149-
else
150-
'0xB0000'
151-
end
144+
"0x#{(flash_size_hex.to_i(16) - overlay_offset.to_i(16)).to_s(16)}"
152145
end
153146

154147
def overlay_offset

0 commit comments

Comments
 (0)