Compare commits
864 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d3159d86da | ||
|
|
f9e1513491 | ||
|
|
b6e37b7730 | ||
|
|
f9d56eb4c1 | ||
|
|
95565c39ed | ||
|
|
890aacaeee | ||
|
|
e2f0886950 | ||
|
|
fe21b5a502 | ||
|
|
e7043c4d63 | ||
|
|
aae2101131 | ||
|
|
64afed0fb2 | ||
|
|
4d9464ed87 | ||
|
|
b43191506a | ||
|
|
c47781c25a | ||
|
|
f0c4868b3e | ||
|
|
35e5c2329b | ||
|
|
74fc5524ab | ||
|
|
2d4c99a6f7 | ||
|
|
69c73d0a2c | ||
|
|
58510e0208 | ||
|
|
0681d10c51 | ||
|
|
add2356c8a | ||
|
|
c66b2b2291 | ||
|
|
769923c6cc | ||
|
|
27528d084f | ||
|
|
299aa69058 | ||
|
|
d1cc09f40e | ||
|
|
a133b43eed | ||
|
|
9b57725b8c | ||
|
|
34b0f6f014 | ||
|
|
f5cc93ec64 | ||
|
|
4f3263d979 | ||
|
|
b28e374e06 | ||
|
|
918d58ef0a | ||
|
|
5a388d9dde | ||
|
|
0f4909621b | ||
|
|
55d3d8adc3 | ||
|
|
d2d6a6daa4 | ||
|
|
a7f4ac2797 | ||
|
|
25b5027dc7 | ||
|
|
93a967dc74 | ||
|
|
3cfc3dcecf | ||
|
|
e09510ea9f | ||
|
|
4c289fc8fb | ||
|
|
58cf0fa2b1 | ||
|
|
5ca12a73c3 | ||
|
|
fd8e9dad92 | ||
|
|
df0fe0a460 | ||
|
|
646d15b257 | ||
|
|
2eb6848eb8 | ||
|
|
9b3c103f16 | ||
|
|
6a2a13d346 | ||
|
|
b6edf4561d | ||
|
|
c2744700c0 | ||
|
|
f506a5ea6c | ||
|
|
2f702148e3 | ||
|
|
e10c928207 | ||
|
|
a1baa23a52 | ||
|
|
a70e72f75d | ||
|
|
4111da1dd0 | ||
|
|
e7804d014d | ||
|
|
bf87de3706 | ||
|
|
ebc2043055 | ||
|
|
69b1f6c4e1 | ||
|
|
2708777167 | ||
|
|
6e0d62bb65 | ||
|
|
6d706fd222 | ||
|
|
6066265717 | ||
|
|
805e4d01e7 | ||
|
|
e209299af4 | ||
|
|
b3f0a3c9f5 | ||
|
|
1da8841ac7 | ||
|
|
7df5df6351 | ||
|
|
bf85b0c109 | ||
|
|
314e30272b | ||
|
|
61b9a32504 | ||
|
|
01b7d4ffba | ||
|
|
8643972f8c | ||
|
|
1894b8fcf7 | ||
|
|
e59a68cd68 | ||
|
|
466c6da5e3 | ||
|
|
b8cb792831 | ||
|
|
0f9c2a62fe | ||
|
|
04350af96f | ||
|
|
287b3509ab | ||
|
|
2a5bcd3eec | ||
|
|
2a0b9a44dd | ||
|
|
c552db04d7 | ||
|
|
22f1ffc72b | ||
|
|
4f33be20d4 | ||
|
|
9728ddeaf9 | ||
|
|
3c44bdb6b7 | ||
|
|
b236844c94 | ||
|
|
67d12fa6d2 | ||
|
|
215856adc3 | ||
|
|
07e010dfb5 | ||
|
|
dba9ca2084 | ||
|
|
9a60e744d3 | ||
|
|
e1a2ab0d7e | ||
|
|
a605c110a8 | ||
|
|
18c6be0d3b | ||
|
|
ff728e2fc1 | ||
|
|
eff90395b6 | ||
|
|
f4d52b82b4 | ||
|
|
61419b57c8 | ||
|
|
441989a8e1 | ||
|
|
c5a41e1f55 | ||
|
|
0ce4d66601 | ||
|
|
d2d6b319b6 | ||
|
|
47edb71a68 | ||
|
|
1f8626b383 | ||
|
|
0d6a36e187 | ||
|
|
548a0c8517 | ||
|
|
09d85e25c1 | ||
|
|
51b5b14dea | ||
|
|
0d290a2c28 | ||
|
|
c1b3d589c7 | ||
|
|
65430d92ea | ||
|
|
8711830f66 | ||
|
|
c4d919d46b | ||
|
|
3e7a688811 | ||
|
|
2773a675d0 | ||
|
|
9bbdccc111 | ||
|
|
bb8defeb42 | ||
|
|
545dbd0791 | ||
|
|
c7469075ab | ||
|
|
54fa974789 | ||
|
|
2cd3cec478 | ||
|
|
c11b977f1d | ||
|
|
30e8f17b37 | ||
|
|
2c3190ce2a | ||
|
|
ea7796dccc | ||
|
|
a11ca58f36 | ||
|
|
496d711684 | ||
|
|
219b824338 | ||
|
|
df389a365c | ||
|
|
aa2c52c1f8 | ||
|
|
f48ae29f22 | ||
|
|
de00e0e15c | ||
|
|
79fea49272 | ||
|
|
8190b10680 | ||
|
|
1ebd9562a2 | ||
|
|
ebaf63393f | ||
|
|
7c168740d9 | ||
|
|
11b991cddc | ||
|
|
8306e58b75 | ||
|
|
4002739682 | ||
|
|
c259921269 | ||
|
|
2eb3041c1f | ||
|
|
d539d9b5d2 | ||
|
|
d17c985bcb | ||
|
|
e2668e7cfa | ||
|
|
18c2c61bee | ||
|
|
be0b0c1984 | ||
|
|
b00ca217b3 | ||
|
|
874d76b16b | ||
|
|
cfac261516 | ||
|
|
7b5e5c2587 | ||
|
|
db064381d9 | ||
|
|
096c310e0e | ||
|
|
0b87db8b45 | ||
|
|
71cf4a4885 | ||
|
|
a0c6104fae | ||
|
|
8e54ac4dcf | ||
|
|
97b0288c7d | ||
|
|
e3cc8652e4 | ||
|
|
8708a001c7 | ||
|
|
6fc4facddf | ||
|
|
e5536880fb | ||
|
|
44ff8f92ac | ||
|
|
95208267de | ||
|
|
9c579e0d5b | ||
|
|
d1be4c6d96 | ||
|
|
a65afdac95 | ||
|
|
22b47925d4 | ||
|
|
f291e365e5 | ||
|
|
6f176803d4 | ||
|
|
b6a3bb4080 | ||
|
|
c7c1deab81 | ||
|
|
2ded5870b5 | ||
|
|
57f2ae098f | ||
|
|
76c06923d5 | ||
|
|
fb7ac874f0 | ||
|
|
12905f0dcb | ||
|
|
68a313a58f | ||
|
|
152115bf2e | ||
|
|
8bd3051224 | ||
|
|
aa94ca6619 | ||
|
|
e397f72eb2 | ||
|
|
4d495b8d7c | ||
|
|
a142a2717c | ||
|
|
de4a477686 | ||
|
|
4e692e2c1e | ||
|
|
8237e6f7a3 | ||
|
|
d1a9f1feac | ||
|
|
ef1d38462f | ||
|
|
93c8e9aa1f | ||
|
|
ac2dce4bb1 | ||
|
|
f2e1d90c74 | ||
|
|
8e28a229f2 | ||
|
|
363f6cb329 | ||
|
|
b6f7832745 | ||
|
|
74c1db740d | ||
|
|
4bb5dcf50c | ||
|
|
b0d01389c6 | ||
|
|
3e22ada889 | ||
|
|
6d08394adc | ||
|
|
47bdeeef9a | ||
|
|
099440d008 | ||
|
|
eb7201a55b | ||
|
|
6d9f40db30 | ||
|
|
7960706e60 | ||
|
|
8b0e54a95c | ||
|
|
89e8f0ccc3 | ||
|
|
0f67f75bed | ||
|
|
4836173fe6 | ||
|
|
7378ad00b0 | ||
|
|
e876c9b6a6 | ||
|
|
980d20473a | ||
|
|
22511270dd | ||
|
|
89cf733d24 | ||
|
|
a167a8587b | ||
|
|
ffbd488e93 | ||
|
|
fa3117e41e | ||
|
|
4be335b8ac | ||
|
|
3904a9f9a0 | ||
|
|
b683d84df1 | ||
|
|
3ad29f6eb7 | ||
|
|
cf227490d7 | ||
|
|
ffd6f7b326 | ||
|
|
ec2a1b3ddb | ||
|
|
60711471fc | ||
|
|
92738b378c | ||
|
|
c5e9c03de9 | ||
|
|
6637e5b8e3 | ||
|
|
b75442a10e | ||
|
|
811bef41b8 | ||
|
|
65242a503b | ||
|
|
77058b84cd | ||
|
|
673962d6a1 | ||
|
|
c207f68fd9 | ||
|
|
4416dab6c1 | ||
|
|
f59e824ec1 | ||
|
|
310c68a744 | ||
|
|
2d1971123a | ||
|
|
efe3dfad5c | ||
|
|
b10ccce44a | ||
|
|
edadc51e05 | ||
|
|
0e38671224 | ||
|
|
910b2f2b74 | ||
|
|
57387903fd | ||
|
|
8b1ac9fa6e | ||
|
|
ad8c0737d6 | ||
|
|
87d4d46ce7 | ||
|
|
61add763ae | ||
|
|
6562a1f6af | ||
|
|
71efd10c83 | ||
|
|
679347309e | ||
|
|
c8a05137f4 | ||
|
|
f56d80236e | ||
|
|
1b19e870c0 | ||
|
|
684ce09bb5 | ||
|
|
9f08faf263 | ||
|
|
3bd0efa91e | ||
|
|
679330c1c0 | ||
|
|
47d5e54c48 | ||
|
|
03b0c0cff4 | ||
|
|
776dd8b928 | ||
|
|
c2a2f8dabd | ||
|
|
393244d44b | ||
|
|
e6b9caac61 | ||
|
|
81c4166389 | ||
|
|
0b619e50ba | ||
|
|
59ecf375b0 | ||
|
|
338129faea | ||
|
|
151a64f817 | ||
|
|
3461f3dfc7 | ||
|
|
23dc9ef494 | ||
|
|
2fc5b69465 | ||
|
|
f8fc554f78 | ||
|
|
3f58c930e3 | ||
|
|
7705999e57 | ||
|
|
0a754b8982 | ||
|
|
8d3f5820ca | ||
|
|
ef4f0168f8 | ||
|
|
9f5b09c263 | ||
|
|
a1c61daea6 | ||
|
|
90c1c21646 | ||
|
|
bf9069524a | ||
|
|
905376de1d | ||
|
|
6fa556e8ea | ||
|
|
9a8ab84ecb | ||
|
|
5e1b8212b2 | ||
|
|
7ca821f38c | ||
|
|
5c718c7c9a | ||
|
|
7e104805c0 | ||
|
|
21fab77c4b | ||
|
|
770f4a78aa | ||
|
|
c522e047c6 | ||
|
|
92f6949ecc | ||
|
|
478eeea73e | ||
|
|
163ee73719 | ||
|
|
479a6d9ad2 | ||
|
|
b3ffbeb63e | ||
|
|
8a3615281c | ||
|
|
d6b4448d3c | ||
|
|
123523ef62 | ||
|
|
4960e08a24 | ||
|
|
60103f7ad6 | ||
|
|
d3a261de89 | ||
|
|
ecce1edded | ||
|
|
fb8eafab81 | ||
|
|
a6de296703 | ||
|
|
be3e43e6cb | ||
|
|
93678a07a8 | ||
|
|
155b8f1c45 | ||
|
|
e737fa59b3 | ||
|
|
8d27d8efcf | ||
|
|
5174c002cf | ||
|
|
26b8515cb5 | ||
|
|
cf5bd31203 | ||
|
|
d485287a59 | ||
|
|
d0e48a02a1 | ||
|
|
36b702702b | ||
|
|
75db59a8bb | ||
|
|
48548e9303 | ||
|
|
5163905954 | ||
|
|
27d58e1e2a | ||
|
|
78da810114 | ||
|
|
6d65cf2382 | ||
|
|
162da089ec | ||
|
|
228fb2f80d | ||
|
|
8ed600bf3f | ||
|
|
e3b6e1325e | ||
|
|
9101d64b20 | ||
|
|
089c4ceb30 | ||
|
|
dc8abc74ed | ||
|
|
31e3a426a6 | ||
|
|
00969df06f | ||
|
|
c482ccfd4e | ||
|
|
b6432e7d13 | ||
|
|
35a3cb35d5 | ||
|
|
2cadabd60c | ||
|
|
997d1fbc80 | ||
|
|
8ee958bfa0 | ||
|
|
8b64c96381 | ||
|
|
aba6cc2c64 | ||
|
|
0718520f36 | ||
|
|
93b7a797d2 | ||
|
|
4ab0e693c1 | ||
|
|
af5f85a288 | ||
|
|
0a69f3c7fd | ||
|
|
48889ce56e | ||
|
|
4532e59933 | ||
|
|
91d784f9bd | ||
|
|
6f56097c53 | ||
|
|
5b0ad0508a | ||
|
|
f1c06d6743 | ||
|
|
e5949dbb86 | ||
|
|
2b95b96fa3 | ||
|
|
147079ce2a | ||
|
|
e992702783 | ||
|
|
2d05281ba9 | ||
|
|
9a1069c1ae | ||
|
|
561d3e0670 | ||
|
|
d7a41ce8f7 | ||
|
|
784b0a2248 | ||
|
|
346cb4e203 | ||
|
|
de8518a112 | ||
|
|
8ef67c393b | ||
|
|
496c361bdc | ||
|
|
3646301ce4 | ||
|
|
9042109d04 | ||
|
|
91c85ec86b | ||
|
|
7d3919e3f7 | ||
|
|
3a928aac9f | ||
|
|
8b6e24e83d | ||
|
|
ef38572d5a | ||
|
|
a2b04c9d71 | ||
|
|
c20ab0b93e | ||
|
|
c496a34f57 | ||
|
|
27103889a4 | ||
|
|
e781b29d57 | ||
|
|
751506d5b5 | ||
|
|
2061248224 | ||
|
|
dcb748c544 | ||
|
|
ec37867d72 | ||
|
|
20c1b58307 | ||
|
|
e482f041a8 | ||
|
|
ef64d9c188 | ||
|
|
466444e17d | ||
|
|
b420f5b41b | ||
|
|
53a719e1b1 | ||
|
|
5f665b8ecb | ||
|
|
65b2db2160 | ||
|
|
617d21129f | ||
|
|
2d1fdc4485 | ||
|
|
5aa2e66d02 | ||
|
|
8850d974a2 | ||
|
|
e6c4c48261 | ||
|
|
8eb0f3b60a | ||
|
|
5192049194 | ||
|
|
fabf830132 | ||
|
|
c9159e2191 | ||
|
|
f2348fc749 | ||
|
|
264ab285a7 | ||
|
|
f28a92be1d | ||
|
|
d38a6e5047 | ||
|
|
3447aac940 | ||
|
|
711b8cfa36 | ||
|
|
91a6af71a0 | ||
|
|
885e7f0471 | ||
|
|
8c1e546123 | ||
|
|
fd4dedcbdf | ||
|
|
88a82eecf3 | ||
|
|
906122a334 | ||
|
|
6f1529d730 | ||
|
|
46162ed3c4 | ||
|
|
3b911f19f6 | ||
|
|
4e6f55e176 | ||
|
|
14cae1b59a | ||
|
|
9aa23dac80 | ||
|
|
eb099c70e6 | ||
|
|
4837117719 | ||
|
|
550b67236e | ||
|
|
8000ff2cd7 | ||
|
|
da358615e0 | ||
|
|
8f387891e2 | ||
|
|
a961615076 | ||
|
|
bf31722931 | ||
|
|
251f51ca1b | ||
|
|
e8722e1cb2 | ||
|
|
6db4972208 | ||
|
|
f0e18ac619 | ||
|
|
8e7117fa22 | ||
|
|
959859f57c | ||
|
|
f8eef7c9a6 | ||
|
|
595134cab5 | ||
|
|
8b76428c7e | ||
|
|
591fbf0ec6 | ||
|
|
4b5b79e415 | ||
|
|
5a50248055 | ||
|
|
113f665295 | ||
|
|
d56a3d015b | ||
|
|
85c59762a4 | ||
|
|
01b4e1946a | ||
|
|
17cde3426a | ||
|
|
19e407532b | ||
|
|
c5d20a21f7 | ||
|
|
54f2b1b2d8 | ||
|
|
5e872e4d2d | ||
|
|
a429e22b93 | ||
|
|
44eac2bf07 | ||
|
|
500ecb464c | ||
|
|
5b4abe69aa | ||
|
|
f2866442d2 | ||
|
|
3cdfa1014a | ||
|
|
0d4ad1b635 | ||
|
|
19a9a990b6 | ||
|
|
149639a53d | ||
|
|
2812d2911f | ||
|
|
2b2b9c2f03 | ||
|
|
b847c8424a | ||
|
|
59a97ffb99 | ||
|
|
d5ec85c1d8 | ||
|
|
979db97859 | ||
|
|
e896971fa4 | ||
|
|
ec49ff31ef | ||
|
|
1ec9137fd7 | ||
|
|
d6f4886c5b | ||
|
|
b6128b6fe0 | ||
|
|
9436789d6d | ||
|
|
fd53385c1f | ||
|
|
0e9ad5d82b | ||
|
|
759bbe63dc | ||
|
|
e8a390c251 | ||
|
|
631e51a493 | ||
|
|
81a9554caa | ||
|
|
3f1f070d3f | ||
|
|
987fa198c8 | ||
|
|
2444acb041 | ||
|
|
3992cea084 | ||
|
|
f9632d5c43 | ||
|
|
f43752b3ad | ||
|
|
44496c7053 | ||
|
|
9f90d3a7fc | ||
|
|
be6e329e94 | ||
|
|
83919492d3 | ||
|
|
9d4d3cc5e3 | ||
|
|
ee8819681f | ||
|
|
a0ff432ac8 | ||
|
|
a27e9ad734 | ||
|
|
6ba0755e15 | ||
|
|
1b4f3a7529 | ||
|
|
b322f986a8 | ||
|
|
e712a51833 | ||
|
|
06629e8cd9 | ||
|
|
841abc2e87 | ||
|
|
f362702856 | ||
|
|
0f535a98a7 | ||
|
|
cf338e669a | ||
|
|
eaa50adf75 | ||
|
|
052fabcae3 | ||
|
|
a6b325f0d0 | ||
|
|
1411dfb711 | ||
|
|
ccaec28d0b | ||
|
|
36f72191ad | ||
|
|
25cefc6eab | ||
|
|
29432d5d6a | ||
|
|
20e303d3e6 | ||
|
|
1c79f85d00 | ||
|
|
4f43f1dd0f | ||
|
|
81a2cf9086 | ||
|
|
8c440cc3c5 | ||
|
|
b66f32fe9e | ||
|
|
3521255d9e | ||
|
|
d485a05935 | ||
|
|
7ee1af5348 | ||
|
|
f493d69bd2 | ||
|
|
a70613d929 | ||
|
|
352fc55234 | ||
|
|
fdfc767930 | ||
|
|
9b449a1d26 | ||
|
|
18b74b9045 | ||
|
|
1cf4d3b4d2 | ||
|
|
a7772b922c | ||
|
|
131f7ec5bb | ||
|
|
971d0efda9 | ||
|
|
6e566e0165 | ||
|
|
a949c5e287 | ||
|
|
7ec4d9af3e | ||
|
|
9b85dd27ca | ||
|
|
cf9f7ef508 | ||
|
|
7f39d917ab | ||
|
|
2e5a0e056c | ||
|
|
850efbde95 | ||
|
|
a11fb2816b | ||
|
|
23c2ae49c6 | ||
|
|
96556d4a4c | ||
|
|
d601b60903 | ||
|
|
e451dec70c | ||
|
|
51cbb9b310 | ||
|
|
1c4f374e3c | ||
|
|
fd0719db6d | ||
|
|
04dd4e30a8 | ||
|
|
1ffbec0215 | ||
|
|
f68466b072 | ||
|
|
02a8b693af | ||
|
|
53219bcf70 | ||
|
|
81f9c70279 | ||
|
|
233a87a8bc | ||
|
|
00e4cfc345 | ||
|
|
9388e154cf | ||
|
|
3ba2a7931e | ||
|
|
377689ae86 | ||
|
|
62ffd93cb7 | ||
|
|
fe9f02e485 | ||
|
|
130aa67ba0 | ||
|
|
97a4c76043 | ||
|
|
3d89a34adf | ||
|
|
5c7155c3a5 | ||
|
|
f582fbf010 | ||
|
|
c2039da600 | ||
|
|
ffc4cd3415 | ||
|
|
c4ca180745 | ||
|
|
673fea47bd | ||
|
|
83fda73ce3 | ||
|
|
a5f407a458 | ||
|
|
88175aff1f | ||
|
|
2f408cd773 | ||
|
|
7d8ba66211 | ||
|
|
c1ae9e9680 | ||
|
|
34665cd6da | ||
|
|
0c8709ca5f | ||
|
|
12ebae01b0 | ||
|
|
165511fb14 | ||
|
|
fbf3c005ff | ||
|
|
bbe6d2d13b | ||
|
|
633ff4b60e | ||
|
|
b8c2c3991f | ||
|
|
38f788f545 | ||
|
|
9af70551f3 | ||
|
|
316d015d23 | ||
|
|
cfce189201 | ||
|
|
482ecf12ff | ||
|
|
50b0b61118 | ||
|
|
a7b1d83a3c | ||
|
|
8c1cc51c2e | ||
|
|
e2207e33ef | ||
|
|
3f543347b8 | ||
|
|
a7725f03bb | ||
|
|
f0d092f126 | ||
|
|
4f16ad6757 | ||
|
|
689aed7258 | ||
|
|
e966213ff8 | ||
|
|
4169927d83 | ||
|
|
eacc6b7b6e | ||
|
|
4b87363a20 | ||
|
|
9ba331693f | ||
|
|
12be795de7 | ||
|
|
49f56a38fb | ||
|
|
4e80d54be1 | ||
|
|
2096007ed9 | ||
|
|
47ce695142 | ||
|
|
80cd74edc8 | ||
|
|
55583c2237 | ||
|
|
069232ec1b | ||
|
|
5733f4079f | ||
|
|
55fe977d54 | ||
|
|
736789a9ed | ||
|
|
7150811aef | ||
|
|
63103ede81 | ||
|
|
c86252777b | ||
|
|
2bcdf27b03 | ||
|
|
2001d3c617 | ||
|
|
8210a51fdc | ||
|
|
08ff324b1b | ||
|
|
55f60866cb | ||
|
|
e2f08d4161 | ||
|
|
2e7f4c2f21 | ||
|
|
a58c082cfa | ||
|
|
5824afa941 | ||
|
|
adcc11c474 | ||
|
|
4769a1a49f | ||
|
|
f6a6a39d3b | ||
|
|
2940023cb0 | ||
|
|
d426f7242a | ||
|
|
2f9d65b4eb | ||
|
|
a4c1d5fe9d | ||
|
|
13c7c99965 | ||
|
|
fbfa7e7be3 | ||
|
|
e5dda6dd49 | ||
|
|
b9af3c7f34 | ||
|
|
64b8adb3d0 | ||
|
|
cb371f09ac | ||
|
|
9147c12687 | ||
|
|
b5c870d677 | ||
|
|
62a396b661 | ||
|
|
81731139e9 | ||
|
|
8a371b9c1b | ||
|
|
51092fb6a9 | ||
|
|
018abd6aad | ||
|
|
5292d75617 | ||
|
|
401e1166f9 | ||
|
|
45c1427f91 | ||
|
|
73be099d7f | ||
|
|
735faa2d11 | ||
|
|
46946c7323 | ||
|
|
d98bbca353 | ||
|
|
83fcb8e8ed | ||
|
|
ec61aa0080 | ||
|
|
4211501acf | ||
|
|
ae6afad885 | ||
|
|
3b8cee64b8 | ||
|
|
a8da0c18ee | ||
|
|
dac0471157 | ||
|
|
07007ee5a5 | ||
|
|
b78c08a30a | ||
|
|
5a487bc30c | ||
|
|
c913c77fef | ||
|
|
557d363d02 | ||
|
|
839885910c | ||
|
|
ee16070abe | ||
|
|
b8b5ab6378 | ||
|
|
5b88f4d3d2 | ||
|
|
34eb834d94 | ||
|
|
82a3cd9bdb | ||
|
|
e25ecce887 | ||
|
|
9f6d683415 | ||
|
|
dc114d62c5 | ||
|
|
6bf3006eb9 | ||
|
|
fddc3d6ad9 | ||
|
|
f76a2bc224 | ||
|
|
6558a32794 | ||
|
|
b935d54fe7 | ||
|
|
cb827406ca | ||
|
|
36fcf2c60e | ||
|
|
7c173bd63f | ||
|
|
3c43f621ce | ||
|
|
bdab477040 | ||
|
|
550c159ca8 | ||
|
|
aeec5d1542 | ||
|
|
b4aa213c64 | ||
|
|
a241e10208 | ||
|
|
90f6642d33 | ||
|
|
7bd289ed0f | ||
|
|
c8aa35d23c | ||
|
|
4e0e472f97 | ||
|
|
a76658ba46 | ||
|
|
6796204126 | ||
|
|
1c5e91c9a8 | ||
|
|
7f16675d2f | ||
|
|
6c7c442ad2 | ||
|
|
82fb2151a0 | ||
|
|
36b7c1c720 | ||
|
|
06bf67c146 | ||
|
|
8cc0fbc687 | ||
|
|
c846a14118 | ||
|
|
097424c535 | ||
|
|
c7ed36d558 | ||
|
|
95eab45108 | ||
|
|
f852813734 | ||
|
|
ca6a331a26 | ||
|
|
bfae205fbe | ||
|
|
aaa1245430 | ||
|
|
a99ae76ad4 | ||
|
|
6429e8b532 | ||
|
|
cb338e330f | ||
|
|
d12bd0824d | ||
|
|
4c0551ebb1 | ||
|
|
06fc23fc59 | ||
|
|
41977bf515 | ||
|
|
ffd2817d18 | ||
|
|
c48937a2f5 | ||
|
|
091d1157da | ||
|
|
be043a4437 | ||
|
|
fae0bccc9c | ||
|
|
b44cf4a094 | ||
|
|
90f4187ca9 | ||
|
|
ae272074b9 | ||
|
|
9972f7b90e | ||
|
|
f68cefbdc1 | ||
|
|
08841ed895 | ||
|
|
a919737f6e | ||
|
|
8f3510b3c4 | ||
|
|
6c588a8f2f | ||
|
|
4c9ef606f3 | ||
|
|
0b7bb806b7 | ||
|
|
78558e513c | ||
|
|
52e7ddf079 | ||
|
|
e2bc6990c7 | ||
|
|
06c3082fdf | ||
|
|
54cd55523b | ||
|
|
556f75ef6c | ||
|
|
951634a717 | ||
|
|
51d7e177a6 | ||
|
|
81e074115d | ||
|
|
9eb34e496f | ||
|
|
da60739893 | ||
|
|
7be1f16313 | ||
|
|
39b0d9e46f | ||
|
|
7be9e0fb94 | ||
|
|
e3e8d083ea | ||
|
|
9929bfb281 | ||
|
|
effa277a3b | ||
|
|
2661f81fd1 | ||
|
|
661de0c326 | ||
|
|
e1fd43b2a4 | ||
|
|
b697824540 | ||
|
|
eb3eef4b80 | ||
|
|
c3736c6fa3 | ||
|
|
0ef7503917 | ||
|
|
cef50e5f52 | ||
|
|
cb8ff398a5 | ||
|
|
eeb1a6b769 | ||
|
|
66822f7333 | ||
|
|
e466dc9fc7 | ||
|
|
947204bb9d | ||
|
|
f37f097dec | ||
|
|
a8d35b67aa | ||
|
|
4e0d94f347 | ||
|
|
c7e773dd9a | ||
|
|
e64d102efd | ||
|
|
49ea9434f2 | ||
|
|
e21c354428 | ||
|
|
d0614efd65 | ||
|
|
b0baf75fdd | ||
|
|
efb3e92525 | ||
|
|
5cdc563c9e | ||
|
|
a43dfc567c | ||
|
|
ea6e4c6006 | ||
|
|
98930792c3 | ||
|
|
165d1aacae | ||
|
|
831f1b6aee | ||
|
|
2f5fb3688a | ||
|
|
d8897a0cc8 | ||
|
|
3b956c598b | ||
|
|
1ee71bbd5c | ||
|
|
b7ab4fd086 | ||
|
|
44c6050bf2 | ||
|
|
35c759c6bc | ||
|
|
372cf275e0 | ||
|
|
33095966af | ||
|
|
ff53404d5b | ||
|
|
941288b58e | ||
|
|
22441ef80c | ||
|
|
8c2f11de7d | ||
|
|
c7a4d67cfb | ||
|
|
688275ea81 | ||
|
|
266102df2f | ||
|
|
f7aadc352b | ||
|
|
1ae3af0e80 | ||
|
|
97d27fe869 | ||
|
|
fcd2e28abb | ||
|
|
2522e66969 | ||
|
|
b9250edb33 | ||
|
|
54cab2c5a5 | ||
|
|
6231db1411 | ||
|
|
ef5a395c60 | ||
|
|
a200771868 | ||
|
|
914e043abe | ||
|
|
9d66f9cc03 | ||
|
|
e708065446 | ||
|
|
9c64cdb9c4 | ||
|
|
9f8d61ab2f | ||
|
|
0143fd28af | ||
|
|
844d030332 | ||
|
|
ae18ece549 | ||
|
|
10a0c6a086 | ||
|
|
51189fd244 | ||
|
|
1e10529f20 | ||
|
|
8d701ebb4f | ||
|
|
269bb94138 | ||
|
|
9b98ff52ea | ||
|
|
52f2f96f36 | ||
|
|
b53e40f1bf | ||
|
|
4e0d11f517 | ||
|
|
1a24ba857c | ||
|
|
1e254b958e | ||
|
|
23140b3d6a | ||
|
|
8c901d8f71 | ||
|
|
856356ce75 | ||
|
|
b5a65a4519 | ||
|
|
d056c00c67 | ||
|
|
36fb6dac89 | ||
|
|
fcda883878 | ||
|
|
40c0286942 | ||
|
|
59df447fed | ||
|
|
a253d34c00 | ||
|
|
0a5eac50be | ||
|
|
156c3d288c | ||
|
|
154e5660de | ||
|
|
13e6b91ac7 | ||
|
|
a89ad5d0fb | ||
|
|
e11c27048b | ||
|
|
e8dd277a00 | ||
|
|
329db0d8e9 | ||
|
|
eaf3ea9289 | ||
|
|
4156beaa3c | ||
|
|
4115d3d13d | ||
|
|
5f01751660 | ||
|
|
7d4e23448e | ||
|
|
c7aa5ed544 | ||
|
|
1bfe409c93 | ||
|
|
e8d619c740 | ||
|
|
2dc3ec955a | ||
|
|
07ff7c6cb0 | ||
|
|
8d52ca6be6 | ||
|
|
df91b2bfeb | ||
|
|
9d02e539c8 | ||
|
|
241fee80a7 | ||
|
|
83786ddeaf | ||
|
|
0e9793b845 | ||
|
|
2b36dd660b | ||
|
|
35ffc03988 | ||
|
|
5a9d1a3fce | ||
|
|
6776d88688 | ||
|
|
affe9defb5 | ||
|
|
d3fdf433cd | ||
|
|
cec8114b99 | ||
|
|
0a1a5ed70e | ||
|
|
c587c011d2 | ||
|
|
c2fa149ffd | ||
|
|
c63c75018d |
@@ -27,7 +27,7 @@ GOTO:EOF
|
||||
call:logInfo "Clone dependencies repository"
|
||||
git clone -q --depth 1 --branch=master https://github.com/telegramdesktop/dependencies_windows.git %LIB_DIR%
|
||||
cd %LIB_DIR%
|
||||
git clone https://github.com/Microsoft/Range-V3-VS2015 range-v3
|
||||
git clone https://github.com/ericniebler/range-v3
|
||||
if exist prepare.bat (
|
||||
call prepare.bat
|
||||
) else (
|
||||
@@ -48,7 +48,7 @@ GOTO:EOF
|
||||
git submodule init
|
||||
git submodule update
|
||||
cd %SRC_DIR%\Telegram
|
||||
call gyp\refresh.bat
|
||||
call gyp\refresh.bat --api-id 17349 --api-hash 344583e45741c457fe1862106095a5eb
|
||||
GOTO:EOF
|
||||
|
||||
:configureBuild
|
||||
@@ -56,10 +56,6 @@ GOTO:EOF
|
||||
call:logInfo "Build version: %BUILD_VERSION%"
|
||||
set TDESKTOP_BUILD_DEFINES=
|
||||
|
||||
echo %BUILD_VERSION% | findstr /C:"disable_autoupdate">nul && (
|
||||
set TDESKTOP_BUILD_DEFINES=%TDESKTOP_BUILD_DEFINES%,TDESKTOP_DISABLE_AUTOUPDATE
|
||||
)
|
||||
|
||||
echo %BUILD_VERSION% | findstr /C:"disable_register_custom_scheme">nul && (
|
||||
set TDESKTOP_BUILD_DEFINES=%TDESKTOP_BUILD_DEFINES%,TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME
|
||||
)
|
||||
@@ -76,10 +72,6 @@ GOTO:EOF
|
||||
set TDESKTOP_BUILD_DEFINES=%TDESKTOP_BUILD_DEFINES%,TDESKTOP_DISABLE_DESKTOP_FILE_GENERATION
|
||||
)
|
||||
|
||||
echo %BUILD_VERSION% | findstr /C:"disable_unity_integration">nul && (
|
||||
set TDESKTOP_BUILD_DEFINES=%TDESKTOP_BUILD_DEFINES%,TDESKTOP_DISABLE_UNITY_INTEGRATION
|
||||
)
|
||||
|
||||
echo %BUILD_VERSION% | findstr /C:"disable_gtk_integration">nul && (
|
||||
set TDESKTOP_BUILD_DEFINES=%TDESKTOP_BUILD_DEFINES%,TDESKTOP_DISABLE_GTK_INTEGRATION
|
||||
)
|
||||
|
||||
5
.github/CONTRIBUTING.md
vendored
@@ -24,6 +24,8 @@ If we find issues with your pull request, we may suggest some changes and improv
|
||||
|
||||
Unfortunately we **do not merge** any pull requests that have new feature implementations, translations to new languages and those which introduce any new user interface elements.
|
||||
|
||||
If you have a translations-related contribution, check out [Translations platform][translate].
|
||||
|
||||
Telegram Desktop is not a standalone application but a part of [Telegram project][telegram], so all the decisions about the features, languages, user experience, user interface and the design are made inside Telegram team, often according to some roadmap which is not public.
|
||||
|
||||
## Build instructions
|
||||
@@ -33,7 +35,7 @@ environments.
|
||||
|
||||
## Pull upstream changes into your fork regularly
|
||||
|
||||
Telegram Desktop is advancing quickly. It is therefore critical that you pull upstream changes into your fork on a regular basis. Nothing is worse than putting in a days of hard work into a pull request only to have it rejected because it has diverged too far from upstram.
|
||||
Telegram Desktop is advancing quickly. It is therefore critical that you pull upstream changes into your fork on a regular basis. Nothing is worse than putting in a days of hard work into a pull request only to have it rejected because it has diverged too far from upstream.
|
||||
|
||||
To pull in upstream changes:
|
||||
|
||||
@@ -113,3 +115,4 @@ Before you submit a pull request, please test your changes. Verify that Telegram
|
||||
[pr]: https://github.com/telegramdesktop/tdesktop/compare
|
||||
[build_instructions]: https://github.com/telegramdesktop/tdesktop/blob/master/README.md#build-instructions
|
||||
[closing-issues-via-commit-messages]: https://help.github.com/articles/closing-issues-via-commit-messages/
|
||||
[translate]: https://translations.telegram.org
|
||||
|
||||
5
.github/ISSUE_TEMPLATE.md
vendored
@@ -22,8 +22,5 @@ Tell us what happens instead
|
||||
**Used theme**:
|
||||
|
||||
<details><summary><b>Logs</b>:</summary>
|
||||
Insert logs here (if necessary)
|
||||
|
||||
<!-- You can type `debugmode` in settings and then see ~/.TelegramDesktop/DebugLogs/log_...txt for log files.
|
||||
Type `debugmode` in settings again to disable logs. -->
|
||||
Insert log.txt here (if necessary)
|
||||
</details>
|
||||
|
||||
9
.gitignore
vendored
@@ -50,6 +50,15 @@ ipch/
|
||||
project.xcworkspace
|
||||
xcuserdata
|
||||
|
||||
parts
|
||||
prime
|
||||
stage
|
||||
*.snap
|
||||
.snapcraft
|
||||
/snap/gui/*.png
|
||||
/snap/gui/*.desktop
|
||||
/snap/plugins/__pycache__
|
||||
|
||||
/Telegram/*.user.*
|
||||
*.pro.user
|
||||
/Linux/
|
||||
|
||||
3
.gitmodules
vendored
@@ -13,3 +13,6 @@
|
||||
[submodule "Telegram/ThirdParty/crl"]
|
||||
path = Telegram/ThirdParty/crl
|
||||
url = https://github.com/telegramdesktop/crl.git
|
||||
[submodule "Telegram/ThirdParty/xxHash"]
|
||||
path = Telegram/ThirdParty/xxHash
|
||||
url = https://github.com/Cyan4973/xxHash.git
|
||||
|
||||
@@ -10,12 +10,10 @@ cache:
|
||||
env:
|
||||
matrix:
|
||||
- BUILD_VERSION=""
|
||||
- BUILD_VERSION="disable_autoupdate"
|
||||
- BUILD_VERSION="disable_register_custom_scheme"
|
||||
- BUILD_VERSION="disable_crash_reports"
|
||||
- BUILD_VERSION="disable_network_proxy"
|
||||
- BUILD_VERSION="disable_desktop_file_generation"
|
||||
- BUILD_VERSION="disable_unity_integration"
|
||||
- BUILD_VERSION="disable_gtk_integration"
|
||||
|
||||
matrix:
|
||||
@@ -46,7 +44,7 @@ addons:
|
||||
- libopus-dev
|
||||
- libpulse-dev
|
||||
- libssl-dev
|
||||
- libunity-dev
|
||||
- libdee-dev
|
||||
- libva-dev
|
||||
- libvdpau-dev
|
||||
- libxcb-xkb-dev
|
||||
|
||||
@@ -17,7 +17,7 @@ XKB_PATH="$BUILD/libxkbcommon"
|
||||
XKB_CACHE_VERSION="3"
|
||||
|
||||
QT_PATH="$BUILD/qt"
|
||||
QT_CACHE_VERSION="3"
|
||||
QT_CACHE_VERSION="4"
|
||||
QT_PATCH="$UPSTREAM/Telegram/Patches/qtbase_${QT_VERSION//\./_}.diff"
|
||||
|
||||
BREAKPAD_PATH="$BUILD/breakpad"
|
||||
@@ -40,7 +40,7 @@ FFMPEG_PATH="$BUILD/ffmpeg"
|
||||
FFMPEG_CACHE_VERSION="3"
|
||||
|
||||
OPENAL_PATH="$BUILD/openal-soft"
|
||||
OPENAL_CACHE_VERSION="3"
|
||||
OPENAL_CACHE_VERSION="4"
|
||||
|
||||
GYP_DEFINES=""
|
||||
|
||||
@@ -100,10 +100,6 @@ build() {
|
||||
fi
|
||||
|
||||
# Configure the build
|
||||
if [[ $BUILD_VERSION == *"disable_autoupdate"* ]]; then
|
||||
GYP_DEFINES+=",TDESKTOP_DISABLE_AUTOUPDATE"
|
||||
fi
|
||||
|
||||
if [[ $BUILD_VERSION == *"disable_register_custom_scheme"* ]]; then
|
||||
GYP_DEFINES+=",TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME"
|
||||
fi
|
||||
@@ -120,10 +116,6 @@ build() {
|
||||
GYP_DEFINES+=",TDESKTOP_DISABLE_DESKTOP_FILE_GENERATION"
|
||||
fi
|
||||
|
||||
if [[ $BUILD_VERSION == *"disable_unity_integration"* ]]; then
|
||||
GYP_DEFINES+=",TDESKTOP_DISABLE_UNITY_INTEGRATION"
|
||||
fi
|
||||
|
||||
if [[ $BUILD_VERSION == *"disable_gtk_integration"* ]]; then
|
||||
GYP_DEFINES+=",TDESKTOP_DISABLE_GTK_INTEGRATION"
|
||||
fi
|
||||
@@ -476,10 +468,12 @@ buildOpenAL() {
|
||||
rm -rf "$EXTERNAL/openal-soft"
|
||||
fi
|
||||
cd $OPENAL_PATH
|
||||
rm -rf *
|
||||
sudo rm -rf *
|
||||
|
||||
cd "$EXTERNAL"
|
||||
git clone https://github.com/kcat/openal-soft.git
|
||||
cd openal-soft
|
||||
git checkout openal-soft-1.19.1
|
||||
|
||||
cd "$EXTERNAL/openal-soft/build"
|
||||
cmake \
|
||||
@@ -606,6 +600,7 @@ buildCustomQt() {
|
||||
cd "$EXTERNAL/qt${QT_VERSION}/qtbase/src/plugins/platforminputcontexts"
|
||||
git clone https://github.com/telegramdesktop/fcitx.git
|
||||
git clone https://github.com/telegramdesktop/hime.git
|
||||
git clone https://github.com/telegramdesktop/nimf.git
|
||||
cd ../../../..
|
||||
|
||||
./configure -prefix $QT_PATH -release -opensource -confirm-license -qt-zlib \
|
||||
@@ -677,6 +672,8 @@ buildTelegram() {
|
||||
|
||||
cd "$UPSTREAM/Telegram/gyp"
|
||||
"$GYP_PATH/gyp" \
|
||||
-Dapi_id=17349 \
|
||||
-Dapi_hash=344583e45741c457fe1862106095a5eb \
|
||||
-Dbuild_defines=${GYP_DEFINES:1} \
|
||||
-Dlinux_path_xkbcommon=$XKB_PATH \
|
||||
-Dlinux_path_va=$VA_PATH \
|
||||
|
||||
2
LEGAL
@@ -1,7 +1,7 @@
|
||||
This file is part of Telegram Desktop,
|
||||
the official desktop application for the Telegram messaging service.
|
||||
|
||||
Copyright (c) 2014-2018 John Preston, https://desktop.telegram.org
|
||||
Copyright (c) 2014-2019 John Preston, https://desktop.telegram.org
|
||||
|
||||
Telegram Desktop is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
|
||||
10
README.md
@@ -15,8 +15,9 @@ The source code is published under GPLv3 with OpenSSL exception, the license is
|
||||
* Windows XP - Windows 10 (**not** RT)
|
||||
* Mac OS X 10.8 - Mac OS X 10.11
|
||||
* Mac OS X 10.6 - Mac OS X 10.7 (separate build)
|
||||
* Ubuntu 12.04 - Ubuntu 18.04
|
||||
* Fedora 22 - Fedora 24
|
||||
* Ubuntu 12.04 - Ubuntu 18.10
|
||||
* Fedora 22 - Fedora 29
|
||||
* [Snappy](https://snapcraft.io/telegram-desktop)
|
||||
|
||||
## Third-party
|
||||
|
||||
@@ -30,7 +31,7 @@ The source code is published under GPLv3 with OpenSSL exception, the license is
|
||||
* Google Crashpad ([Apache License 2.0](https://chromium.googlesource.com/crashpad/crashpad/+/master/LICENSE))
|
||||
* GYP ([BSD License](https://github.com/bnoordhuis/gyp/blob/master/LICENSE))
|
||||
* Ninja ([Apache License 2.0](https://github.com/ninja-build/ninja/blob/master/COPYING))
|
||||
* OpenAL Soft ([LGPL](http://kcat.strangesoft.net/openal.html))
|
||||
* OpenAL Soft ([LGPL](https://github.com/kcat/openal-soft/blob/master/COPYING))
|
||||
* Opus codec ([BSD License](http://www.opus-codec.org/license/))
|
||||
* FFmpeg ([LGPL](https://www.ffmpeg.org/legal.html))
|
||||
* Guideline Support Library ([MIT License](https://github.com/Microsoft/GSL/blob/master/LICENSE))
|
||||
@@ -39,11 +40,12 @@ The source code is published under GPLv3 with OpenSSL exception, the license is
|
||||
* Open Sans font ([Apache License 2.0](http://www.apache.org/licenses/LICENSE-2.0.html))
|
||||
* Emoji alpha codes ([MIT License](https://github.com/emojione/emojione/blob/master/extras/alpha-codes/LICENSE.md))
|
||||
* Catch test framework ([Boost License](https://github.com/philsquared/Catch/blob/master/LICENSE.txt))
|
||||
* xxHash ([BSD License](https://github.com/Cyan4973/xxHash/blob/dev/LICENSE))
|
||||
|
||||
## Build instructions
|
||||
|
||||
* [Visual Studio 2017][msvc]
|
||||
* [Xcode 9][xcode]
|
||||
* [Xcode 10][xcode]
|
||||
* [GYP/CMake on GNU/Linux][cmake]
|
||||
|
||||
[//]: # (LINKS)
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/src/build/common.gypi b/src/build/common.gypi
|
||||
index 29990c6..53e99d4 100644
|
||||
index 29990c65..53e99d44 100644
|
||||
--- a/src/build/common.gypi
|
||||
+++ b/src/build/common.gypi
|
||||
@@ -330,6 +330,7 @@
|
||||
@@ -11,7 +11,7 @@ index 29990c6..53e99d4 100644
|
||||
},
|
||||
}],
|
||||
diff --git a/src/client/mac/Breakpad.xcodeproj/project.pbxproj b/src/client/mac/Breakpad.xcodeproj/project.pbxproj
|
||||
index 1a93ce6..1c1d643 100644
|
||||
index 1a93ce6d..b5986e33 100644
|
||||
--- a/src/client/mac/Breakpad.xcodeproj/project.pbxproj
|
||||
+++ b/src/client/mac/Breakpad.xcodeproj/project.pbxproj
|
||||
@@ -35,6 +35,19 @@
|
||||
@@ -34,7 +34,15 @@ index 1a93ce6..1c1d643 100644
|
||||
162F64F2161C577500CD68D5 /* arch_utilities.cc in Sources */ = {isa = PBXBuildFile; fileRef = 162F64F0161C577500CD68D5 /* arch_utilities.cc */; };
|
||||
162F64F3161C577500CD68D5 /* arch_utilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 162F64F1161C577500CD68D5 /* arch_utilities.h */; };
|
||||
162F64F4161C579B00CD68D5 /* arch_utilities.cc in Sources */ = {isa = PBXBuildFile; fileRef = 162F64F0161C577500CD68D5 /* arch_utilities.cc */; };
|
||||
@@ -170,11 +183,8 @@
|
||||
@@ -67,6 +80,7 @@
|
||||
4DBE49A7134A4F280072546A /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DBE4769134A4F080072546A /* CoreServices.framework */; };
|
||||
4DBE49A8134A4F380072546A /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DBE4769134A4F080072546A /* CoreServices.framework */; };
|
||||
4DBE49A9134A4F460072546A /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DBE4769134A4F080072546A /* CoreServices.framework */; };
|
||||
+ 5A8B220921E0C5740045F83C /* breakpad_nlist_64.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C53690ECCE3FD009BE4BA /* breakpad_nlist_64.cc */; };
|
||||
8B3101C611F0CD9F00FCF3E4 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D6A5FE840307C02AAC07 /* AppKit.framework */; };
|
||||
8B3101C711F0CD9F00FCF3E4 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D69BFE84028FC02AAC07 /* Foundation.framework */; };
|
||||
8B3101CA11F0CDB000FCF3E4 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D6A5FE840307C02AAC07 /* AppKit.framework */; };
|
||||
@@ -170,11 +184,8 @@
|
||||
F92C564A0ECD10CA009BE4BA /* string_conversion.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C53850ECCE6AD009BE4BA /* string_conversion.cc */; };
|
||||
F92C564C0ECD10DD009BE4BA /* breakpadUtilities.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F92C563C0ECD10B3009BE4BA /* breakpadUtilities.dylib */; };
|
||||
F92C56570ECD113E009BE4BA /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F92C554A0ECCF530009BE4BA /* Carbon.framework */; };
|
||||
@@ -46,7 +54,7 @@ index 1a93ce6..1c1d643 100644
|
||||
F92C56A90ECE04C5009BE4BA /* crash_report_sender.m in Sources */ = {isa = PBXBuildFile; fileRef = F92C56A80ECE04C5009BE4BA /* crash_report_sender.m */; };
|
||||
F93803CD0F8083B7004D428B /* dynamic_images.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C536B0ECCE3FD009BE4BA /* dynamic_images.cc */; };
|
||||
F93803CE0F8083B7004D428B /* exception_handler.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C536D0ECCE3FD009BE4BA /* exception_handler.cc */; };
|
||||
@@ -213,7 +223,6 @@
|
||||
@@ -213,7 +224,6 @@
|
||||
F9C44DBD0EF072A0003AEBAA /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = F9C44DBA0EF072A0003AEBAA /* MainMenu.xib */; };
|
||||
F9C44E000EF077CD003AEBAA /* Breakpad.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* Breakpad.framework */; };
|
||||
F9C44E3C0EF08B12003AEBAA /* Breakpad.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* Breakpad.framework */; };
|
||||
@@ -54,7 +62,7 @@ index 1a93ce6..1c1d643 100644
|
||||
F9C44EA20EF09F93003AEBAA /* HTTPMultipartUpload.m in Sources */ = {isa = PBXBuildFile; fileRef = F92C53770ECCE635009BE4BA /* HTTPMultipartUpload.m */; };
|
||||
F9C44EE50EF0A006003AEBAA /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F9C44EE40EF0A006003AEBAA /* SystemConfiguration.framework */; };
|
||||
F9C44EE90EF0A3C1003AEBAA /* GTMLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = F9C44EE80EF0A3C1003AEBAA /* GTMLogger.m */; };
|
||||
@@ -410,20 +419,6 @@
|
||||
@@ -410,20 +420,6 @@
|
||||
remoteGlobalIDString = F92C563B0ECD10B3009BE4BA;
|
||||
remoteInfo = breakpadUtilities;
|
||||
};
|
||||
@@ -75,7 +83,7 @@ index 1a93ce6..1c1d643 100644
|
||||
F93DE2FB0F82C3C600608B94 /* PBXContainerItemProxy */ = {
|
||||
isa = PBXContainerItemProxy;
|
||||
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
|
||||
@@ -536,13 +531,6 @@
|
||||
@@ -536,13 +532,6 @@
|
||||
remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
|
||||
remoteInfo = Breakpad;
|
||||
};
|
||||
@@ -89,7 +97,7 @@ index 1a93ce6..1c1d643 100644
|
||||
/* End PBXContainerItemProxy section */
|
||||
|
||||
/* Begin PBXCopyFilesBuildPhase section */
|
||||
@@ -714,7 +702,6 @@
|
||||
@@ -714,7 +703,6 @@
|
||||
isa = PBXFrameworksBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
@@ -97,7 +105,7 @@ index 1a93ce6..1c1d643 100644
|
||||
8DC2EF570486A6940098B216 /* Cocoa.framework in Frameworks */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
@@ -1181,18 +1168,13 @@
|
||||
@@ -1181,18 +1169,13 @@
|
||||
isa = PBXNativeTarget;
|
||||
buildConfigurationList = 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "Breakpad" */;
|
||||
buildPhases = (
|
||||
@@ -116,7 +124,7 @@ index 1a93ce6..1c1d643 100644
|
||||
);
|
||||
name = Breakpad;
|
||||
productInstallPath = "$(HOME)/Library/Frameworks";
|
||||
@@ -1399,6 +1381,8 @@
|
||||
@@ -1399,6 +1382,8 @@
|
||||
/* Begin PBXProject section */
|
||||
0867D690FE84028FC02AAC07 /* Project object */ = {
|
||||
isa = PBXProject;
|
||||
@@ -125,7 +133,7 @@ index 1a93ce6..1c1d643 100644
|
||||
buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "Breakpad" */;
|
||||
compatibilityVersion = "Xcode 3.1";
|
||||
developmentRegion = English;
|
||||
@@ -1583,16 +1567,6 @@
|
||||
@@ -1583,16 +1568,6 @@
|
||||
/* End PBXReferenceProxy section */
|
||||
|
||||
/* Begin PBXResourcesBuildPhase section */
|
||||
@@ -142,7 +150,7 @@ index 1a93ce6..1c1d643 100644
|
||||
F92C569C0ECE04A7009BE4BA /* Resources */ = {
|
||||
isa = PBXResourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
@@ -1640,20 +1614,6 @@
|
||||
@@ -1640,20 +1615,6 @@
|
||||
shellPath = /bin/sh;
|
||||
shellScript = "install_name_tool -id \"@executable_path/../Resources/breakpadUtilities.dylib\" \"${BUILT_PRODUCTS_DIR}/breakpadUtilities.dylib\"\n";
|
||||
};
|
||||
@@ -163,10 +171,11 @@ index 1a93ce6..1c1d643 100644
|
||||
F9C77DD80F7DD5CF0045F7DB /* ShellScript */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
@@ -1674,6 +1634,19 @@
|
||||
@@ -1674,6 +1635,20 @@
|
||||
isa = PBXSourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
+ 5A8B220921E0C5740045F83C /* breakpad_nlist_64.cc in Sources */,
|
||||
+ 0748C0501C63C52D004489BF /* bootstrap_compat.cc in Sources */,
|
||||
+ 0748C04F1C63C523004489BF /* macho_walker.cc in Sources */,
|
||||
+ 0748C04E1C63C51C004489BF /* md5.cc in Sources */,
|
||||
@@ -183,7 +192,7 @@ index 1a93ce6..1c1d643 100644
|
||||
F92C565F0ECD116B009BE4BA /* protected_memory_allocator.cc in Sources */,
|
||||
F92C56630ECD1179009BE4BA /* exception_handler.cc in Sources */,
|
||||
F92C55D10ECD0064009BE4BA /* Breakpad.mm in Sources */,
|
||||
@@ -1955,16 +1928,6 @@
|
||||
@@ -1955,16 +1930,6 @@
|
||||
target = F92C563B0ECD10B3009BE4BA /* breakpadUtilities */;
|
||||
targetProxy = F92C564D0ECD10E5009BE4BA /* PBXContainerItemProxy */;
|
||||
};
|
||||
@@ -200,7 +209,7 @@ index 1a93ce6..1c1d643 100644
|
||||
F93DE2FC0F82C3C600608B94 /* PBXTargetDependency */ = {
|
||||
isa = PBXTargetDependency;
|
||||
target = F93803BD0F80820F004D428B /* generator_test */;
|
||||
@@ -2025,11 +1988,6 @@
|
||||
@@ -2025,11 +1990,6 @@
|
||||
target = 8DC2EF4F0486A6940098B216 /* Breakpad */;
|
||||
targetProxy = F9C44E190EF0790F003AEBAA /* PBXContainerItemProxy */;
|
||||
};
|
||||
@@ -212,7 +221,7 @@ index 1a93ce6..1c1d643 100644
|
||||
/* End PBXTargetDependency section */
|
||||
|
||||
/* Begin PBXVariantGroup section */
|
||||
@@ -2126,8 +2084,12 @@
|
||||
@@ -2126,8 +2086,12 @@
|
||||
isa = XCBuildConfiguration;
|
||||
baseConfigurationReference = 8B31027711F0D3AF00FCF3E4 /* BreakpadDebug.xcconfig */;
|
||||
buildSettings = {
|
||||
@@ -226,7 +235,7 @@ index 1a93ce6..1c1d643 100644
|
||||
};
|
||||
name = Debug;
|
||||
};
|
||||
@@ -2135,7 +2097,12 @@
|
||||
@@ -2135,7 +2099,12 @@
|
||||
isa = XCBuildConfiguration;
|
||||
baseConfigurationReference = 8B31027811F0D3AF00FCF3E4 /* BreakpadRelease.xcconfig */;
|
||||
buildSettings = {
|
||||
@@ -239,7 +248,7 @@ index 1a93ce6..1c1d643 100644
|
||||
};
|
||||
name = Release;
|
||||
};
|
||||
@@ -2454,7 +2421,12 @@
|
||||
@@ -2454,7 +2423,12 @@
|
||||
isa = XCBuildConfiguration;
|
||||
baseConfigurationReference = 8B31027711F0D3AF00FCF3E4 /* BreakpadDebug.xcconfig */;
|
||||
buildSettings = {
|
||||
@@ -253,7 +262,7 @@ index 1a93ce6..1c1d643 100644
|
||||
name = "Debug With Code Coverage";
|
||||
};
|
||||
diff --git a/src/client/mac/Framework/Breakpad.mm b/src/client/mac/Framework/Breakpad.mm
|
||||
index 1d2e519..943310f 100644
|
||||
index 1d2e519b..943310fa 100644
|
||||
--- a/src/client/mac/Framework/Breakpad.mm
|
||||
+++ b/src/client/mac/Framework/Breakpad.mm
|
||||
@@ -355,10 +355,10 @@ bool Breakpad::Initialize(NSDictionary *parameters) {
|
||||
@@ -480,7 +489,7 @@ index 1d2e519..943310f 100644
|
||||
}
|
||||
|
||||
diff --git a/src/common/language.cc b/src/common/language.cc
|
||||
index 978fb85..a95ae5f 100644
|
||||
index 978fb855..a95ae5f7 100644
|
||||
--- a/src/common/language.cc
|
||||
+++ b/src/common/language.cc
|
||||
@@ -46,8 +46,27 @@
|
||||
@@ -552,7 +561,7 @@ index 978fb85..a95ae5f 100644
|
||||
#endif
|
||||
}
|
||||
diff --git a/src/common/linux/elf_symbols_to_module.cc b/src/common/linux/elf_symbols_to_module.cc
|
||||
index 562875e..4367851 100644
|
||||
index 562875e1..43678510 100644
|
||||
--- a/src/common/linux/elf_symbols_to_module.cc
|
||||
+++ b/src/common/linux/elf_symbols_to_module.cc
|
||||
@@ -39,6 +39,29 @@
|
||||
@@ -615,7 +624,7 @@ index 562875e..4367851 100644
|
||||
module->AddExtern(ext);
|
||||
}
|
||||
diff --git a/src/tools/linux/tools_linux.gypi b/src/tools/linux/tools_linux.gypi
|
||||
index 1c15992..020e4c1 100644
|
||||
index 1c15992e..020e4c1c 100644
|
||||
--- a/src/tools/linux/tools_linux.gypi
|
||||
+++ b/src/tools/linux/tools_linux.gypi
|
||||
@@ -58,7 +58,7 @@
|
||||
@@ -627,3 +636,16 @@ index 1c15992..020e4c1 100644
|
||||
],
|
||||
'dependencies': [
|
||||
'../common/common.gyp:common',
|
||||
diff --git a/src/tools/mac/dump_syms/macho_dump.cc b/src/tools/mac/dump_syms/macho_dump.cc
|
||||
index d882bbe8..3432bb45 100644
|
||||
--- a/src/tools/mac/dump_syms/macho_dump.cc
|
||||
+++ b/src/tools/mac/dump_syms/macho_dump.cc
|
||||
@@ -140,7 +140,7 @@ void DumpFile(const char *filename) {
|
||||
size_t object_files_size;
|
||||
const SuperFatArch* super_fat_object_files =
|
||||
fat_reader.object_files(&object_files_size);
|
||||
- struct fat_arch *object_files;
|
||||
+ struct fat_arch *object_files = 0;
|
||||
if (!super_fat_object_files->ConvertToFatArch(object_files)) {
|
||||
exit(1);
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/pylib/gyp/generator/cmake.py b/pylib/gyp/generator/cmake.py
|
||||
index a2b9629..68d7020 100644
|
||||
index a2b9629..ac59461 100644
|
||||
--- a/pylib/gyp/generator/cmake.py
|
||||
+++ b/pylib/gyp/generator/cmake.py
|
||||
@@ -1070,6 +1070,23 @@ def WriteTarget(namer, qualified_target, target_dicts, build_dir, config_to_use,
|
||||
@@ -26,6 +26,43 @@ index a2b9629..68d7020 100644
|
||||
UnsetVariable(output, 'TOOLSET')
|
||||
UnsetVariable(output, 'TARGET')
|
||||
|
||||
@@ -1112,6 +1129,8 @@ def GenerateOutputForConfig(target_list, target_dicts, data,
|
||||
SetVariable(output, 'configuration', config_to_use)
|
||||
|
||||
ar = None
|
||||
+ ranlib = None
|
||||
+ nm = None
|
||||
cc = None
|
||||
cxx = None
|
||||
|
||||
@@ -1121,17 +1140,27 @@ def GenerateOutputForConfig(target_list, target_dicts, data,
|
||||
for key, value in make_global_settings:
|
||||
if key == 'AR':
|
||||
ar = os.path.join(build_to_top, value)
|
||||
+ if key == 'RANLIB':
|
||||
+ ranlib = os.path.join(build_to_top, value)
|
||||
+ if key == 'NM':
|
||||
+ nm = os.path.join(build_to_top, value)
|
||||
if key == 'CC':
|
||||
cc = os.path.join(build_to_top, value)
|
||||
if key == 'CXX':
|
||||
cxx = os.path.join(build_to_top, value)
|
||||
|
||||
ar = gyp.common.GetEnvironFallback(['AR_target', 'AR'], ar)
|
||||
+ ranlib = gyp.common.GetEnvironFallback(['RANLIB_target', 'RANLIB'], ranlib)
|
||||
+ nm = gyp.common.GetEnvironFallback(['NM_target', 'NM'], nm)
|
||||
cc = gyp.common.GetEnvironFallback(['CC_target', 'CC'], cc)
|
||||
cxx = gyp.common.GetEnvironFallback(['CXX_target', 'CXX'], cxx)
|
||||
|
||||
if ar:
|
||||
SetVariable(output, 'CMAKE_AR', ar)
|
||||
+ if ranlib:
|
||||
+ SetVariable(output, 'CMAKE_RANLIB', ranlib)
|
||||
+ if nm:
|
||||
+ SetVariable(output, 'CMAKE_NM', nm)
|
||||
if cc:
|
||||
SetVariable(output, 'CMAKE_C_COMPILER', cc)
|
||||
if cxx:
|
||||
diff --git a/pylib/gyp/generator/xcode.py b/pylib/gyp/generator/xcode.py
|
||||
index db99d6a..8d56baf 100644
|
||||
--- a/pylib/gyp/generator/xcode.py
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/build/common.gypi b/build/common.gypi
|
||||
index 1affc70..c0d2f6a 100644
|
||||
index 1affc70..0677e4b 100644
|
||||
--- a/build/common.gypi
|
||||
+++ b/build/common.gypi
|
||||
@@ -66,6 +66,11 @@
|
||||
@@ -66,6 +66,13 @@
|
||||
'conditions': [
|
||||
['clang!=0', {
|
||||
'CLANG_CXX_LANGUAGE_STANDARD': 'c++11', # -std=c++11
|
||||
@@ -10,11 +10,13 @@ index 1affc70..c0d2f6a 100644
|
||||
+ 'OTHER_LDFLAGS': [
|
||||
+ '/usr/local/macold/lib/libc++.a',
|
||||
+ '/usr/local/macold/lib/libc++abi.a',
|
||||
+ '-isysroot/',
|
||||
+ '-L/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib/',
|
||||
+ ],
|
||||
|
||||
# Don't link in libarclite_macosx.a, see http://crbug.com/156530.
|
||||
'CLANG_LINK_OBJC_RUNTIME': 'NO', # -fno-objc-link-runtime
|
||||
@@ -116,6 +121,9 @@
|
||||
@@ -116,6 +123,9 @@
|
||||
],
|
||||
|
||||
},
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/configure b/configure
|
||||
index cb8d78fd3cb..cadb3f0a880 100755
|
||||
index cb8d78fd3c..cadb3f0a88 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -511,7 +511,8 @@ if [ "$BUILD_ON_MAC" = "yes" ]; then
|
||||
@@ -13,7 +13,7 @@ index cb8d78fd3cb..cadb3f0a880 100755
|
||||
echo " Xcode not set up properly. You may need to confirm the license" >&2
|
||||
echo " agreement by running /usr/bin/xcodebuild without arguments." >&2
|
||||
diff --git a/mkspecs/common/g++-macx.conf b/mkspecs/common/g++-macx.conf
|
||||
index 086510dd963..c485967863d 100644
|
||||
index 086510dd96..078a5ed1dd 100644
|
||||
--- a/mkspecs/common/g++-macx.conf
|
||||
+++ b/mkspecs/common/g++-macx.conf
|
||||
@@ -14,7 +14,13 @@ QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -gdwarf-2
|
||||
@@ -27,12 +27,12 @@ index 086510dd963..c485967863d 100644
|
||||
+# Patch: Use C++14 with custom libc++ build.
|
||||
+QMAKE_CXXFLAGS_CXX11 = -std=c++1y
|
||||
+QMAKE_CXXFLAGS += -nostdinc++ -I/usr/local/macold/include/c++/v1
|
||||
+QMAKE_LFLAGS += /usr/local/macold/lib/libc++.a /usr/local/macold/lib/libc++abi.a
|
||||
+QMAKE_LFLAGS += /usr/local/macold/lib/libc++.a /usr/local/macold/lib/libc++abi.a -isysroot /
|
||||
|
||||
QMAKE_XCODE_GCC_VERSION = com.apple.compilers.llvmgcc42
|
||||
|
||||
diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf
|
||||
index 0cc8cd6dfdd..ca9725b7791 100644
|
||||
index 0cc8cd6dfd..ca9725b779 100644
|
||||
--- a/mkspecs/features/mac/default_pre.prf
|
||||
+++ b/mkspecs/features/mac/default_pre.prf
|
||||
@@ -12,7 +12,9 @@ isEmpty(QMAKE_XCODE_DEVELOPER_PATH) {
|
||||
@@ -47,7 +47,7 @@ index 0cc8cd6dfdd..ca9725b7791 100644
|
||||
}
|
||||
|
||||
diff --git a/src/gui/image/qbmphandler.cpp b/src/gui/image/qbmphandler.cpp
|
||||
index bb79a139b3c..5d595bc3b34 100644
|
||||
index bb79a139b3..5d595bc3b3 100644
|
||||
--- a/src/gui/image/qbmphandler.cpp
|
||||
+++ b/src/gui/image/qbmphandler.cpp
|
||||
@@ -220,6 +220,10 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int
|
||||
@@ -74,7 +74,7 @@ index bb79a139b3c..5d595bc3b34 100644
|
||||
if (ncols > 0) { // read color table
|
||||
uchar rgb[4];
|
||||
diff --git a/src/gui/painting/qpaintengine_p.h b/src/gui/painting/qpaintengine_p.h
|
||||
index ebff9509ab2..4300ca4c0f0 100644
|
||||
index ebff9509ab..4300ca4c0f 100644
|
||||
--- a/src/gui/painting/qpaintengine_p.h
|
||||
+++ b/src/gui/painting/qpaintengine_p.h
|
||||
@@ -87,8 +87,18 @@ public:
|
||||
@@ -98,7 +98,7 @@ index ebff9509ab2..4300ca4c0f0 100644
|
||||
|
||||
// Make sure we're inside the viewport.
|
||||
diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp
|
||||
index 4879ae51d7d..56cdcbaf01c 100644
|
||||
index 4879ae51d7..56cdcbaf01 100644
|
||||
--- a/src/gui/text/qtextlayout.cpp
|
||||
+++ b/src/gui/text/qtextlayout.cpp
|
||||
@@ -654,6 +654,9 @@ int QTextLayout::nextCursorPosition(int oldPos, CursorMode mode) const
|
||||
@@ -175,7 +175,7 @@ index 4879ae51d7d..56cdcbaf01c 100644
|
||||
|
||||
inline void resetRightBearing()
|
||||
diff --git a/src/gui/text/qtextlayout.h b/src/gui/text/qtextlayout.h
|
||||
index cbe42c38444..b273db7e78c 100644
|
||||
index cbe42c3844..b273db7e78 100644
|
||||
--- a/src/gui/text/qtextlayout.h
|
||||
+++ b/src/gui/text/qtextlayout.h
|
||||
@@ -194,6 +194,9 @@ private:
|
||||
@@ -189,7 +189,7 @@ index cbe42c38444..b273db7e78c 100644
|
||||
|
||||
|
||||
diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp
|
||||
index 360f9722c70..f28f289ef6a 100644
|
||||
index 360f9722c7..f28f289ef6 100644
|
||||
--- a/src/network/access/qhttpnetworkconnection.cpp
|
||||
+++ b/src/network/access/qhttpnetworkconnection.cpp
|
||||
@@ -118,6 +118,8 @@ QHttpNetworkConnectionPrivate::~QHttpNetworkConnectionPrivate()
|
||||
@@ -202,7 +202,7 @@ index 360f9722c70..f28f289ef6a 100644
|
||||
delete channels[i].socket;
|
||||
}
|
||||
diff --git a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
|
||||
index ca7afb7d1b9..25ae50008db 100644
|
||||
index ca7afb7d1b..25ae50008d 100644
|
||||
--- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
|
||||
+++ b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
|
||||
@@ -256,6 +256,13 @@ static void getFontDescription(CTFontDescriptorRef font, FontDescription *fd)
|
||||
@@ -220,7 +220,7 @@ index ca7afb7d1b9..25ae50008db 100644
|
||||
fd->weight = QFont::Normal;
|
||||
fd->style = QFont::StyleNormal;
|
||||
diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
|
||||
index 6e2c8a2a9af..3cace8abcbc 100644
|
||||
index 6e2c8a2a9a..3cace8abcb 100644
|
||||
--- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
|
||||
+++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
|
||||
@@ -717,7 +717,8 @@ void QCoreTextFontEngine::getUnscaledGlyph(glyph_t, QPainterPath *, glyph_metric
|
||||
@@ -234,7 +234,7 @@ index 6e2c8a2a9af..3cace8abcbc 100644
|
||||
|
||||
QFontEngine *QCoreTextFontEngine::cloneWithSize(qreal pixelSize) const
|
||||
diff --git a/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm b/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm
|
||||
index 92358ecc745..694fee73507 100644
|
||||
index 92358ecc74..694fee7350 100644
|
||||
--- a/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm
|
||||
+++ b/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm
|
||||
@@ -213,7 +213,8 @@ static void cleanupCocoaApplicationDelegate()
|
||||
@@ -271,7 +271,7 @@ index 92358ecc745..694fee73507 100644
|
||||
|
||||
- (void)appleEventQuit:(NSAppleEventDescriptor *)event withReplyEvent:(NSAppleEventDescriptor *)replyEvent
|
||||
diff --git a/src/plugins/platforms/cocoa/qcocoacursor.mm b/src/plugins/platforms/cocoa/qcocoacursor.mm
|
||||
index b81b9a0b1c2..4e59e833b1d 100644
|
||||
index b81b9a0b1c..4e59e833b1 100644
|
||||
--- a/src/plugins/platforms/cocoa/qcocoacursor.mm
|
||||
+++ b/src/plugins/platforms/cocoa/qcocoacursor.mm
|
||||
@@ -81,7 +81,7 @@ void QCocoaCursor::setPos(const QPoint &position)
|
||||
@@ -284,7 +284,7 @@ index b81b9a0b1c2..4e59e833b1d 100644
|
||||
CFRelease(e);
|
||||
}
|
||||
diff --git a/src/plugins/platforms/cocoa/qcocoahelpers.mm b/src/plugins/platforms/cocoa/qcocoahelpers.mm
|
||||
index 9850f83dea8..b2e1d3dfda7 100644
|
||||
index 9850f83dea..b2e1d3dfda 100644
|
||||
--- a/src/plugins/platforms/cocoa/qcocoahelpers.mm
|
||||
+++ b/src/plugins/platforms/cocoa/qcocoahelpers.mm
|
||||
@@ -649,9 +649,10 @@ OSStatus qt_mac_drawCGImage(CGContextRef inContext, const CGRect *inBounds, CGIm
|
||||
@@ -317,7 +317,7 @@ index 9850f83dea8..b2e1d3dfda7 100644
|
||||
}
|
||||
|
||||
diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm
|
||||
index 9fd05a65ee9..dea60720e78 100644
|
||||
index 9fd05a65ee..dea60720e7 100644
|
||||
--- a/src/plugins/platforms/cocoa/qcocoaintegration.mm
|
||||
+++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm
|
||||
@@ -402,14 +402,24 @@ void QCocoaIntegration::updateScreens()
|
||||
@@ -348,7 +348,7 @@ index 9fd05a65ee9..dea60720e78 100644
|
||||
|
||||
QCocoaScreen *QCocoaIntegration::screenAtIndex(int index)
|
||||
diff --git a/src/plugins/platforms/cocoa/qcocoakeymapper.mm b/src/plugins/platforms/cocoa/qcocoakeymapper.mm
|
||||
index e46eaff6be3..c62db534a2d 100644
|
||||
index e46eaff6be..c62db534a2 100644
|
||||
--- a/src/plugins/platforms/cocoa/qcocoakeymapper.mm
|
||||
+++ b/src/plugins/platforms/cocoa/qcocoakeymapper.mm
|
||||
@@ -382,6 +382,12 @@ bool QCocoaKeyMapper::updateKeyboard()
|
||||
@@ -375,7 +375,7 @@ index e46eaff6be3..c62db534a2d 100644
|
||||
}
|
||||
return ret;
|
||||
diff --git a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm b/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
|
||||
index 83c960d9317..03ae9696afe 100755
|
||||
index 83c960d931..03ae9696af 100755
|
||||
--- a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
|
||||
+++ b/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
|
||||
@@ -102,7 +102,10 @@ QT_USE_NAMESPACE
|
||||
@@ -543,7 +543,7 @@ index 83c960d9317..03ae9696afe 100755
|
||||
}
|
||||
@end
|
||||
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm
|
||||
index 4d0458a4aa2..3357a5ef817 100644
|
||||
index 4d0458a4aa..3357a5ef81 100644
|
||||
--- a/src/plugins/platforms/cocoa/qcocoawindow.mm
|
||||
+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
|
||||
@@ -167,7 +167,8 @@ static bool isMouseEvent(NSEvent *ev)
|
||||
@@ -606,7 +606,7 @@ index 4d0458a4aa2..3357a5ef817 100644
|
||||
[iconButton setImage:image];
|
||||
[image release];
|
||||
diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm
|
||||
index a18ee7ff71d..1f91feb0ae8 100644
|
||||
index a18ee7ff71..1f91feb0ae 100644
|
||||
--- a/src/plugins/platforms/cocoa/qnsview.mm
|
||||
+++ b/src/plugins/platforms/cocoa/qnsview.mm
|
||||
@@ -393,7 +393,9 @@ static NSString *_q_NSWindowDidChangeOcclusionStateNotification = nil;
|
||||
@@ -675,7 +675,7 @@ index a18ee7ff71d..1f91feb0ae8 100644
|
||||
}
|
||||
return [super performKeyEquivalent:nsevent];
|
||||
diff --git a/src/tools/qlalr/lalr.cpp b/src/tools/qlalr/lalr.cpp
|
||||
index c68076477f3..e2a7aafa586 100644
|
||||
index c68076477f..e2a7aafa58 100644
|
||||
--- a/src/tools/qlalr/lalr.cpp
|
||||
+++ b/src/tools/qlalr/lalr.cpp
|
||||
@@ -246,11 +246,13 @@ void Grammar::buildExtendedGrammar ()
|
||||
@@ -715,7 +715,7 @@ index c68076477f3..e2a7aafa586 100644
|
||||
continue;
|
||||
|
||||
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
|
||||
index 7396808442e..7178aecf800 100644
|
||||
index 7396808442..7178aecf80 100644
|
||||
--- a/src/widgets/kernel/qwidget.cpp
|
||||
+++ b/src/widgets/kernel/qwidget.cpp
|
||||
@@ -4722,6 +4722,17 @@ void QWidget::render(QPainter *painter, const QPoint &targetOffset,
|
||||
@@ -768,7 +768,7 @@ index 7396808442e..7178aecf800 100644
|
||||
|| (k->key() == Qt::Key_Tab && (k->modifiers() & Qt::ShiftModifier)))
|
||||
res = focusNextPrevChild(false);
|
||||
diff --git a/src/widgets/styles/qmacstyle_mac.mm b/src/widgets/styles/qmacstyle_mac.mm
|
||||
index 0845a5eb02f..5735cb6b396 100644
|
||||
index 0845a5eb02..5735cb6b39 100644
|
||||
--- a/src/widgets/styles/qmacstyle_mac.mm
|
||||
+++ b/src/widgets/styles/qmacstyle_mac.mm
|
||||
@@ -3667,9 +3667,11 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter
|
||||
@@ -786,7 +786,7 @@ index 0845a5eb02f..5735cb6b396 100644
|
||||
}
|
||||
|
||||
diff --git a/src/widgets/util/qsystemtrayicon_qpa.cpp b/src/widgets/util/qsystemtrayicon_qpa.cpp
|
||||
index f98aeaf6782..00c0734129e 100644
|
||||
index f98aeaf678..00c0734129 100644
|
||||
--- a/src/widgets/util/qsystemtrayicon_qpa.cpp
|
||||
+++ b/src/widgets/util/qsystemtrayicon_qpa.cpp
|
||||
@@ -99,13 +99,18 @@ void QSystemTrayIconPrivate::updateIcon_sys()
|
||||
@@ -815,7 +815,7 @@ index f98aeaf6782..00c0734129e 100644
|
||||
}
|
||||
|
||||
diff --git a/src/widgets/widgets/qwidgetlinecontrol.cpp b/src/widgets/widgets/qwidgetlinecontrol.cpp
|
||||
index 75f30599be4..980f2be1e93 100644
|
||||
index 75f30599be..980f2be1e9 100644
|
||||
--- a/src/widgets/widgets/qwidgetlinecontrol.cpp
|
||||
+++ b/src/widgets/widgets/qwidgetlinecontrol.cpp
|
||||
@@ -1867,7 +1867,8 @@ void QWidgetLineControl::processKeyEvent(QKeyEvent* event)
|
||||
@@ -829,7 +829,7 @@ index 75f30599be4..980f2be1e93 100644
|
||||
#ifndef QT_NO_COMPLETER
|
||||
complete(event->key());
|
||||
diff --git a/src/widgets/widgets/qwidgettextcontrol.cpp b/src/widgets/widgets/qwidgettextcontrol.cpp
|
||||
index 96438a0bdf7..b0b72064056 100644
|
||||
index 96438a0bdf..b0b7206405 100644
|
||||
--- a/src/widgets/widgets/qwidgettextcontrol.cpp
|
||||
+++ b/src/widgets/widgets/qwidgettextcontrol.cpp
|
||||
@@ -1342,7 +1342,8 @@ void QWidgetTextControlPrivate::keyPressEvent(QKeyEvent *e)
|
||||
|
||||
@@ -252,6 +252,43 @@ index 41834b21ae..8cdf4ab145 100644
|
||||
if (value == WSAEADDRNOTAVAIL) {
|
||||
setError(QAbstractSocket::NetworkError, AddressNotAvailableErrorString);
|
||||
socketState = QAbstractSocket::UnconnectedState;
|
||||
diff --git a/src/platformsupport/dbustray/qdbustrayicon.cpp b/src/platformsupport/dbustray/qdbustrayicon.cpp
|
||||
index 4d6e70720d..9bdb0beb67 100644
|
||||
--- a/src/platformsupport/dbustray/qdbustrayicon.cpp
|
||||
+++ b/src/platformsupport/dbustray/qdbustrayicon.cpp
|
||||
@@ -58,9 +58,18 @@ QT_BEGIN_NAMESPACE
|
||||
|
||||
Q_LOGGING_CATEGORY(qLcTray, "qt.qpa.tray")
|
||||
|
||||
+static QString cachePath()
|
||||
+{
|
||||
+ QString xdgCache = QString::fromUtf8(getenv("XDG_CACHE_HOME"));
|
||||
+ if (xdgCache.isEmpty()) {
|
||||
+ xdgCache = QDir::cleanPath(QDir::homePath() + QStringLiteral("/.cache"));
|
||||
+ }
|
||||
+ return xdgCache;
|
||||
+}
|
||||
+
|
||||
static const QString KDEItemFormat = QStringLiteral("org.kde.StatusNotifierItem-%1-%2");
|
||||
static const QString KDEWatcherService = QStringLiteral("org.kde.StatusNotifierWatcher");
|
||||
-static const QString TempFileTemplate = QDir::tempPath() + QStringLiteral("/qt-trayicon-XXXXXX.png");
|
||||
+static const QString TempFileTemplate = cachePath() + QStringLiteral("/qt-trayicon-XXXXXX.png");
|
||||
static const QString XdgNotificationService = QStringLiteral("org.freedesktop.Notifications");
|
||||
static const QString XdgNotificationPath = QStringLiteral("/org/freedesktop/Notifications");
|
||||
static const QString DefaultAction = QStringLiteral("default");
|
||||
@@ -151,6 +160,12 @@ QTemporaryFile *QDBusTrayIcon::tempIcon(const QIcon &icon)
|
||||
uint pid = session.interface()->servicePid(KDEWatcherService).value();
|
||||
QString processName = QLockFilePrivate::processNameByPid(pid);
|
||||
necessary = processName.endsWith(QStringLiteral("indicator-application-service"));
|
||||
+ if (!necessary) {
|
||||
+ QString xdgDesktop = QString::fromUtf8(getenv("XDG_CURRENT_DESKTOP"));
|
||||
+ QStringList desktops = xdgDesktop.toLower().split(QLatin1Char(':'));
|
||||
+ necessary = desktops.contains(QStringLiteral("unity")) ||
|
||||
+ desktops.contains(QStringLiteral("ubuntu"));
|
||||
+ }
|
||||
necessity_checked = true;
|
||||
}
|
||||
if (!necessary)
|
||||
diff --git a/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp b/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp
|
||||
index 728b166b71..1dc64593e1 100644
|
||||
--- a/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp
|
||||
@@ -413,7 +450,7 @@ index 8ebabf3419..7bb8abd0d0 100644
|
||||
}
|
||||
populateFromPattern(pattern);
|
||||
diff --git a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
|
||||
index 566abf2126..5b9c714ffa 100644
|
||||
index 566abf2126..5c5fde9813 100644
|
||||
--- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
|
||||
+++ b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
|
||||
@@ -265,6 +265,13 @@ static void getFontDescription(CTFontDescriptorRef font, FontDescription *fd)
|
||||
@@ -430,6 +467,20 @@ index 566abf2126..5b9c714ffa 100644
|
||||
fd->styleName = (CFStringRef)CTFontDescriptorCopyAttribute(font, kCTFontStyleNameAttribute);
|
||||
fd->weight = QFont::Normal;
|
||||
fd->style = QFont::StyleNormal;
|
||||
@@ -300,9 +307,10 @@ static void getFontDescription(CTFontDescriptorRef font, FontDescription *fd)
|
||||
|
||||
if (styles) {
|
||||
if (CFNumberRef weightValue = (CFNumberRef) CFDictionaryGetValue(styles, kCTFontWeightTrait)) {
|
||||
- float normalizedWeight;
|
||||
- if (CFNumberGetValue(weightValue, kCFNumberFloatType, &normalizedWeight))
|
||||
- fd->weight = QCoreTextFontEngine::qtWeightFromCFWeight(normalizedWeight);
|
||||
+ // Patch: backport bugfix from 'b64ea4a3ab' commit.
|
||||
+ double normalizedWeight;
|
||||
+ if (CFNumberGetValue(weightValue, kCFNumberFloat64Type, &normalizedWeight))
|
||||
+ fd->weight = QCoreTextFontEngine::qtWeightFromCFWeight(float(normalizedWeight));
|
||||
}
|
||||
if (CFNumberRef italic = (CFNumberRef) CFDictionaryGetValue(styles, kCTFontSlantTrait)) {
|
||||
double d;
|
||||
diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
|
||||
index 7b459584ea..2ed2fd9b3b 100644
|
||||
--- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
|
||||
@@ -476,7 +527,7 @@ index d1bea9af23..36a15a6473 100644
|
||||
event.setCommitString(QChar(character));
|
||||
QCoreApplication::sendEvent(m_focusObject, &event);
|
||||
diff --git a/src/plugins/platforminputcontexts/platforminputcontexts.pro b/src/plugins/platforminputcontexts/platforminputcontexts.pro
|
||||
index faea54b874..0f9650996e 100644
|
||||
index faea54b874..fe4a837511 100644
|
||||
--- a/src/plugins/platforminputcontexts/platforminputcontexts.pro
|
||||
+++ b/src/plugins/platforminputcontexts/platforminputcontexts.pro
|
||||
@@ -1,7 +1,8 @@
|
||||
@@ -484,8 +535,8 @@ index faea54b874..0f9650996e 100644
|
||||
|
||||
qtHaveModule(dbus) {
|
||||
-!mac:!win32:SUBDIRS += ibus
|
||||
+# Patch: Adding fcitx/hime input context plugin to our static build.
|
||||
+!mac:!win32:SUBDIRS += ibus fcitx hime
|
||||
+# Patch: Adding fcitx/hime/nimf input context plugin to our static build.
|
||||
+!mac:!win32:SUBDIRS += ibus fcitx hime nimf
|
||||
}
|
||||
|
||||
contains(QT_CONFIG, xcb-plugin): SUBDIRS += compose
|
||||
@@ -630,7 +681,7 @@ index c2d206fb45..9b9739862d 100644
|
||||
}
|
||||
return ret;
|
||||
diff --git a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm b/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
|
||||
index 8152c57ffd..5ddd7b353d 100644
|
||||
index 8152c57ffd..87ba2f3f72 100644
|
||||
--- a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
|
||||
+++ b/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
|
||||
@@ -94,6 +94,8 @@ QT_USE_NAMESPACE
|
||||
@@ -746,7 +797,19 @@ index 8152c57ffd..5ddd7b353d 100644
|
||||
systray = sys;
|
||||
imageCell = [[QNSImageView alloc] initWithParent:self];
|
||||
[item setView: imageCell];
|
||||
@@ -482,6 +513,10 @@ QT_END_NAMESPACE
|
||||
@@ -448,6 +479,11 @@ QT_END_NAMESPACE
|
||||
-(void)dealloc {
|
||||
[[NSStatusBar systemStatusBar] removeStatusItem:item];
|
||||
[[NSNotificationCenter defaultCenter] removeObserver:imageCell];
|
||||
+
|
||||
+ // Patch: Fix crash in macOS 10.14.
|
||||
+ // Somehow item and imageCell are retained and attempt to be drawn if left in view.
|
||||
+ [item setView: nil];
|
||||
+
|
||||
[imageCell release];
|
||||
[item release];
|
||||
[super dealloc];
|
||||
@@ -482,6 +518,10 @@ QT_END_NAMESPACE
|
||||
selector:@selector(menuTrackingDone:)
|
||||
name:NSMenuDidEndTrackingNotification
|
||||
object:m];
|
||||
@@ -820,7 +883,7 @@ index c0d5904367..f3c2047196 100644
|
||||
[iconButton setImage:image];
|
||||
[image release];
|
||||
diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm
|
||||
index c67bcfd23b..2616f420cb 100644
|
||||
index c67bcfd23b..6a60670aee 100644
|
||||
--- a/src/plugins/platforms/cocoa/qnsview.mm
|
||||
+++ b/src/plugins/platforms/cocoa/qnsview.mm
|
||||
@@ -647,6 +647,12 @@ QT_WARNING_POP
|
||||
@@ -894,6 +957,17 @@ index c67bcfd23b..2616f420cb 100644
|
||||
- (void)cancelOperation:(id)sender
|
||||
{
|
||||
Q_UNUSED(sender);
|
||||
@@ -1981,6 +2006,10 @@ static QPoint mapWindowCoordinates(QWindow *source, QWindow *target, QPoint poin
|
||||
// change the cursor
|
||||
[nativeCursor set];
|
||||
|
||||
+ // Patch: Backport a fix from cd08753d3e. Starting with macOS Mojave this requires accessibility access.
|
||||
+ if (QSysInfo::macVersion() >= Q_MV_OSX(10, 14))
|
||||
+ return;
|
||||
+
|
||||
// Make sure the cursor is updated correctly if the mouse does not move and window is under cursor
|
||||
// by creating a fake move event
|
||||
if (m_updatingDrag)
|
||||
diff --git a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
|
||||
index 94bb71e429..16ab51e166 100644
|
||||
--- a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
|
||||
|
||||
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.5 MiB |
|
Before Width: | Height: | Size: 2.3 MiB |
|
Before Width: | Height: | Size: 2.2 MiB |
|
Before Width: | Height: | Size: 3.2 MiB |
@@ -92,7 +92,7 @@ msgServiceFont: semiboldFont;
|
||||
msgServiceNameFont: semiboldFont;
|
||||
msgServicePhotoWidth: 100px;
|
||||
msgDateFont: font(13px);
|
||||
msgMinWidth: 190px;
|
||||
msgMinWidth: 160px;
|
||||
msgPhotoSize: 33px;
|
||||
msgPhotoSkip: 40px;
|
||||
msgPadding: margins(13px, 7px, 13px, 8px);
|
||||
@@ -243,12 +243,6 @@ dragPadding: margins(20px, 10px, 20px, 10px);
|
||||
|
||||
dragHeight: 72px;
|
||||
|
||||
minPhotoSize: 100px;
|
||||
maxMediaSize: 430px;
|
||||
maxStickerSize: 256px;
|
||||
maxGifSize: 320px;
|
||||
maxSignatureSize: 144px;
|
||||
|
||||
radialSize: size(50px, 50px);
|
||||
radialLine: 3px;
|
||||
radialDuration: 350;
|
||||
@@ -264,19 +258,6 @@ videoIcon: icon {
|
||||
};
|
||||
locationSize: size(320px, 240px);
|
||||
|
||||
webPageLeft: 10px;
|
||||
webPageBar: 2px;
|
||||
webPageTitleFont: semiboldFont;
|
||||
webPageTitleStyle: semiboldTextStyle;
|
||||
webPageTitleOutFg: historyTextOutFg;
|
||||
webPageTitleInFg: historyTextInFg;
|
||||
webPageDescriptionOutFg: historyTextOutFg;
|
||||
webPageDescriptionInFg: historyTextInFg;
|
||||
webPageDescriptionFont: normalFont;
|
||||
webPageDescriptionStyle: defaultTextStyle;
|
||||
webPagePhotoSize: 100px;
|
||||
webPagePhotoDelta: 8px;
|
||||
|
||||
mediaPlayerSuppressDuration: 150;
|
||||
|
||||
botDescSkip: 8px;
|
||||
|
||||
@@ -444,6 +444,9 @@ historyComposeButtonBg: historyComposeAreaBg; // unblock / join channel / mute c
|
||||
historyComposeButtonBgOver: windowBgOver; // unblock / join channel / mute channel button background with mouse over
|
||||
historyComposeButtonBgRipple: windowBgRipple; // unblock / join channel / mute channel button ripple effect
|
||||
|
||||
mapPointDrop: #fd4444; // geo location marker background
|
||||
mapPointDot: #ffffff; // geo location marker point
|
||||
|
||||
// overview
|
||||
overviewCheckBg: #00000040; // shared media / files / links checkbox background for not selected rows when some rows are selected
|
||||
overviewCheckBgActive: windowBgActive; // shared media / files / links checkbox background for selected rows
|
||||
|
||||
BIN
Telegram/Resources/day-blue.tdesktop-theme
Normal file
14
Telegram/Resources/default_shortcuts-custom.json
Normal file
@@ -0,0 +1,14 @@
|
||||
// This is a list of your own shortcuts for Telegram Desktop
|
||||
// You can see full list of commands in the 'shortcuts-default.json' file
|
||||
// Place a null value instead of a command string to switch the shortcut off
|
||||
|
||||
[
|
||||
// {
|
||||
// "command": "close_telegram",
|
||||
// "keys": "ctrl+f4"
|
||||
// },
|
||||
// {
|
||||
// "command": "quit_telegram",
|
||||
// "keys": "ctrl+q"
|
||||
// }
|
||||
]
|
||||
BIN
Telegram/Resources/emoji/emoji_1.webp
Normal file
|
After Width: | Height: | Size: 1.3 MiB |
BIN
Telegram/Resources/emoji/emoji_2.webp
Normal file
|
After Width: | Height: | Size: 1.5 MiB |
BIN
Telegram/Resources/emoji/emoji_3.webp
Normal file
|
After Width: | Height: | Size: 1.6 MiB |
BIN
Telegram/Resources/emoji/emoji_4.webp
Normal file
|
After Width: | Height: | Size: 1.6 MiB |
BIN
Telegram/Resources/emoji/emoji_5.webp
Normal file
|
After Width: | Height: | Size: 894 KiB |
BIN
Telegram/Resources/emoji/set0_preview.webp
Normal file
|
After Width: | Height: | Size: 13 KiB |
BIN
Telegram/Resources/emoji/set1_preview.webp
Normal file
|
After Width: | Height: | Size: 14 KiB |
BIN
Telegram/Resources/emoji/set2_preview.webp
Normal file
|
After Width: | Height: | Size: 10 KiB |
BIN
Telegram/Resources/emoji/set3_preview.webp
Normal file
|
After Width: | Height: | Size: 13 KiB |
531
Telegram/Resources/export_html/css/style.css
Normal file
@@ -0,0 +1,531 @@
|
||||
body {
|
||||
margin: 0;
|
||||
font: 12px/18px 'Open Sans',"Lucida Grande","Lucida Sans Unicode",Arial,Helvetica,Verdana,sans-serif;
|
||||
}
|
||||
strong {
|
||||
font-weight: 700;
|
||||
}
|
||||
code, kbd, pre, samp {
|
||||
font-family: Menlo,Monaco,Consolas,"Courier New",monospace;
|
||||
}
|
||||
code {
|
||||
padding: 2px 4px;
|
||||
font-size: 90%;
|
||||
color: #c7254e;
|
||||
background-color: #f9f2f4;
|
||||
border-radius: 4px;
|
||||
}
|
||||
pre {
|
||||
display: block;
|
||||
margin: 0;
|
||||
line-height: 1.42857143;
|
||||
word-break: break-all;
|
||||
word-wrap: break-word;
|
||||
color: #333;
|
||||
background-color: #f5f5f5;
|
||||
border-radius: 4px;
|
||||
overflow: auto;
|
||||
padding: 3px;
|
||||
border: 1px solid #eee;
|
||||
max-height: none;
|
||||
font-size: inherit;
|
||||
}
|
||||
.clearfix:after {
|
||||
content: " ";
|
||||
visibility: hidden;
|
||||
display: block;
|
||||
height: 0;
|
||||
clear: both;
|
||||
}
|
||||
.pull_left {
|
||||
float: left;
|
||||
}
|
||||
.pull_right {
|
||||
float: right;
|
||||
}
|
||||
.page_wrap {
|
||||
background-color: #ffffff;
|
||||
color: #000000;
|
||||
}
|
||||
.page_wrap a {
|
||||
color: #168acd;
|
||||
text-decoration: none;
|
||||
}
|
||||
.page_wrap a:hover {
|
||||
text-decoration: underline;
|
||||
}
|
||||
.page_header {
|
||||
position: fixed;
|
||||
z-index: 10;
|
||||
background-color: #ffffff;
|
||||
width: 100%;
|
||||
border-bottom: 1px solid #e3e6e8;
|
||||
}
|
||||
.page_header .content {
|
||||
width: 480px;
|
||||
margin: 0 auto;
|
||||
border-radius: 0 !important;
|
||||
}
|
||||
.page_header a.content {
|
||||
background-repeat: no-repeat;
|
||||
background-position: 24px 21px;
|
||||
background-size: 24px 24px;
|
||||
}
|
||||
.bold {
|
||||
color: #212121;
|
||||
font-weight: 700;
|
||||
}
|
||||
.details {
|
||||
color: #70777b;
|
||||
}
|
||||
.page_header .content .text {
|
||||
padding: 24px 24px 22px 24px;
|
||||
font-size: 22px;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.page_header a.content .text {
|
||||
padding: 24px 24px 22px 82px;
|
||||
}
|
||||
.page_body {
|
||||
padding-top: 64px;
|
||||
width: 480px;
|
||||
margin: 0 auto;
|
||||
}
|
||||
.page_about {
|
||||
padding: 24px 24px;
|
||||
}
|
||||
.with_divider {
|
||||
border-top: 1px solid #e3e6e8;
|
||||
}
|
||||
.userpic_link {
|
||||
display: block;
|
||||
text-decoration: none;
|
||||
}
|
||||
.userpic_link:hover {
|
||||
text-decoration: none;
|
||||
}
|
||||
.userpic {
|
||||
display: block;
|
||||
border-radius: 50%;
|
||||
overflow: hidden;
|
||||
}
|
||||
.userpic .initials {
|
||||
display: block;
|
||||
color: #fff;
|
||||
text-align: center;
|
||||
text-transform: uppercase;
|
||||
user-select: none;
|
||||
}
|
||||
.color_red,
|
||||
.userpic1,
|
||||
.media_call .fill,
|
||||
.media_file .fill,
|
||||
.media_live_location .fill {
|
||||
background-color: #ff5555;
|
||||
}
|
||||
.color_green,
|
||||
.userpic2,
|
||||
.media_call.success .fill,
|
||||
.media_photo .fill {
|
||||
background-color: #64bf47;
|
||||
}
|
||||
.color_yellow,
|
||||
.userpic3,
|
||||
.media_venue .fill {
|
||||
background-color: #ffab00;
|
||||
}
|
||||
.color_blue,
|
||||
.userpic4,
|
||||
.media_audio_file .fill,
|
||||
.media_voice_message .fill {
|
||||
background-color: #4f9cd9;
|
||||
}
|
||||
.color_purple,
|
||||
.userpic5,
|
||||
.media_game .fill {
|
||||
background-color: #9884e8;
|
||||
}
|
||||
.color_pink,
|
||||
.userpic6,
|
||||
.media_invoice .fill {
|
||||
background-color: #e671a5;
|
||||
}
|
||||
.color_sea,
|
||||
.userpic7,
|
||||
.media_location .fill,
|
||||
.media_video .fill {
|
||||
background-color: #47bcd1;
|
||||
}
|
||||
.color_orange,
|
||||
.userpic8,
|
||||
.media_contact .fill {
|
||||
background-color: #ff8c44;
|
||||
}
|
||||
.personal_info {
|
||||
padding: 24px;
|
||||
}
|
||||
.personal_info .userpic .initials {
|
||||
font-size: 30px;
|
||||
}
|
||||
.personal_info .rows {
|
||||
float: left;
|
||||
padding-right: 24px;
|
||||
}
|
||||
.personal_info .names {
|
||||
width: 164px;
|
||||
}
|
||||
.personal_info .info {
|
||||
width: 124px;
|
||||
}
|
||||
.personal_info .bio {
|
||||
width: 400px;
|
||||
}
|
||||
.personal_info .row {
|
||||
padding-bottom: 16px;
|
||||
}
|
||||
a.block_link {
|
||||
display: block;
|
||||
text-decoration: none !important;
|
||||
border-radius: 4px;
|
||||
}
|
||||
a.block_link:hover {
|
||||
text-decoration: none !important;
|
||||
background-color: #f5f7f8;
|
||||
}
|
||||
.sections {
|
||||
padding: 11px 0;
|
||||
}
|
||||
.section {
|
||||
height: 48px;
|
||||
background-position: 24px 12px;
|
||||
background-repeat: no-repeat;
|
||||
background-size: 24px 24px;
|
||||
}
|
||||
.section .counter {
|
||||
float: right;
|
||||
padding: 14px 24px 0;
|
||||
font-size: 15px;
|
||||
}
|
||||
.section .label {
|
||||
padding: 15px 0 0 82px;
|
||||
font-size: 15px;
|
||||
}
|
||||
.list_page .page_about {
|
||||
padding: 16px 24px 0;
|
||||
font-size: 11px;
|
||||
}
|
||||
.list_page .entry_list {
|
||||
padding: 16px 0;
|
||||
}
|
||||
.list_page .entry {
|
||||
padding: 10px 16px;
|
||||
}
|
||||
.list_page .entry .userpic .initials {
|
||||
font-size: 18px;
|
||||
}
|
||||
.list_page .entry .body {
|
||||
margin-left: 66px;
|
||||
}
|
||||
.list_page .entry .name {
|
||||
padding: 4px 0 2px;
|
||||
font-size: 14px;
|
||||
}
|
||||
.list_page .entry .subname {
|
||||
padding-top: 4px;
|
||||
}
|
||||
.list_page .entry .details_entry {
|
||||
padding-top: 4px;
|
||||
}
|
||||
.list_page .entry .info {
|
||||
font-size: 11px;
|
||||
padding-top: 5px;
|
||||
}
|
||||
.history {
|
||||
padding: 16px 0;
|
||||
}
|
||||
.message {
|
||||
margin: 0 -10px;
|
||||
transition: background-color 2.0s ease;
|
||||
}
|
||||
div.selected {
|
||||
background-color: rgba(242,246,250,255);
|
||||
transition: background-color 0.5s ease;
|
||||
}
|
||||
.service {
|
||||
padding: 10px 24px;
|
||||
}
|
||||
.service .body {
|
||||
text-align: center;
|
||||
}
|
||||
.service .userpic_wrap {
|
||||
padding-top: 10px;
|
||||
}
|
||||
.service .userpic {
|
||||
margin: 0 auto;
|
||||
}
|
||||
.service .userpic .initials {
|
||||
font-size: 24px;
|
||||
}
|
||||
.message .userpic .initials {
|
||||
font-size: 16px;
|
||||
}
|
||||
.default {
|
||||
padding: 10px;
|
||||
}
|
||||
.default.joined {
|
||||
margin-top: -10px;
|
||||
}
|
||||
.default .from_name {
|
||||
color: #3892db;
|
||||
font-weight: 700;
|
||||
padding-bottom: 5px;
|
||||
}
|
||||
.default .from_name .details {
|
||||
font-weight: normal;
|
||||
}
|
||||
.default .body {
|
||||
margin-left: 60px;
|
||||
}
|
||||
.default .text {
|
||||
word-wrap: break-word;
|
||||
line-height: 150%;
|
||||
}
|
||||
.default .reply_to,
|
||||
.default .media_wrap {
|
||||
padding-bottom: 5px;
|
||||
}
|
||||
.default .media {
|
||||
margin: 0 -10px;
|
||||
padding: 5px 10px;
|
||||
}
|
||||
.default .media .fill,
|
||||
.default .media .thumb {
|
||||
width: 48px;
|
||||
height: 48px;
|
||||
border-radius: 50%;
|
||||
}
|
||||
.default .media .fill {
|
||||
background-repeat: no-repeat;
|
||||
background-position: 12px 12px;
|
||||
background-size: 24px 24px;
|
||||
}
|
||||
.default .media .title,
|
||||
.default .media_poll .question {
|
||||
padding-top: 4px;
|
||||
font-size: 14px;
|
||||
}
|
||||
.default .media .description {
|
||||
color: #000000;
|
||||
padding-top: 4px;
|
||||
font-size: 13px;
|
||||
}
|
||||
.default .media .status {
|
||||
padding-top: 4px;
|
||||
font-size: 13px;
|
||||
}
|
||||
.default .video_file_wrap,
|
||||
.default .animated_wrap {
|
||||
position: relative;
|
||||
}
|
||||
.default .video_file,
|
||||
.default .animated,
|
||||
.default .photo,
|
||||
.default .sticker {
|
||||
display: block;
|
||||
}
|
||||
.video_duration {
|
||||
background: rgba(0, 0, 0, .4);
|
||||
padding: 0px 5px;
|
||||
position: absolute;
|
||||
z-index: 2;
|
||||
border-radius: 2px;
|
||||
right: 3px;
|
||||
bottom: 3px;
|
||||
color: #ffffff;
|
||||
font-size: 11px;
|
||||
}
|
||||
.video_play_bg {
|
||||
background: rgba(0, 0, 0, .4);
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
line-height: 0;
|
||||
position: absolute;
|
||||
z-index: 2;
|
||||
border-radius: 50%;
|
||||
overflow: hidden;
|
||||
margin: -20px auto 0 -20px;
|
||||
top: 50%;
|
||||
left: 50%;
|
||||
pointer-events: none;
|
||||
}
|
||||
.video_play {
|
||||
position: absolute;
|
||||
display: inline-block;
|
||||
top: 50%;
|
||||
left: 50%;
|
||||
margin-left: -5px;
|
||||
margin-top: -9px;
|
||||
z-index: 1;
|
||||
width: 0;
|
||||
height: 0;
|
||||
border-style: solid;
|
||||
border-width: 9px 0 9px 14px;
|
||||
border-color: transparent transparent transparent #fff;
|
||||
}
|
||||
.gif_play {
|
||||
font-weight: 700;
|
||||
color: #FFF;
|
||||
display: block;
|
||||
line-height: 40px;
|
||||
font-size: 13px;
|
||||
text-align: center;
|
||||
}
|
||||
.pagination {
|
||||
text-align: center;
|
||||
padding: 20px;
|
||||
font-size: 16px;
|
||||
}
|
||||
|
||||
.toast_container {
|
||||
position: fixed;
|
||||
left: 50%;
|
||||
top: 50%;
|
||||
opacity: 0;
|
||||
transition: opacity 3.0s ease;
|
||||
}
|
||||
.toast_body {
|
||||
margin: 0 -50%;
|
||||
float: left;
|
||||
border-radius: 15px;
|
||||
padding: 10px 20px;
|
||||
background: rgba(0, 0, 0, 0.7);
|
||||
color: #ffffff;
|
||||
}
|
||||
div.toast_shown {
|
||||
opacity: 1;
|
||||
transition: opacity 0.4s ease;
|
||||
}
|
||||
|
||||
.section.calls {
|
||||
background-image: url(../images/section_calls.png);
|
||||
}
|
||||
.section.chats {
|
||||
background-image: url(../images/section_chats.png);
|
||||
}
|
||||
.section.contacts {
|
||||
background-image: url(../images/section_contacts.png);
|
||||
}
|
||||
.section.frequent {
|
||||
background-image: url(../images/section_frequent.png);
|
||||
}
|
||||
.section.photos {
|
||||
background-image: url(../images/section_photos.png);
|
||||
}
|
||||
.section.sessions {
|
||||
background-image: url(../images/section_sessions.png);
|
||||
}
|
||||
.section.web {
|
||||
background-image: url(../images/section_web.png);
|
||||
}
|
||||
.section.other {
|
||||
background-image: url(../images/section_other.png)
|
||||
}
|
||||
.page_header a.content {
|
||||
background-image: url(../images/back.png);
|
||||
}
|
||||
.media_call .fill {
|
||||
background-image: url(../images/media_call.png)
|
||||
}
|
||||
.media_contact .fill {
|
||||
background-image: url(../images/media_contact.png)
|
||||
}
|
||||
.media_file .fill {
|
||||
background-image: url(../images/media_file.png)
|
||||
}
|
||||
.media_game .fill {
|
||||
background-image: url(../images/media_game.png)
|
||||
}
|
||||
.media_live_location .fill,
|
||||
.media_location .fill,
|
||||
.media_venue .fill {
|
||||
background-image: url(../images/media_location.png)
|
||||
}
|
||||
.media_audio_file .fill {
|
||||
background-image: url(../images/media_music.png)
|
||||
}
|
||||
.media_invoice .fill {
|
||||
background-image: url(../images/media_shop.png)
|
||||
}
|
||||
.media_voice_message .fill {
|
||||
background-image: url(../images/media_voice.png)
|
||||
}
|
||||
.media_photo .fill {
|
||||
background-image: url(../images/media_photo.png)
|
||||
}
|
||||
.media_video .fill {
|
||||
background-image: url(../images/media_video.png)
|
||||
}
|
||||
|
||||
@media only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min-device-pixel-ratio: 2) {
|
||||
.section.calls {
|
||||
background-image: url(../images/section_calls@2x.png);
|
||||
}
|
||||
.section.chats {
|
||||
background-image: url(../images/section_chats@2x.png);
|
||||
}
|
||||
.section.contacts {
|
||||
background-image: url(../images/section_contacts@2x.png);
|
||||
}
|
||||
.section.frequent {
|
||||
background-image: url(../images/section_frequent@2x.png);
|
||||
}
|
||||
.section.photos {
|
||||
background-image: url(../images/section_photos@2x.png);
|
||||
}
|
||||
.section.sessions {
|
||||
background-image: url(../images/section_sessions@2x.png);
|
||||
}
|
||||
.section.web {
|
||||
background-image: url(../images/section_web@2x.png);
|
||||
}
|
||||
.section.other {
|
||||
background-image: url(../images/section_other@2x.png);
|
||||
}
|
||||
.page_header a.content {
|
||||
background-image: url(../images/back@2x.png);
|
||||
}
|
||||
.media_call .fill {
|
||||
background-image: url(../images/media_call@2x.png)
|
||||
}
|
||||
.media_contact .fill {
|
||||
background-image: url(../images/media_contact@2x.png)
|
||||
}
|
||||
.media_file .fill {
|
||||
background-image: url(../images/media_file@2x.png)
|
||||
}
|
||||
.media_game .fill {
|
||||
background-image: url(../images/media_game@2x.png)
|
||||
}
|
||||
.media_live_location .fill,
|
||||
.media_location .fill,
|
||||
.media_venue .fill {
|
||||
background-image: url(../images/media_location@2x.png)
|
||||
}
|
||||
.media_audio_file .fill {
|
||||
background-image: url(../images/media_music@2x.png)
|
||||
}
|
||||
.media_invoice .fill {
|
||||
background-image: url(../images/media_shop@2x.png)
|
||||
}
|
||||
.media_voice_message .fill {
|
||||
background-image: url(../images/media_voice@2x.png)
|
||||
}
|
||||
.media_photo .fill {
|
||||
background-image: url(../images/media_photo@2x.png)
|
||||
}
|
||||
.media_video .fill {
|
||||
background-image: url(../images/media_video@2x.png)
|
||||
}
|
||||
}
|
||||
BIN
Telegram/Resources/export_html/images/back.png
Normal file
|
After Width: | Height: | Size: 312 B |
BIN
Telegram/Resources/export_html/images/back@2x.png
Normal file
|
After Width: | Height: | Size: 518 B |
BIN
Telegram/Resources/export_html/images/media_call.png
Normal file
|
After Width: | Height: | Size: 417 B |
BIN
Telegram/Resources/export_html/images/media_call@2x.png
Normal file
|
After Width: | Height: | Size: 815 B |
BIN
Telegram/Resources/export_html/images/media_contact.png
Normal file
|
After Width: | Height: | Size: 323 B |
BIN
Telegram/Resources/export_html/images/media_contact@2x.png
Normal file
|
After Width: | Height: | Size: 600 B |
BIN
Telegram/Resources/export_html/images/media_file.png
Normal file
|
After Width: | Height: | Size: 236 B |
BIN
Telegram/Resources/export_html/images/media_file@2x.png
Normal file
|
After Width: | Height: | Size: 408 B |
BIN
Telegram/Resources/export_html/images/media_game.png
Normal file
|
After Width: | Height: | Size: 271 B |
BIN
Telegram/Resources/export_html/images/media_game@2x.png
Normal file
|
After Width: | Height: | Size: 510 B |
BIN
Telegram/Resources/export_html/images/media_location.png
Normal file
|
After Width: | Height: | Size: 480 B |
BIN
Telegram/Resources/export_html/images/media_location@2x.png
Normal file
|
After Width: | Height: | Size: 991 B |
BIN
Telegram/Resources/export_html/images/media_music.png
Normal file
|
After Width: | Height: | Size: 275 B |
BIN
Telegram/Resources/export_html/images/media_music@2x.png
Normal file
|
After Width: | Height: | Size: 464 B |
BIN
Telegram/Resources/export_html/images/media_photo.png
Normal file
|
After Width: | Height: | Size: 243 B |
BIN
Telegram/Resources/export_html/images/media_photo@2x.png
Normal file
|
After Width: | Height: | Size: 458 B |
BIN
Telegram/Resources/export_html/images/media_shop.png
Normal file
|
After Width: | Height: | Size: 377 B |
BIN
Telegram/Resources/export_html/images/media_shop@2x.png
Normal file
|
After Width: | Height: | Size: 790 B |
BIN
Telegram/Resources/export_html/images/media_video.png
Normal file
|
After Width: | Height: | Size: 235 B |
BIN
Telegram/Resources/export_html/images/media_video@2x.png
Normal file
|
After Width: | Height: | Size: 411 B |
BIN
Telegram/Resources/export_html/images/media_voice.png
Normal file
|
After Width: | Height: | Size: 328 B |
BIN
Telegram/Resources/export_html/images/media_voice@2x.png
Normal file
|
After Width: | Height: | Size: 660 B |
BIN
Telegram/Resources/export_html/images/section_calls.png
Normal file
|
After Width: | Height: | Size: 656 B |
BIN
Telegram/Resources/export_html/images/section_calls@2x.png
Normal file
|
After Width: | Height: | Size: 1.3 KiB |
BIN
Telegram/Resources/export_html/images/section_chats.png
Normal file
|
After Width: | Height: | Size: 283 B |
BIN
Telegram/Resources/export_html/images/section_chats@2x.png
Normal file
|
After Width: | Height: | Size: 454 B |
BIN
Telegram/Resources/export_html/images/section_contacts.png
Normal file
|
After Width: | Height: | Size: 508 B |
BIN
Telegram/Resources/export_html/images/section_contacts@2x.png
Normal file
|
After Width: | Height: | Size: 1023 B |
BIN
Telegram/Resources/export_html/images/section_frequent.png
Normal file
|
After Width: | Height: | Size: 771 B |
BIN
Telegram/Resources/export_html/images/section_frequent@2x.png
Normal file
|
After Width: | Height: | Size: 1.7 KiB |
BIN
Telegram/Resources/export_html/images/section_leftchats.png
Normal file
|
After Width: | Height: | Size: 402 B |
BIN
Telegram/Resources/export_html/images/section_leftchats@2x.png
Normal file
|
After Width: | Height: | Size: 619 B |
BIN
Telegram/Resources/export_html/images/section_other.png
Normal file
|
After Width: | Height: | Size: 155 B |
BIN
Telegram/Resources/export_html/images/section_other@2x.png
Normal file
|
After Width: | Height: | Size: 269 B |
BIN
Telegram/Resources/export_html/images/section_photos.png
Normal file
|
After Width: | Height: | Size: 415 B |
BIN
Telegram/Resources/export_html/images/section_photos@2x.png
Normal file
|
After Width: | Height: | Size: 750 B |
BIN
Telegram/Resources/export_html/images/section_sessions.png
Normal file
|
After Width: | Height: | Size: 134 B |
BIN
Telegram/Resources/export_html/images/section_sessions@2x.png
Normal file
|
After Width: | Height: | Size: 216 B |
BIN
Telegram/Resources/export_html/images/section_web.png
Normal file
|
After Width: | Height: | Size: 266 B |
BIN
Telegram/Resources/export_html/images/section_web@2x.png
Normal file
|
After Width: | Height: | Size: 447 B |
189
Telegram/Resources/export_html/js/script.js
Normal file
@@ -0,0 +1,189 @@
|
||||
"use strict";
|
||||
|
||||
window.AllowBackFromHistory = false;
|
||||
function CheckLocation() {
|
||||
var start = "#go_to_message";
|
||||
var hash = location.hash;
|
||||
if (hash.substr(0, start.length) == start) {
|
||||
var messageId = parseInt(hash.substr(start.length));
|
||||
if (messageId) {
|
||||
GoToMessage(messageId);
|
||||
}
|
||||
} else if (hash == "#allow_back") {
|
||||
window.AllowBackFromHistory = true;
|
||||
}
|
||||
}
|
||||
|
||||
function ShowToast(text) {
|
||||
var container = document.createElement("div");
|
||||
container.className = "toast_container";
|
||||
var inner = container.appendChild(document.createElement("div"));
|
||||
inner.className = "toast_body";
|
||||
inner.appendChild(document.createTextNode(text));
|
||||
var appended = document.body.appendChild(container);
|
||||
setTimeout(function () {
|
||||
AddClass(appended, "toast_shown");
|
||||
setTimeout(function () {
|
||||
RemoveClass(appended, "toast_shown");
|
||||
setTimeout(function () {
|
||||
document.body.removeChild(appended);
|
||||
}, 3000);
|
||||
}, 3000);
|
||||
}, 0);
|
||||
}
|
||||
|
||||
function ShowHashtag(tag) {
|
||||
ShowToast("This is a hashtag '#" + tag + "' link.");
|
||||
return false;
|
||||
}
|
||||
|
||||
function ShowCashtag(tag) {
|
||||
ShowToast("This is a cashtag '$" + tag + "' link.");
|
||||
return false;
|
||||
}
|
||||
|
||||
function ShowBotCommand(command) {
|
||||
ShowToast("This is a bot command '/" + command + "' link.");
|
||||
return false;
|
||||
}
|
||||
|
||||
function ShowMentionName() {
|
||||
ShowToast("This is a link to a user mentioned by name.");
|
||||
return false;
|
||||
}
|
||||
|
||||
function AddClass(element, name) {
|
||||
var current = element.className;
|
||||
var expression = new RegExp('(^|\\s)' + name + '(\\s|$)', 'g');
|
||||
if (expression.test(current)) {
|
||||
return;
|
||||
}
|
||||
element.className = current + ' ' + name;
|
||||
}
|
||||
|
||||
function RemoveClass(element, name) {
|
||||
var current = element.className;
|
||||
var expression = new RegExp('(^|\\s)' + name + '(\\s|$)', '');
|
||||
var match = expression.exec(current);
|
||||
while ((match = expression.exec(current)) != null) {
|
||||
if (match[1].length > 0 && match[2].length > 0) {
|
||||
current = current.substr(0, match.index + match[1].length)
|
||||
+ current.substr(match.index + match[0].length);
|
||||
} else {
|
||||
current = current.substr(0, match.index)
|
||||
+ current.substr(match.index + match[0].length);
|
||||
}
|
||||
}
|
||||
element.className = current;
|
||||
}
|
||||
|
||||
function EaseOutQuad(t) {
|
||||
return t * t;
|
||||
}
|
||||
|
||||
function EaseInOutQuad(t) {
|
||||
return (t < 0.5) ? (2 * t * t) : ((4 - 2 * t) * t - 1);
|
||||
}
|
||||
|
||||
function ScrollHeight() {
|
||||
if ("innerHeight" in window) {
|
||||
return window.innerHeight;
|
||||
} else if (document.documentElement) {
|
||||
return document.documentElement.clientHeight;
|
||||
}
|
||||
return document.body.clientHeight;
|
||||
}
|
||||
|
||||
function ScrollTo(top, callback) {
|
||||
var html = document.documentElement;
|
||||
var current = html.scrollTop;
|
||||
var delta = top - current;
|
||||
var finish = function () {
|
||||
html.scrollTop = top;
|
||||
if (callback) {
|
||||
callback();
|
||||
}
|
||||
};
|
||||
if (!window.performance.now || delta == 0) {
|
||||
finish();
|
||||
return;
|
||||
}
|
||||
var transition = EaseOutQuad;
|
||||
var max = 300;
|
||||
if (delta < -max) {
|
||||
current = top + max;
|
||||
delta = -max;
|
||||
} else if (delta > max) {
|
||||
current = top - max;
|
||||
delta = max;
|
||||
} else {
|
||||
transition = EaseInOutQuad;
|
||||
}
|
||||
var duration = 150;
|
||||
var interval = 7;
|
||||
var time = window.performance.now();
|
||||
var animate = function () {
|
||||
var now = window.performance.now();
|
||||
if (now >= time + duration) {
|
||||
finish();
|
||||
return;
|
||||
}
|
||||
var dt = (now - time) / duration;
|
||||
html.scrollTop = Math.round(current + delta * transition(dt));
|
||||
setTimeout(animate, interval);
|
||||
};
|
||||
setTimeout(animate, interval);
|
||||
}
|
||||
|
||||
function ScrollToElement(element, callback) {
|
||||
var header = document.getElementsByClassName("page_header")[0];
|
||||
var headerHeight = header.offsetHeight;
|
||||
var html = document.documentElement;
|
||||
var scrollHeight = ScrollHeight();
|
||||
var available = scrollHeight - headerHeight;
|
||||
var padding = 10;
|
||||
var top = element.offsetTop;
|
||||
var height = element.offsetHeight;
|
||||
var desired = top
|
||||
- Math.max((available - height) / 2, padding)
|
||||
- headerHeight;
|
||||
var scrollTopMax = html.offsetHeight - scrollHeight;
|
||||
ScrollTo(Math.min(desired, scrollTopMax), callback);
|
||||
}
|
||||
|
||||
function GoToMessage(messageId) {
|
||||
var element = document.getElementById("message" + messageId);
|
||||
if (element) {
|
||||
var hash = "#go_to_message" + messageId;
|
||||
if (location.hash != hash) {
|
||||
location.hash = hash;
|
||||
}
|
||||
ScrollToElement(element, function () {
|
||||
AddClass(element, "selected");
|
||||
setTimeout(function () {
|
||||
RemoveClass(element, "selected");
|
||||
}, 1000);
|
||||
});
|
||||
} else {
|
||||
ShowToast("This message was not exported. Maybe it was deleted.");
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
function GoBack(anchor) {
|
||||
if (!window.AllowBackFromHistory) {
|
||||
return true;
|
||||
}
|
||||
history.back();
|
||||
if (!anchor || !anchor.getAttribute) {
|
||||
return true;
|
||||
}
|
||||
var destination = anchor.getAttribute("href");
|
||||
if (!destination) {
|
||||
return true;
|
||||
}
|
||||
setTimeout(function () {
|
||||
location.href = destination;
|
||||
}, 100);
|
||||
return false;
|
||||
}
|
||||
57
Telegram/Resources/fc-custom.conf
Normal file
@@ -0,0 +1,57 @@
|
||||
<?xml version='1.0'?>
|
||||
<!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
|
||||
<fontconfig>
|
||||
<dir>/usr/share/fonts</dir>
|
||||
<dir>/usr/local/share/fonts</dir>
|
||||
<dir>~/.fonts</dir>
|
||||
<dir>~/.local/share/fonts</dir>
|
||||
<dir>/usr/X11R6/lib/X11/fonts</dir>
|
||||
<dir prefix="xdg">fonts</dir>
|
||||
<match target="pattern">
|
||||
<test qual="any" name="family">
|
||||
<string>mono</string>
|
||||
</test>
|
||||
<edit name="family" mode="assign" binding="same">
|
||||
<string>monospace</string>
|
||||
</edit>
|
||||
</match>
|
||||
<match target="pattern">
|
||||
<test qual="any" name="family">
|
||||
<string>sans serif</string>
|
||||
</test>
|
||||
<edit name="family" mode="assign" binding="same">
|
||||
<string>sans-serif</string>
|
||||
</edit>
|
||||
</match>
|
||||
<match target="pattern">
|
||||
<test qual="any" name="family">
|
||||
<string>sans</string>
|
||||
</test>
|
||||
<edit name="family" mode="assign" binding="same">
|
||||
<string>sans-serif</string>
|
||||
</edit>
|
||||
</match>
|
||||
<cachedir>/var/cache/fontconfig_11</cachedir>
|
||||
<cachedir prefix="xdg">fontconfig_11</cachedir>
|
||||
<cachedir>~/.fontconfig_11</cachedir>
|
||||
<match target="font">
|
||||
<edit mode="assign" name="antialias">
|
||||
<bool>true</bool>
|
||||
</edit>
|
||||
<edit mode="assign" name="embeddedbitmap">
|
||||
<bool>false</bool>
|
||||
</edit>
|
||||
<edit mode="assign" name="hinting">
|
||||
<bool>true</bool>
|
||||
</edit>
|
||||
<edit mode="assign" name="hintstyle">
|
||||
<const>hintslight</const>
|
||||
</edit>
|
||||
<edit mode="assign" name="lcdfilter">
|
||||
<const>lcddefault</const>
|
||||
</edit>
|
||||
<edit mode="assign" name="rgba">
|
||||
<const>rgb</const>
|
||||
</edit>
|
||||
</match>
|
||||
</fontconfig>
|
||||
|
Before Width: | Height: | Size: 380 B |
|
Before Width: | Height: | Size: 708 B |
|
Before Width: | Height: | Size: 316 B |
|
Before Width: | Height: | Size: 579 B |
BIN
Telegram/Resources/icons/box_button_back@3x.png
Normal file
|
After Width: | Height: | Size: 251 B |
BIN
Telegram/Resources/icons/box_button_close@3x.png
Normal file
|
After Width: | Height: | Size: 590 B |
BIN
Telegram/Resources/icons/box_search@3x.png
Normal file
|
After Width: | Height: | Size: 825 B |
BIN
Telegram/Resources/icons/bubble_tail@3x.png
Normal file
|
After Width: | Height: | Size: 343 B |
BIN
Telegram/Resources/icons/call_answer@3x.png
Normal file
|
After Width: | Height: | Size: 1.0 KiB |
BIN
Telegram/Resources/icons/call_arrow_in@3x.png
Normal file
|
After Width: | Height: | Size: 449 B |
BIN
Telegram/Resources/icons/call_arrow_out@3x.png
Normal file
|
After Width: | Height: | Size: 443 B |
BIN
Telegram/Resources/icons/call_discard@3x.png
Normal file
|
After Width: | Height: | Size: 886 B |
BIN
Telegram/Resources/icons/call_rating@3x.png
Normal file
|
After Width: | Height: | Size: 1.7 KiB |
BIN
Telegram/Resources/icons/call_rating_filled@3x.png
Normal file
|
After Width: | Height: | Size: 1.8 KiB |
BIN
Telegram/Resources/icons/call_record_active@3x.png
Normal file
|
After Width: | Height: | Size: 945 B |
BIN
Telegram/Resources/icons/call_record_muted@3x.png
Normal file
|
After Width: | Height: | Size: 1.1 KiB |
BIN
Telegram/Resources/icons/call_shadow_left@3x.png
Normal file
|
After Width: | Height: | Size: 139 B |
BIN
Telegram/Resources/icons/call_shadow_top@3x.png
Normal file
|
After Width: | Height: | Size: 141 B |
BIN
Telegram/Resources/icons/call_shadow_top_left@3x.png
Normal file
|
After Width: | Height: | Size: 927 B |
BIN
Telegram/Resources/icons/color_slider_arrow@3x.png
Normal file
|
After Width: | Height: | Size: 310 B |
BIN
Telegram/Resources/icons/color_slider_arrow_vertical@3x.png
Normal file
|
After Width: | Height: | Size: 357 B |
BIN
Telegram/Resources/icons/connecting_body@3x.png
Normal file
|
After Width: | Height: | Size: 144 B |
BIN
Telegram/Resources/icons/connecting_body_shadow@3x.png
Normal file
|
After Width: | Height: | Size: 207 B |
BIN
Telegram/Resources/icons/connecting_left@3x.png
Normal file
|
After Width: | Height: | Size: 940 B |
BIN
Telegram/Resources/icons/connecting_left_shadow@3x.png
Normal file
|
After Width: | Height: | Size: 1.5 KiB |