Commit Graph

231 Commits

Author SHA1 Message Date
El RIDO
6fb3fe51b2
Merge branch 'master' into js-unit-testing 2017-03-26 06:46:42 +02:00
El RIDO
cd40717301
fixing #209, refactoring regression when file upload is disabled 2017-03-25 18:44:20 +01:00
El RIDO
e15e86ac3f
improving coverage of existing tests 2017-03-25 10:18:28 +01:00
El RIDO
57ebc7338d
Merge branch 'master' into js-unit-testing 2017-03-25 09:06:04 +01:00
El RIDO
bbcc3e167b
implementing recommendations of scrutinizer 2017-03-25 00:58:59 +01:00
El RIDO
0fb650c3a6
comply with codacys suggestion 2017-03-13 21:15:52 +01:00
El RIDO
63617ade72
Merge branch 'master' into jsrefactor 2017-03-13 21:13:06 +01:00
El RIDO
b5cdfff3e3
fix missing comment status messages - ♫ lovely span, oh wonderful span ♪ (chorus) span, span, span, span, … 2017-03-13 21:11:26 +01:00
El RIDO
5bf25f227e
update JSDoc and re-published to https://privatebin.info/jsdoc/ 2017-03-13 20:24:18 +01:00
El RIDO
ee43557a4f
ensure burn after reading and status messages are only changed after a successfull decryption 2017-03-13 19:30:44 +01:00
El RIDO
9deaed9406
working on asynch translation handling 2017-03-12 17:08:12 +01:00
El RIDO
1649ff34f5
restoring password protection 2017-03-12 16:06:17 +01:00
El RIDO
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
El RIDO
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
El RIDO
b6d8d0f250
found problem with unit test of baseUri function, makes code much simpler 2017-03-06 19:48:07 +01:00
El RIDO
fb99d5bb93
Merge branch 'master' into jsrefactor and fixing baseUri unit test 2017-03-05 12:11:55 +01:00
El RIDO
bd32a73d21
remove Safari link on bootstrap template, too 2017-03-05 11:10:52 +01:00
El RIDO
89f2a3701c
Merge branch 'master' of https://github.com/nolsen42/PrivateBin into nolsen42-master 2017-03-05 11:05:29 +01:00
El RIDO
23b09d601d
credited Tulio for the portuguese translation, updated SRI hashes 2017-03-05 11:02:18 +01:00
El RIDO
d358271451
making unit tests work with spans 2017-03-02 19:44:43 +01:00
Nathaniel Olsen
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
El RIDO
85aa072234
compromise: using spans, but with a class to give them a meaning 2017-02-28 20:11:57 +01:00
El RIDO
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
El RIDO
e880f7924c
Merge branch 'master' into jsrefactor 2017-02-25 07:30:44 +01:00
rugk
52d1be1b54
Fix https://github.com/PrivateBin/PrivateBin/issues/187 2017-02-17 22:26:39 +01:00
rugk
da094e2853
make it work(6): discussion/comments 2017-02-17 20:46:10 +01:00
rugk
7be5206920
makeit work(5): pase cloning & raw button 2017-02-15 22:59:55 +01:00
rugk
a652ab5896
make it work(4): display encrypted pastes
also improved file uploader, better structured
2017-02-14 22:21:55 +01:00
rugk
31e66131b7
make it work(3): allow paste submission 2017-02-13 21:12:00 +01:00
rugk
f33d702f3d
make it work(2): buttons & preview working 2017-02-13 11:35:04 +01:00
rugk
8a07a0b157
make it work(1): paste input can be shown 2017-02-12 21:13:04 +01:00
rugk
dd6e426da7
first round of refactoring
split into modules, moved code around
need to make it work
2017-02-12 18:08:08 +01:00
El RIDO
eedb05111a
added test for getCookie function, documenting its limitation of not finding cookies with empty identifier 2017-02-12 17:11:21 +01:00
El RIDO
b9c05b06d0
added test for sprintf function, removing dead code and optimizing test cases 2017-02-11 19:34:51 +01:00
rugk
dd721c651b
Update SRI hashes
Fixes https://github.com/PrivateBin/PrivateBin/issues/181
2017-02-11 16:19:59 +01:00
El RIDO
b00bcd1352
added test for urls2links function, fixing bug - asterisk is allowed in URLs query string 2017-02-11 16:02:24 +01:00
El RIDO
b992bcc732
added test for setMessage function, fixing bug for elements with only one child 2017-02-11 10:43:00 +01:00
rugk
2ebcf60516
Use revealing module pattern
ala http://www.adequatelygood.com/JavaScript-Module-Pattern-In-Depth.html

Also made the loadTranslations a bit more robust with more error messaged being logged.
2017-02-08 13:20:51 +01:00
rugk
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
rugk
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
rugk
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
El RIDO
4cb0374e11
readding accidentally removed line of #173 2017-02-06 20:16:03 +01:00
El RIDO
2ca2309fc4
Merge branch 'patch-1' of https://github.com/r4sas/PrivateBin into r4sas-patch-1 2017-02-06 19:55:07 +01:00
rugk
86cd5e1c15
Use existing reload function 2017-02-05 22:35:44 +01:00
rugk
edb546de54
Add loading indicator
Fixes https://github.com/PrivateBin/PrivateBin/issues/172
2017-02-05 22:09:46 +01:00
rugk
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
El RIDO
366b61c32d
adding document title in new history state 2017-02-05 18:53:57 +01:00
El RIDO
f699ca6cd4
writing tests for htmlEntities function 2017-02-05 18:46:24 +01:00
El RIDO
5442af6e20
slight JS refactoring 2017-02-05 14:47:03 +01:00
rugk
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
El RIDO
4bbfd5045e
ensure that JS is *really* only initialized after the DOM is fully loaded, resolves #166 2017-01-30 20:29:04 +01:00
El RIDO
b76a73aa06
upgrading showdown 2017-01-29 16:17:56 +01:00
El RIDO
f1df27f46c
allowing for parameter strings starting with & 2017-01-29 15:09:57 +01:00
El RIDO
177c9d7114
Merge branch 'js-unit-testing' 2017-01-29 14:50:31 +01:00
El RIDO
cae5a71151
fix missing class renaming 2017-01-29 14:48:56 +01:00
El RIDO
efcfb80129
Merge branch 'master' of github.com:PrivateBin/PrivateBin 2017-01-29 14:39:34 +01:00
El RIDO
d678f5dada
fixing inconsistency found in unit test 2017-01-29 14:32:55 +01:00
El RIDO
abaf8e96a6
updated page template 2017-01-24 19:27:35 +01:00
Nathaniel Olsen
a005b1128b Updated showdown 2017-01-23 22:49:03 -06:00
Nathaniel Olsen
47e4478e17 Updated sjcl, bootstrap, and the hashes 2017-01-23 22:42:05 -06:00
El RIDO
8029c2819f
implementing JS module pattern to expose functions for unit testing 2017-01-22 10:42:11 +01:00
El RIDO
5f09264625
fixing documentation inconsitencies found by Scrutinizer CI 2017-01-14 16:13:22 +01:00
El RIDO
db2778c64f
introduced JSDoc: changes for JSDoc compatibility and resolving inconsistencies in documentation, both semantic and in the logic 2017-01-14 15:29:12 +01:00
El RIDO
a7de0e095b
added supported language, updated credits and changelog 2017-01-10 20:37:14 +01:00
El RIDO
7f4ed739de
moved images to img folder 2017-01-08 10:13:12 +01:00
El RIDO
67f6c4eb61
turned bootstrap template variants into logic 2017-01-08 10:02:07 +01:00
El RIDO
87fad1fb77
DRYed templates 2017-01-08 09:40:13 +01:00
El RIDO
f79c00378b
Choosing correct Occitan plural formula, added unit tests for Occitan and Chinese, corrected casing of languages in unit test 2017-01-08 07:56:56 +01:00
rugk
20fea819cb
Update SRI hashes 2017-01-07 20:35:47 +01:00
El RIDO
a5d91298ff
add an option to change the site name, solves #154 2017-01-01 16:33:11 +01:00
El RIDO
4a036aea80
updated SRI hashes, added missing formula for slowene plurals and unit test for it, updated credits and changelog 2017-01-01 14:35:39 +01:00
El RIDO
1426d4e371
tagging 1.1 release and updating documentation 2016-12-26 12:13:50 +01:00
El RIDO
1badd5e542
applying HTML entity cleanup to raw paste, too, fixing #137 2016-12-25 13:04:06 +01:00
El RIDO
ecd8a51137
writing a unit test for #145 lead to the discovery of two errors in the polish translations: error in formula and missing number placeholders in the translation strings 2016-12-25 11:37:45 +01:00
r4sas
aacfe8e5fa added a forgotten option 'ru' in supportedLanguages section 2016-12-19 17:26:04 +03:00
atnaguzin
2847bbc45d added ru plural formula, updated template for edited privatebin.js 2016-12-16 12:21:15 +03:00
rugk
90e0bf6058
Merge branch 'tables' 2016-12-14 19:03:58 +01:00
rugk
58bd603c7c
Use nice condensed table with border
and alos clean the prettyMessage even without showdown
2016-12-13 23:30:28 +01:00
rugk
67094022dd
Remove code duplication 2016-12-12 19:29:29 +01:00
rugk
bdf1586539
Add FAQ link & add to all templates 2016-12-12 18:37:54 +01:00
rugk
f755a99ab8
Add table class to parsed Markdown
Fixes https://github.com/PrivateBin/PrivateBin/issues/140
2016-12-12 17:37:51 +01:00
El RIDO
b94d252421
Merge branch 'master' into JSnotWorkingError 2016-11-13 18:30:14 +01:00
El RIDO
3f2de319f3
should use typesafe comparison in JS and adding forgotten modal dialog in bootstrap-dark-page 2016-11-13 18:22:37 +01:00
El RIDO
3f8d6a592b
refactored modal dialog logic, added the new message IDs to all translation files and added the modal dialog to all bootstrap based templates (page gets the old JS input as a fallback) 2016-11-13 18:12:10 +01:00
El RIDO
9dcdb3172c
added translation string to JSON files, removed unneccessary class (already covered by bootstrap CSS) and moved noscript CSS load into head (allowed when not using XHTML) 2016-11-13 12:27:09 +01:00
Alexander Demenshin
1b0095b54a Added localization for modal password dialog 2016-11-13 00:42:52 +01:00
Alexander Demenshin
1c643191ce Updated intergrity hash for privatebin.js 2016-11-12 18:32:39 +01:00
Alexander Demenshin
6544fc8a49 Proper indenting and fix for "label for" 2016-11-12 18:21:33 +01:00
Alexander Demenshin
e8248020dd Updated integrity hash 2016-11-11 18:53:35 +01:00
Alexander Demenshin
c1ca5657b5 Removed unnecessary attributes from modal password form 2016-11-11 18:41:41 +01:00
Alexander Demenshin
0fbeefb199 Added modal decryption password request 2016-11-11 18:28:20 +01:00
rugk
64e1e0d7c4
Merge branch 'master' 2016-10-31 12:20:29 +01:00
rugk
f9149595c9
Change alert to loading info message 2016-10-31 12:20:07 +01:00
El RIDO
375dac759f
renamed jQuery file to match projects JS file naming convention 2016-10-29 12:18:03 +02:00
El RIDO
f093b05330
update jQuery from 1.11.3 to 3.1.1 2016-10-29 12:12:22 +02:00
rugk
7bbb273c1c
Add "JS not working" error message
It is:
* hidden by JS code executed as early as possible
* not hidden by noscript tags, so that it is *not* shown when JavaScript is just no activated

Fix https://github.com/PrivateBin/PrivateBin/issues/103
2016-10-25 21:13:43 +02:00
rugk
5d822af5b1
Regenerate JS hashes & sign commit 2016-10-25 19:03:20 +02:00
Nathaniel Olsen
63a6ecb922 Now using the minimal version of jQuery 2016-10-21 17:06:22 -05:00
Nathaniel Olsen
0a48c464b4 Update jquery 1.11.3 ==> 3.1.1 2016-10-21 10:31:56 -05:00
rugk
1a159c973f
Prevent referrer to be send
Uses both CSP and Referrer-Policy
Fixes #96
2016-09-03 18:12:24 +02:00