Commit graph

19 commits

Author SHA1 Message Date
El RIDO
2c82279292
Merge branch 'attachment-handling' of https://github.com/thororm/PrivateBin into thororm-attachment-handling
apart from resolving conflicts:
- added missing docs
- inlined functions that were used in only one location
- updated unit test to support all previews
- fixed a regression that displayed the preview even when there was no preview and too early
2018-04-29 11:57:03 +02:00
rugk
414ab0eb71
Add config and basic page template support
* load JS file asyncronously (just HTML5 async attribut)
* add basic support for page template, where it generates the code inside
  of a simple div at the top
* added option to turn off QR code support
2017-12-25 14:59:15 +01:00
rugk
7bf5af761b
Add QR code generation when paste is created 2017-11-26 15:59:12 +01:00
El RIDO
6fa2bfe30e
updated documentation, incremented version 2017-10-08 16:40:51 +02:00
thororm
096f07f86e Merge branch 'master' into attachment-handling
# Conflicts:
#	js/privatebin.js
#	tpl/bootstrap.php
#	tpl/page.php
2017-04-02 13:30:52 +02: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
85aa072234
compromise: using spans, but with a class to give them a meaning 2017-02-28 20:11:57 +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
thororm
faf596aeb7 Added preview for
- Video (HTML5)
- Audio (HTML5)
- PDF (Browser capabilities)
attachment.
Added drag & drop functionality
Added attachment preview to preview before submitting
2017-02-12 15:35:37 +01:00
El RIDO
1426d4e371
tagging 1.1 release and updating documentation 2016-12-26 12:13:50 +01:00
El RIDO
e925833090 bumping version number to 1.0 2016-08-25 09:53:31 +02:00
rugk
5621f32752 Readd icon instead of logo for header
Continues #87
2016-08-21 16:51:54 +02:00
rugk
869ec0683e Add margin for all nav elements 2016-08-12 17:03:08 +02:00
rugk
eee2505a03 PR #56 was broken
This fixes the display now finally.
2016-08-10 20:20:36 +02:00
El RIDO
fc677b8e95 added missing CSS for buttondisabled class to bootstrap templates, resolves #11 2016-08-09 15:06:21 +02:00
rugk
5296659014 Update privatebin.css 2016-08-02 11:02:19 +02:00
rugk
a094c2153c Add changes to bootstrap CSS 2016-08-02 11:01:33 +02:00
El RIDO
79509ad48a renaming the fork to PrivateBin 2016-07-11 11:58:15 +02:00
Renamed from css/bootstrap/zerobin.css (Browse further)