Commit graph

2852 commits

Author SHA1 Message Date
erciccione
3d65589d1d
remove conflict markers from fr.yml 2019-05-06 20:58:10 +02:00
luigi1111
95b63fb1e6 Merge !1061
Add missing i18n keys and values in the languages files

See merge request monero-project/monero-site!1061
2019-05-06 20:47:34 +02:00
erciccione
36268f7830
add missing i18n keys and values in the languages files 2019-05-06 20:43:43 +02:00
luigi1111
2d564426ba Merge !1069
Dev meeting logs of 2019-05-05

See merge request monero-project/monero-site!1069
2019-05-06 20:41:21 +02:00
luigi1111
d33eef1b83 Merge !1066
MRL meting logs of 2019-03-29

See merge request monero-project/monero-site!1066
2019-05-06 20:41:10 +02:00
luigi1111
d34cf6d457 Merge !1065
Some corrections for the Turkish page

See merge request monero-project/monero-site!1065
2019-05-06 20:40:39 +02:00
luigi1111
6ccbb6070e Merge !1064
TR: Correct lang_tag to lang_tag_tr for moneropedia to work

See merge request monero-project/monero-site!1064
2019-05-06 20:40:18 +02:00
luigi1111
0f7c9081a2 Merge !1063
Community meeting logs 2019 04 27

See merge request monero-project/monero-site!1063
2019-05-06 20:40:02 +02:00
luigi1111
3103fcb615 Merge !1062
Tini2p dev meeting log from 2019-04-25

See merge request monero-project/monero-site!1062
2019-05-06 20:37:16 +02:00
luigi1111
474c2f3e68 Merge !1060
Logs from the GUI meeting held on 2019-04-23

See merge request monero-project/monero-site!1060
2019-05-06 20:35:48 +02:00
luigi1111
fa8dc73f64 Merge !1039
French update

See merge request monero-project/monero-site!1039
2019-05-06 20:35:22 +02:00
el00ruobuob
31ee489b3a
Dev meeting logs of 2019-05-05 2019-05-05 22:31:00 +02:00
erciccione
ee2ce56f8b
add 'Krypto Threadz' and 'cryptwerk' to the list of merchants 2019-05-05 00:53:41 +02:00
Nine Zero
73d2f19ef5
Update Turkish translation: tr.yml and tr/roadmap.yml 2019-05-03 12:04:14 +02:00
el00ruobuob
732de92ee5
MRL meting logs of 2019-03-29 2019-05-02 09:15:15 +02:00
el00ruobuob
7c93773fda
Correct lang_tag to lang_tag_tr for moneropedia to work 2019-04-27 21:14:50 +02:00
el00ruobuob
5bd24f259c
Community meeting logs from 2019-04-27 2019-04-27 20:33:14 +02:00
el00ruobuob
8a3a2678ef
Tini2p dev meeting log from 2019-04-25 2019-04-27 19:06:12 +02:00
luigi1111
a244e41ed5 Merge !1059
MRL meeting logs of 2019-04-22

See merge request monero-project/monero-site!1059
2019-04-23 22:49:29 +02:00
luigi1111
9615b441d7 Merge !1058
translating to russian language (update)

See merge request monero-project/monero-site!1058
2019-04-23 22:48:51 +02:00
luigi1111
6777557f11 Merge !1057
MRL Meeting logs from 2019-04-15

See merge request monero-project/monero-site!1057
2019-04-23 22:48:33 +02:00
luigi1111
734a9c4f57 Merge !1056
Community meeting logs from 2019-04-13

See merge request monero-project/monero-site!1056
2019-04-23 22:48:15 +02:00
luigi1111
1fea6caec1 Merge !1055
Getmonero.org translated to Turkish

See merge request monero-project/monero-site!1055
2019-04-23 22:47:54 +02:00
luigi1111
86d7f9e69e Merge !1053
MRL meeting logs from 2019-04-08

See merge request monero-project/monero-site!1053
2019-04-23 22:47:09 +02:00
luigi1111
075c7c776b Merge !1052
Dev meeting logs from 2019-04-07

See merge request monero-project/monero-site!1052
2019-04-23 22:46:48 +02:00
luigi1111
4921e68b35 Merge !1051
MRL meeting logs from 2019-04-01

See merge request monero-project/monero-site!1051
2019-04-23 22:46:24 +02:00
luigi1111
6b1301eca6 Merge !1050
Logs from Monero dev meeting held on 2018-03-31

See merge request monero-project/monero-site!1050
2019-04-23 22:45:52 +02:00
luigi1111
81eecfaf0f Merge !1049
Community meeting logs 2018-03-30

See merge request monero-project/monero-site!1049
2019-04-23 22:45:35 +02:00
luigi1111
b276092358 Merge !1048
Update merchants.yml

See merge request monero-project/monero-site!1048
2019-04-23 22:45:08 +02:00
luigi1111
72757d7d0c Merge !1047
Tini2p dev meeting log & backlog

See merge request monero-project/monero-site!1047
2019-04-23 22:44:48 +02:00
luigi1111
4c66f7a718 Merge !1040
Add missing blog tag `community`

See merge request monero-project/monero-site!1040
2019-04-23 22:44:30 +02:00
luigi1111
7209181ef1 Merge !1034
Correct openalias page link to monero-project page

See merge request monero-project/monero-site!1034
2019-04-23 22:44:13 +02:00
el00ruobuob
bc2d7e6691
Logs from the GUI meeting held on 2019-04-23 2019-04-23 21:57:19 +02:00
el00ruobuob
297acdb4a2
MRL meeting logs of 2019-04-22 2019-04-23 17:18:02 +02:00
v1docq47
b992cd81a3 translating to russian language (update) 2019-04-16 20:48:26 +06:00
el00ruobuob
0abbf0fe26
MRL Meeting logs from 2019-04-15 2019-04-15 20:23:19 +02:00
Nine Zero
2849edd417
Add initial Turkish translation 2019-04-15 10:49:26 +02:00
el00ruobuob
a287964ab0
Community meeting logs from 2019-04-13 2019-04-13 20:33:22 +02:00
el00ruobuob
9db788fef8
Logs from tini2p meeting of 2019-04-11 2019-04-13 18:46:00 +02:00
el00ruobuob
d9887f3555
MRL meeting logs from 2019-04-08 2019-04-08 20:45:03 +02:00
luigi1111
9f63f230de Merge !1045
Update network upgrade warning for Dutch

See merge request monero-project/monero-site!1045
2019-04-08 20:44:32 +02:00
Edwin den Boer
0f19538069 Update network upgrade warning for Dutch 2019-04-08 20:44:32 +02:00
luigi1111
377bfbcafe Merge !1044
Add new merchants flowlog & ITworks

See merge request monero-project/monero-site!1044
2019-04-08 20:43:22 +02:00
luigi1111
7b112594b1 Merge !1043
Update lang drop-down & topnav CSS

See merge request monero-project/monero-site!1043
2019-04-08 20:43:09 +02:00
luigi1111
1f61f9fc4a Merge !1042
MRL meeting logs 2019-03-28

See merge request monero-project/monero-site!1042
2019-04-08 20:42:51 +02:00
luigi1111
f8a1ca4615 Merge !1041
dev meeting logs from 2019-03-24

See merge request monero-project/monero-site!1041
2019-04-08 20:42:38 +02:00
luigi1111
9c23312468 Merge !1037
Sort tags by popularity in blog

See merge request monero-project/monero-site!1037
2019-04-08 20:41:16 +02:00
luigi1111
c5c2aeb3d9 Merge !1036
New merchant: Purism

See merge request monero-project/monero-site!1036
2019-04-08 20:40:55 +02:00
luigi1111
0aabe04931 Merge !1035
Increase div height on monero-project page

See merge request monero-project/monero-site!1035
2019-04-08 20:40:38 +02:00
luigi1111
618f328df2 Merge !1025
Ruby screenshots script: Correct path to (s/ressources/resources/g)

See merge request monero-project/monero-site!1025
2019-04-08 20:39:48 +02:00