Commit Graph

1037 Commits

Author SHA1 Message Date
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
0493cf4463
Merge branch 'aldem-modal-decryption-password' 2016-11-13 18:12:47 +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
f7feff50d8
Merge branch 'aldem-modal-decryption-password' of https://github.com/aldem/PrivateBin into aldem-aldem-modal-decryption-password 2016-11-13 12:54:39 +01:00
El RIDO
c2aa931392
updated changelog and fixed missing translation and CSS change 2016-11-13 12:38:55 +01:00
El RIDO
70482a4fc0
Merge branch 'master' into JSnotWorkingError 2016-11-13 12:30:11 +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
El RIDO
f49927712a
updated documentation and credits 2016-11-13 11:01:51 +01:00
Alexander Demenshin
71a94271a7 Added German translations for modal password dialog 2016-11-13 00:44:49 +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
2c8a780c74 Removed unreachable code 2016-11-12 18:30:42 +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
c916f33a83 More js for modal password request 2016-11-11 18:46:44 +01:00
Alexander Demenshin
c1ca5657b5 Removed unnecessary attributes from modal password form 2016-11-11 18:41:41 +01:00
Alexander Demenshin
09fa46a651 Added relevant js to modal password form 2016-11-11 18:39:38 +01:00
Alexander Demenshin
0fbeefb199 Added modal decryption password request 2016-11-11 18:28:20 +01:00
rugk
bfe595e1a1
Merge branch 'master' of https://github.com/PrivateBin/PrivateBin 2016-11-08 16:56:16 +01:00
rugk
3b1eb64386
Update random_compat to v2.0.4 2016-11-08 16:52:43 +01:00
El RIDO
d6c445092f
Merge branch 'styleci' 2016-11-01 06:30:37 +01:00
El RIDO
8619f4248b
Merge branch 'master' into styleci 2016-11-01 06:29:33 +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
rugk
f628ac78f8
Fix style of operator spaces 2016-10-31 11:32:12 +01:00
rugk
b4293f5467
Add missing fixers from PHP CS
Also adjust editorconfig and order php-cs.
2016-10-31 11:29:25 +01:00
El RIDO
bd30ae419a
Merge branch 'nolsen42-master' 2016-10-29 12:24:25 +02: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
El RIDO
1f46823942
applying patch based on StyleCI ruleset 2016-10-29 10:24:08 +02:00
El RIDO
c8b1296929
add adjusted StyleCI ruleset 2016-10-29 10:19:09 +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
El RIDO
b80665cc45 Merge pull request #121 from stefanomarty/Italian-translation
Italian translation
2016-10-23 21:58:31 +02:00
stefanomarty
af824bbcd6 Update privatebin.js
Added 'it' supported language.
2016-10-23 11:28:04 +02:00
stefanomarty
a714272286 Create it.json
Created Italian translation.
2016-10-23 11:25:38 +02:00
Nathaniel Olsen
3eea03954a Forgot to delete this 2016-10-22 09:47:40 -05:00
El RIDO
eb77a01322 Merge pull request #113 from PrivateBin/bettercredits
Renew credits
2016-10-22 08:35:58 +02:00
Nathaniel Olsen
176d683d1c Forgot to add the file using git 2016-10-21 17:07:55 -05:00
Nathaniel Olsen
63a6ecb922 Now using the minimal version of jQuery 2016-10-21 17:06:22 -05:00
rugk
8619210c33
Add note for reproduction on official site
This should make sure, users try to reproduce the issue on the official domain.
2016-10-21 22:14:44 +02:00
Nathaniel Olsen
0a48c464b4 Update jquery 1.11.3 ==> 3.1.1 2016-10-21 10:31:56 -05:00
Nathaniel Olsen
5639042d12 Update jquery 1.11.3 ==> 3.1.1 2016-10-21 10:31:09 -05:00
rugk
bc9bb7eeca
Remove old backup 2016-10-17 21:14:12 +02:00
rugk
c7c82c8305
Update random_compat
New release: v2.0.3 - https://github.com/paragonie/random_compat/releases/tag/v2.0.3
2016-10-17 21:12:13 +02:00
rugk
f5813c959c
Fix typo 2016-10-12 18:59:18 +02:00
rugk
cc637bd3f3
Renew credits
Split in active contributors & old contributors.
2016-10-12 18:26:57 +02:00
rugk
efffeddc25
Merge branch 'master' of https://github.com/PrivateBin/PrivateBin 2016-09-18 12:23:07 +02:00
rugk
2cd4717bd2
Use default csp value by default
Otherwise the CSP may break updates if we later change the behaviour of PrivateBin somehow.
We should have done this before the v1.0 release, but well...
2016-09-18 12:21:42 +02:00