Commit Graph

46 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
rugk
7f3339def0 Revert darkstrap css change 2016-08-01 15:34:30 +02:00
rugk
065af6c26c Improve icon display 2016-07-31 23:09:11 +02:00
rugk
38ab755733 Replace HTTP links with HTTPS
Using this regexp: https://regex101.com/r/rZ2dE2/1
2016-07-19 13:56:52 +02:00
El RIDO
79509ad48a renaming the fork to PrivateBin 2016-07-11 11:58:15 +02:00
El RIDO
6a663ba07f adding preview feature, resolves #4 2016-07-11 11:09:41 +02:00
El RIDO
00a42bed99 working on design issue, resolves #82, resolves #94 2016-06-24 10:53:46 +02:00
rugk
8360db7f45 Add space for left button too (#96)
I don't add the margin to the button as default-btn is also used when such a margin is unnecessary
2016-06-22 19:39:30 +02:00
El RIDO
6bb81d779e Merge pull request #94 from rugk/patch-2
Fix language menu appearing outside of screen
2016-06-19 12:43:36 +02:00
rugk
03730f48a1 Language button was too close to the Send button 2016-06-18 19:30:07 +02:00
rugk
3924790864 Fixes https://github.com/elrido/ZeroBin/issues/82
However it of course does not look nice in cases where #82 does not appear (e.g. on the front page where there is the "Send" button right of the language menu)
2016-06-18 19:24:01 +02:00
rugk
82f4ace5e3 Add break of URL for mobile mode
(now really, ...)
2016-06-18 19:06:05 +02:00
rugk
6ca30a7472 Force line breaks for long URL
This fixes a display issue in mobile view where the long URL was outside of the window...
2016-06-18 19:03:33 +02:00
El RIDO
24a4328c55 incrementing version, updating changelog, added missing phpdoc comments 2015-11-09 21:39:42 +01:00
El RIDO
9d27e7a65d added dark bootstrap theme, resolving #47 2015-10-31 20:56:55 +01:00
El RIDO
9f68658106 incrementing version number, updating changelog 2015-09-21 22:43:00 +02:00
El RIDO
0686087cfd fixing mobile navbar triggered issue and slight adjustement to bootstrap
template for using full width of browser for navbar
2015-09-20 20:05:48 +02:00
El RIDO
608605cd54 incrementing version number, updating docs 2015-09-19 17:23:10 +02:00
El RIDO
a41d0ca4dd various fixes:
- changing default formatter option to plain text to make upgrading from
  0.19 Alpha smoother
- fixing translation message change in bootstrap templates
- adjusting how image uploads are displayed in bootstrap templates
2015-09-19 14:22:29 +02:00
El RIDO
39e865ca64 if the uploaded file is an image mime type, display it 2015-09-18 21:41:50 +02:00
El RIDO
9274564162 intermediate step for #28: revert bootstrap template, but ensuring that
the navbar does not overlap by removing its float on top property.
bootstrap-compact is now the template with the floating & always visible
navbar.
2015-09-18 09:31:17 +02:00
El RIDO
f25661beda Working on #28, changing template to avoid multi-line navbar:
- moved "burn after reading" & "discussion" into "options" menu in
"bootstrap" template
- added seperate "bootstrap-compact" template that also moves the
  formats into the same "options" menu
- fixing horizontal scroll bar glitch in mobile navbar
2015-09-17 21:55:28 +02:00
El RIDO
be8883d10e resolving nav bar becoming 3 lines between medium and small screen sizes
before mobile nav is toggled by changing @grid-float-breakpoint to
@screen-md (Point at which the navbar becomes uncollapsed) in bootstrap
for #21.
2015-09-12 10:07:59 +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
El RIDO
a2af88a36e initial work on translations, covering the PHP side of it 2015-09-05 02:24:56 +02:00
El RIDO
2d79ba8243 updating docs, bumping version to 0.20 2015-09-03 22:22:59 +02:00
El RIDO
259ca3c55f bootstrap theme should display the textarea as monospaced text, too 2015-08-23 18:07:38 +02:00
Simon Rupf
a34cc562e1 optimized bootstrap comment layout 2015-08-23 15:52:25 +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