e4c30e8613
Merge remote-tracking branch 'PrivateBin/master'
2017-03-22 18:46:53 +01:00
63e00445d1
Merge branch 'chauffer-patch-1'
2017-03-21 20:54:55 +01:00
21df49c7cd
README: Fix some grammar mistakes
2017-03-21 20:44:46 +01:00
eebac929c5
Merge branch 'kyodev-patch-1'
2017-03-21 14:39:38 +01:00
8f13dffd7c
fr translation completed
2017-03-17 22:23:01 +01:00
fcb718dfda
Merge branch 'imtms-master'
2017-03-13 21:19:10 +01:00
be78dcd1a5
Merge branch 'master' of https://github.com/imtms/PrivateBin into imtms-master
2017-03-13 21:18:32 +01:00
996a22380e
Merge branch 'jsrefactor'
2017-03-13 21:16:33 +01:00
0fb650c3a6
comply with codacys suggestion
2017-03-13 21:15:52 +01:00
63617ade72
Merge branch 'master' into jsrefactor
2017-03-13 21:13:06 +01:00
b5cdfff3e3
fix missing comment status messages - ♫ lovely span, oh wonderful span ♪ (chorus) span, span, span, span, …
2017-03-13 21:11:26 +01:00
5bf25f227e
update JSDoc and re-published to https://privatebin.info/jsdoc/
2017-03-13 20:24:18 +01:00
ee43557a4f
ensure burn after reading and status messages are only changed after a successfull decryption
2017-03-13 19:30:44 +01:00
9deaed9406
working on asynch translation handling
2017-03-12 17:08:12 +01:00
1649ff34f5
restoring password protection
2017-03-12 16:06:17 +01:00
651e38acbe
make travis use phpunit < 6 to avoid failing builds for PHP 7, see: https://github.com/travis-ci/travis-ci/issues/7226#issuecomment-285852088
2017-03-12 14:38:49 +01:00
81b00dd422
fixing page template, removing error messages when markdown or source are disabled in configuration, re-removing unnecessary spans
2017-03-12 14:16:08 +01:00
9b936a5e47
Update zh.json - Add missing translations
2017-03-11 19:00:20 +08:00
be0919893d
updating shipped .htaccess files for Apache 2.4 as per https://httpd.apache.org/docs/2.4/upgrading.html#access - Thanks @EchoDev, fixes #194
2017-03-11 08:56:14 +01:00
97171ec1f8
updated eslint config file format and loosening complexity and max-statements to reduce mail flood
2017-03-06 20:10:10 +01:00
b6d8d0f250
found problem with unit test of baseUri function, makes code much simpler
2017-03-06 19:48:07 +01:00
fb99d5bb93
Merge branch 'master' into jsrefactor and fixing baseUri unit test
2017-03-05 12:11:55 +01:00
823adb78ef
bumping required PHP to 5.4, removing unneccessary code, resolves #186
2017-03-05 11:22:24 +01:00
db429d42d2
Merge branch 'nolsen42-master'
2017-03-05 11:11:06 +01:00
bd32a73d21
remove Safari link on bootstrap template, too
2017-03-05 11:10:52 +01:00
89f2a3701c
Merge branch 'master' of https://github.com/nolsen42/PrivateBin into nolsen42-master
2017-03-05 11:05:29 +01:00
e7c22f701e
Merge branch 'tupaschoal-master'
2017-03-05 11:02:43 +01:00
23b09d601d
credited Tulio for the portuguese translation, updated SRI hashes
2017-03-05 11:02:18 +01:00
1bcd0f7de5
Merge branch 'master' of https://github.com/tupaschoal/PrivateBin into tupaschoal-master
2017-03-05 10:55:39 +01:00
d358271451
making unit tests work with spans
2017-03-02 19:44:43 +01:00
84ae15e6ad
Safari isn't available on Windows anymore
...
We don't need to mention Safari, as apple has dropped support for Windows anymore, and since Internet Explorer isn't on Macs, there should be little to worry about :p
2017-03-01 12:41:50 -06:00
85aa072234
compromise: using spans, but with a class to give them a meaning
2017-02-28 20:11:57 +01:00
e65a089cde
Merge branch 'Ahuahuachi-patch-1'
2017-02-28 20:01:50 +01:00
83085ef4ae
Update es.jason - syntax correction
...
Deleted extra space between [% s].
Correction suggested by @tmelikoff.
2017-02-28 12:57:39 -06:00
131e08ca33
made phpUnit and most mocha tests work again, had to remove some injected objects and added a helper method to facilitate a cache reset for the unit tests. Page template is still broken and the JS test for baseUri() fails
2017-02-25 09:35:55 +01:00
e880f7924c
Merge branch 'master' into jsrefactor
2017-02-25 07:30:44 +01:00
db307c3a77
updated test cases and delete logic to properly implement documented API, thanks @r4sas #188
2017-02-22 21:42:14 +01:00
c45e79142e
Add missing translations
...
Some of the strings were not published.
2017-02-18 08:51:20 -02:00
601aa5e3dc
🐛 Fix typo
2017-02-17 22:59:16 +01:00
c033775779
Cleanup
2017-02-17 22:46:18 +01:00
52d1be1b54
Fix https://github.com/PrivateBin/PrivateBin/issues/187
2017-02-17 22:26:39 +01:00
b0876ea0e0
🐛 Fix error not appearing below comment
2017-02-17 21:48:21 +01:00
da094e2853
make it work(6): discussion/comments
2017-02-17 20:46:10 +01:00
e59b58308d
Add Portuguese Translation file
...
Support Portugues translation for PrivateBin by adding its corresponding
file.
2017-02-16 00:57:01 -02:00
7be5206920
makeit work(5): pase cloning & raw button
2017-02-15 22:59:55 +01:00
a652ab5896
make it work(4): display encrypted pastes
...
also improved file uploader, better structured
2017-02-14 22:21:55 +01:00
b9737d368d
Update conf.ini.sample
2017-02-13 22:57:09 +01:00
31e66131b7
make it work(3): allow paste submission
2017-02-13 21:12:00 +01:00
4cb0ce5114
Removed self from cspheader
...
Refactored some variable names
2017-02-13 20:37:57 +01:00
f33d702f3d
make it work(2): buttons & preview working
2017-02-13 11:35:04 +01:00
Stefano Martinelli