thororm
ec9fb750b4
Adapted attachment handling to refactoring
2017-04-02 18:58:11 +02:00
thororm
096f07f86e
Merge branch 'master' into attachment-handling
...
# Conflicts:
# js/privatebin.js
# tpl/bootstrap.php
# tpl/page.php
2017-04-02 13:30:52 +02:00
El RIDO
f25ea35666
Merge branch 'idarlund-patch-4'
2017-03-29 19:43:02 +02:00
El RIDO
6470d74be3
Merge branch 'patch-4' of https://github.com/idarlund/PrivateBin into idarlund-patch-4
2017-03-29 19:41:43 +02:00
El RIDO
10fe965704
Merge branch 'stefanomarty-Italian-Translation'
2017-03-29 19:41:07 +02:00
El RIDO
89a00ea48e
Merge branch 'Italian-Translation' of https://github.com/stefanomarty/PrivateBin into stefanomarty-Italian-Translation
2017-03-29 19:39:15 +02:00
idarlund
806b665c6a
Update no.json
...
updated based on https://github.com/PrivateBin/PrivateBin/issues/201
2017-03-28 16:42:48 +02:00
El RIDO
a8d02bd8e2
Merge branch 'master' of github.com:PrivateBin/PrivateBin
2017-03-25 18:45:10 +01:00
El RIDO
cd40717301
fixing #209 , refactoring regression when file upload is disabled
2017-03-25 18:44:20 +01:00
stefanomarty
d23c696e97
Revert delete of (in Inglese)
2017-03-25 17:33:54 +01:00
rugk
056f6b01c8
Merge branch 'lex111-patch-1'
2017-03-25 15:14:59 +01:00
Alexey Pyltsyn
82e45915c7
Update Russian translation
2017-03-25 17:06:56 +03:00
Stefano Martinelli
d8e0a6e986
Italian translation update
...
- new strings translated
- couple of minor errors fixed
Some strings (i.e. line 133) are literal translations.
I could probably give a better translation by reading the messages in
their context, when I get the next update.
2017-03-25 14:42:31 +01:00
Stefano Martinelli
945d553830
Merge remote-tracking branch 'PrivateBin/master' into Italian-Translation
2017-03-25 14:35:16 +01:00
El RIDO
628696e524
Merge branch 'tupaschoal-patch-1'
2017-03-25 14:25:50 +01:00
Stefano Martinelli
2ffc42eb8d
Merge remote-tracking branch 'PrivateBin/master' into Italian-Translation
2017-03-25 14:21:02 +01:00
Tulio Leao
3fc6ede5bb
Translate missing IDs to Portuguese
...
As referenced on issue #201 , some IDs were missing from the pt translation, which were now translated.
2017-03-25 09:26:31 -03:00
El RIDO
44327bed58
added missing/removed translation IDs found using improved unit test ( #201 )
2017-03-25 13:19:11 +01:00
El RIDO
e80c726f92
added unit test for missing message IDs accross all translations, added IDs found this way to translation files ( #201 )
2017-03-25 12:46:08 +01:00
El RIDO
57ebc7338d
Merge branch 'master' into js-unit-testing
2017-03-25 09:06:04 +01:00
El RIDO
dfa6f02d12
Merge branch 'tupaschoal-patch-1'
2017-03-25 01:02:03 +01:00
El RIDO
d35ae4685c
Merge branch 'patch-1' of https://github.com/tupaschoal/PrivateBin into tupaschoal-patch-1
2017-03-25 01:01:46 +01:00
El RIDO
bbcc3e167b
implementing recommendations of scrutinizer
2017-03-25 00:58:59 +01:00
Tulio Leao
3be736fa1d
Update pt.json to reflect latest string changes
...
Just a minimal change on the translation.
2017-03-24 20:03:08 -03:00
El RIDO
9b2af0abf5
fixing documentation
2017-03-24 23:54:37 +01:00
El RIDO
18315e7de0
removing unused class
2017-03-24 23:45:10 +01:00
El RIDO
f7853cf439
removing duplicate code, cleanup of temporary test files
2017-03-24 23:42:11 +01:00
El RIDO
6db9dae66b
applying styleCI recommendations
2017-03-24 21:35:50 +01:00
El RIDO
b2ea65f820
Merge branch 'master' of github.com:PrivateBin/PrivateBin
2017-03-24 21:30:19 +01:00
El RIDO
ce92bfa934
updated .htaccess format, refactored .htaccess creation logic and improving code coverage, fixes #194
2017-03-24 21:30:08 +01:00
Kyodev
1cb1c1ced8
php minimum version + constant version
2017-03-24 20:34:35 +01:00
Kyodev
850b28931f
php minimum version updated
2017-03-24 19:56:52 +01:00
El RIDO
88b02d866e
fixes #186 for good
2017-03-24 19:20:34 +01:00
El RIDO
e5f4104720
Merge branch 'imtms-master'
2017-03-24 19:01:40 +01:00
El RIDO
ebd8913027
Merge branch 'stefanomarty-Italian-Translation'
2017-03-24 18:59:00 +01:00
rugk
b8d057860c
Merge branch 'locale-ru' of https://github.com/r4sas/PrivateBin
2017-03-24 18:18:25 +01:00
R4SAS
a6b9bc6879
replace php version to constant, #186 #201
2017-03-24 17:50:53 +03:00
TMs
02e0b8655d
update zh translation
2017-03-24 11:32:12 +01:00
rugk
2d9225d8a3
Merge branch 'r4sas-locale-ru'
2017-03-23 21:20:35 +01:00
R4SAS
9a788d63ee
fixed wrong translated line
2017-03-23 21:25:44 +03:00
R4SAS
01701efd56
changed three dots to unicode symbol, added note about english
2017-03-23 21:20:52 +03:00
Stefano Martinelli
39bb2fa389
php minimum version updated
...
As per instructions, minimum version updated from 5.3.0 to 5.4.0
2017-03-23 17:36:13 +01:00
R4SAS
e58261b3f8
update ru translation
2017-03-23 18:36:08 +03:00
R4SAS
a165094d4c
Merge pull request #2 from PrivateBin/master
...
upstream pull
2017-03-23 19:27:06 +04:00
Stefano Martinelli
037a312b8f
Italian translation update
...
New message translated, couple of minor errors fixed and translation of
row 70 reverted to a more faithful meaning.
2017-03-22 20:27:19 +01:00
Stefano Martinelli
e4c30e8613
Merge remote-tracking branch 'PrivateBin/master'
2017-03-22 18:46:53 +01:00
rugk
63e00445d1
Merge branch 'chauffer-patch-1'
2017-03-21 20:54:55 +01:00
Simone Esposito
21df49c7cd
README: Fix some grammar mistakes
2017-03-21 20:44:46 +01:00
rugk
eebac929c5
Merge branch 'kyodev-patch-1'
2017-03-21 14:39:38 +01:00
Kyodev
8f13dffd7c
fr translation completed
2017-03-17 22:23:01 +01:00
