chalec
/
ctrlv-privatebin
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
742 Commits 2 Branches 0 Tags 13 MiB
Commit Graph

742 Commits

Author SHA1 Message Date
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 63b0b050c3
Merge branch 'r4sas-patch-1' 2017-02-06 19:57:09 +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
El RIDO 27c4d6c2cc
Merge branch 'historyupdate' 2017-02-06 19:37:11 +01:00
R4SAS 0af8bd73ad Update ru.json 
Translated new string "Uploading paste… Please wait."
 2017-02-06 20:42:37 +03: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 5c603d0978
Improve comment 2017-02-05 21:35:28 +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 67f71f4dd6
writing tests for pageKey function, fixing always added padding bug 2017-02-05 18:03:42 +01:00
El RIDO a97b94640e
writing test for pasteId function 2017-02-05 16:58:58 +01:00
El RIDO 80f7baa604
writing test for scriptLocation function, fixing non-removed query separator bug 2017-02-05 16:45:11 +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
rugk afdfcba304
Merge branch 'master' of https://github.com/PrivateBin/PrivateBin 2017-02-01 18:36:05 +01:00
rugk 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
El RIDO 920f02e43d
fixing composer package versions, thanks @jelhan (#84) 2017-01-30 20:36:38 +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 368aa2305b
removing unused pieces of code (legacy?), resolves #165 2017-01-29 16:19:12 +01:00
El RIDO b76a73aa06
upgrading showdown 2017-01-29 16:17:56 +01:00
El RIDO 339ab5e380
ignoring composer.lock, so it isn't accidentally checked in (again) 2017-01-29 15:11:04 +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 fdef8bc5be
starting to work on JSVerify & Mocha based unit tests for our JS code base 2017-01-29 14:31:44 +01:00
rugk 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
El RIDO 4a7a3ab76d
Merge branch 'nolsen42-master' 2017-01-24 19:28:18 +01:00
El RIDO abaf8e96a6
updated page template 2017-01-24 19:27:35 +01:00
Nils Kenneweg 81fd971777
fix exports missing in SOURCES list 
(cherry picked from commit 63eed58b9dc395afb3c03df8d70d7e7bf4c88b1b)
 2017-01-24 19:23:00 +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
Nathaniel Olsen c5f7c1a3c9 Progress on updating bootstrap 2017-01-23 22:24:24 -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 151005e6b8
imported changes from the wiki by @Based-Skid and @rugk 2017-01-14 15:32:14 +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
rugk b06dfa2f07 Merge pull request #162 from idarlund/patch-3 
Update no.json
 2017-01-11 15:53:54 +01:00
idarlund 6c523b31aa Update no.json 2017-01-11 15:22:16 +01:00
idarlund 9acb121e67 Update no.json 
missbruker should be misbruker
 2017-01-11 15:19:40 +01:00
El RIDO d6fd2b0e89
updated norwegian translation to new translation file convention 2017-01-10 20:43:49 +01:00
El RIDO 2e8412dbaa
Merge branch 'idarlund-norwegian-translation' 2017-01-10 20:38:13 +01:00
El RIDO a7de0e095b
added supported language, updated credits and changelog 2017-01-10 20:37:14 +01:00
El RIDO 4a49613b47
improvements suggested by @atluxity 2017-01-10 20:28:15 +01:00
idarlund fd2cd29267 Create no.json 
norwegian translation first commit
 2017-01-10 14:56:21 +01:00