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
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
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
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
e59b58308d
Add Portuguese Translation file
...
Support Portugues translation for PrivateBin by adding its corresponding
file.
2017-02-16 00:57:01 -02:00
dd721c651b
Update SRI hashes
...
Fixes https://github.com/PrivateBin/PrivateBin/issues/181
2017-02-11 16:19:59 +01:00
0091607618
📝 Simplify isue & PR template
...
I saw GitHub's new TOS already address the contribution/licensing issue, so
that the checkbox is not necessary.
See https://help.github.com/articles/github-terms-of-service-draft/#5-license-grant-to-other-users
2017-02-08 09:29:31 +01:00
5130d9e2f3
New state for "only new button"
...
Used when the message cannot be decrypted.
Fixes https://github.com/PrivateBin/PrivateBin/issues/126
2017-02-06 22:39:45 +01:00
5ad02a3d1c
Use original reload function for manual paste open link
...
This fixes the issue where clicking on the link took you to the home page.
I seriously missed that this.reloadPage does not do the thing I thought it does,
so I updated the doc to make it clear and switched back to the correct function.
Basically reverts 86cd5e1c15
2017-02-06 20:39:52 +01:00
e483d60eed
Merge branch 'historyupdate'
...
Conflicts:
tpl/bootstrap.php
tpl/page.php
And update SRI.
@elrido also did not properly merge this branch. Doing it now…
2017-02-06 20:25:35 +01:00
4cb0374e11
readding accidentally removed line of #173
2017-02-06 20:16:03 +01:00
63b0b050c3
Merge branch 'r4sas-patch-1'
2017-02-06 19:57:09 +01:00
2ca2309fc4
Merge branch 'patch-1' of https://github.com/r4sas/PrivateBin into r4sas-patch-1
2017-02-06 19:55:07 +01:00
27c4d6c2cc
Merge branch 'historyupdate'
2017-02-06 19:37:11 +01:00
0af8bd73ad
Update ru.json
...
Translated new string "Uploading paste… Please wait."
2017-02-06 20:42:37 +03:00
86cd5e1c15
Use existing reload function
2017-02-05 22:35:44 +01:00
edb546de54
Add loading indicator
...
Fixes https://github.com/PrivateBin/PrivateBin/issues/172
2017-02-05 22:09:46 +01:00
5c603d0978
Improve comment
2017-02-05 21:35:28 +01:00
c96dd0836b
Make link clickable again
...
We need to emulate the click and manually trigger a reload if the hash is
already shown in the URL.
2017-02-05 21:22:09 +01:00
366b61c32d
adding document title in new history state
2017-02-05 18:53:57 +01:00
f699ca6cd4
writing tests for htmlEntities function
2017-02-05 18:46:24 +01:00
67f71f4dd6
writing tests for pageKey function, fixing always added padding bug
2017-02-05 18:03:42 +01:00
a97b94640e
writing test for pasteId function
2017-02-05 16:58:58 +01:00
80f7baa604
writing test for scriptLocation function, fixing non-removed query separator bug
2017-02-05 16:45:11 +01:00
5442af6e20
slight JS refactoring
2017-02-05 14:47:03 +01:00
ca51a80803
Update the history when a paste is created
...
Fixes https://github.com/PrivateBin/PrivateBin/issues/167
2017-02-01 19:24:56 +01:00
afdfcba304
Merge branch 'master' of https://github.com/PrivateBin/PrivateBin
2017-02-01 18:36:05 +01:00
e9b10f9e2d
Add CSP sandbox
...
Fixes https://github.com/PrivateBin/PrivateBin/issues/168
Alos needed to run some Composer stuff, no idea why my diff was different.
2017-02-01 18:34:13 +01:00
920f02e43d
fixing composer package versions, thanks @jelhan ( #84 )
2017-01-30 20:36:38 +01:00
4bbfd5045e
ensure that JS is *really* only initialized after the DOM is fully loaded, resolves #166
2017-01-30 20:29:04 +01:00
368aa2305b
removing unused pieces of code (legacy?), resolves #165
2017-01-29 16:19:12 +01:00
b76a73aa06
upgrading showdown
2017-01-29 16:17:56 +01:00
339ab5e380
ignoring composer.lock, so it isn't accidentally checked in (again)
2017-01-29 15:11:04 +01:00
f1df27f46c
allowing for parameter strings starting with &
2017-01-29 15:09:57 +01:00
177c9d7114
Merge branch 'js-unit-testing'
2017-01-29 14:50:31 +01:00
cae5a71151
fix missing class renaming
2017-01-29 14:48:56 +01:00
efcfb80129
Merge branch 'master' of github.com:PrivateBin/PrivateBin
2017-01-29 14:39:34 +01:00
d678f5dada
fixing inconsistency found in unit test
2017-01-29 14:32:55 +01:00
fdef8bc5be
starting to work on JSVerify & Mocha based unit tests for our JS code base
2017-01-29 14:31:44 +01:00
065f5e53b3
Remove composer-lock from .gitignore
...
As per https://github.com/PrivateBin/PrivateBin/issues/84#issuecomment-275065350
Thanks, @jelhan.
2017-01-26 16:40:33 +01:00
4a7a3ab76d
Merge branch 'nolsen42-master'
2017-01-24 19:28:18 +01:00
abaf8e96a6
updated page template
2017-01-24 19:27:35 +01:00
El RIDO