Commit graph

319 commits

Author SHA1 Message Date
El RIDO
b883d5eb4c Merge branch 'master' of git@github.com:elrido/ZeroBin.git
Conflicts:
	js/zerobin.js
2015-09-05 17:21:05 +02:00
El RIDO
3099e10dfa refactored JS:
- moved from global namespace into anonymous function
- as onclick has no direct access to the zerobin methods, the events are
now bound in the init() method via bindEvents()
- to simplify maintenance, the functions were wrapped into 3 objects:
zerobin (display logic, event handling), filter (compression,
encryption) and helper (stateless utilities)
- some CSS and template adjustements were also done
2015-09-05 17:12:11 +02:00
Hexalyse
d74172064b Hide error message when paste is posted correctly 2015-09-05 14:45:50 +02:00
Hexalyse
9687144c92 Error messages are now replaced and not appended
Error messages are now replaced and not appended in the #errormessage div, without removing the glyphicon (which a .text() would have done).
This way, we don't have HTML code in the JS (which would be ugly). But it's still not a really elegant solution.
2015-09-05 14:38:53 +02:00
El RIDO
a2af88a36e initial work on translations, covering the PHP side of it 2015-09-05 02:24:56 +02:00
El RIDO
28776ac178 formatting RainTPL class 2015-09-05 01:55:19 +02:00
El RIDO
3edeefd799 change project homepage link in templates 2015-09-03 23:51:42 +02:00
El RIDO
411419d597 adding tests and unifying paste creation output 2015-09-03 22:55:36 +02:00
El RIDO
2d79ba8243 updating docs, bumping version to 0.20 2015-09-03 22:22:59 +02:00
El RIDO
5dacd409ee Merge pull request #18 from Hexalyse/patch-1
Updated README.md to explain password feature
2015-09-02 20:24:13 +02:00
Hexalyse
143be83426 Updated README.me to explain password feature 2015-09-02 14:07:31 +02:00
El RIDO
602fc4705e change for API consistency 2015-09-01 23:51:31 +02:00
El RIDO
b25022e403 refactored JSON API, its now possible to retrieve pastes as JSON, which
is now used when posting comments, eliminating the need to store the
password in sessionStorage
2015-09-01 22:33:07 +02:00
El RIDO
ded24b43ab Merge pull request #17 from Hexalyse/master
Display default paste expiration time
2015-09-01 18:52:20 +02:00
Hexalyse
9611e0ec4f The default expiration time of the paste is now also displayed before we select an expiration time. 2015-09-01 14:19:03 +02:00
El RIDO
802a0b26b9 burn after reading messages are only deleted after callback by JS when
successfully decrypted, resolves #11
2015-08-31 22:10:41 +02:00
El RIDO
9fdbba76ce working on password function for #15:
- asking again if password is wrong
- display error if user cancels dialog
- use password to encrypt comments, too (password is "stored" in the
password field)
- store password in sessionStorage when posting a comment so, that it
doesn't have to typed in again, but clear sessionStorage as soon as
password is retrieved
2015-08-31 21:14:12 +02:00
El RIDO
d3c4600806 slight configuration changes, template modifications to make discussions
and password configurable, removed generated configuration test as it
grows quite big and a new one can be generated easily if needed
2015-08-31 00:01:35 +02:00
Hexalyse
0198371049 Password input id change in zerobin.js 2015-08-30 15:06:32 +02:00
Hexalyse
eadcd60e14 Password input id change in zerobin.js 2015-08-30 15:05:50 +02:00
Hexalyse
1009491721 Fixed bug of password input not displaying on bootstrap theme 2015-08-30 14:46:43 +02:00
Hexalyse
f2532f8310 Changed ids in HTML 2015-08-30 14:44:46 +02:00
Hexalyse
2c8f5a0566 Added password field on bootstrap theme 2015-08-30 14:43:01 +02:00
Hexalyse
fa273a3429 Added password field on bootstrap theme 2015-08-30 14:36:40 +02:00
Hexalyse
95f1db925b Merge branch 'master' of https://github.com/elrido/ZeroBin
Conflicts:
	cfg/conf.ini
	js/zerobin.js
2015-08-30 14:33:09 +02:00
El RIDO
2d0668af03 concluding work on configuration test generator for #16. Replaced a few
die()s in the code with Exception, making it possible to test properly.
Fixed some outdated unit tests.
2015-08-29 20:29:14 +02:00
El RIDO
99dbb22e21 refining configuration test generator, now supporting conditions on
tests (i.e. if syntax highlighting is false, highlighting should never
be loaded)
2015-08-29 10:41:10 +02:00
El RIDO
1c4d1aa6b6 working on configuration unit test generator as described in #16 2015-08-29 01:26:48 +02:00
El RIDO
ae82e84ef8 correcting php doc comments 2015-08-27 23:58:56 +02:00
El RIDO
be91afa042 - fixing JS errors when syntax highlighting is disabled (point 1. #15)
- fixing missing url conversion in highlighted text (point 2. # 15)
2015-08-27 23:58:28 +02:00
El RIDO
d57d6cf44b created initial unit tests for main zerobin class 2015-08-27 23:30:35 +02:00
El RIDO
f775da3931 fixing nasty deletion bug from #15, included unit tests to trigger it
and reworked persistence classes to through exceptions rather to fail
silently
2015-08-27 21:41:21 +02:00
El RIDO
d042bb41ba Updated README with a security notice as mentioned in issue #13 2015-08-23 18:09:34 +02:00
El RIDO
3306bcff99 switch to bootstrap theme by default 2015-08-23 18:08:45 +02:00
El RIDO
259ca3c55f bootstrap theme should display the textarea as monospaced text, too 2015-08-23 18:07:38 +02:00
El RIDO
aa3eba9b1f Merge branch 'master' of https://github.com/elrido/ZeroBin 2015-08-23 15:55:03 +02:00
Simon Rupf
a34cc562e1 optimized bootstrap comment layout 2015-08-23 15:52:25 +02:00
Simon Rupf
c78e1fc3db optimized bootstrap comment layout 2015-08-23 15:49:51 +02:00
Hexalyse
da7ffc5d07 Changed css 2015-08-22 22:46:35 +02:00
Hexalyse
8c519db877 changed some font sizes 2015-08-22 17:40:26 +02:00
Hexalyse
2aa71708e2 Corrected display of password field 2015-08-22 17:27:43 +02:00
Hexalyse
89bfc2ffe0 Merge remote-tracking branch 'origin/master' 2015-08-22 17:24:03 +02:00
Hexalyse
3b537eda40 Added an optional password protection 2015-08-22 17:23:41 +02:00
Hexalyse
02964aa936 changed button color when Open discussion is disabled 2015-08-22 17:01:14 +02:00
Hexalyse
d600ae7319 Changed text size of about box for readability 2015-08-22 16:54:37 +02:00
Hexalyse
f2912a07b0 Changed config to use SQLite 2015-08-22 16:43:02 +02:00
El RIDO
b299a6e03e added a bootstrap theme, still needs some work in the comments layout 2015-08-17 23:19:15 +02:00
El RIDO
cb28056223 made highlighting more configurable, added all four themes, there is now a configurable flavour text (notice) 2015-08-17 23:18:33 +02:00
El RIDO
24d18c5313 cleaned up phpdoc comments, added README on how to install and use it 2015-08-16 15:55:31 +02:00
El RIDO
3a183470a6 included sons of obsidian prettify template, since the new default one is a bit bleak 2015-08-16 15:52:46 +02:00