Commit Graph

244 Commits

Author SHA1 Message Date
El RIDO c72932d653 Merge pull request #29 from Draky50110/patch-1
Update FR
2015-09-17 22:27:21 +02:00
Gilles 895df63206 Update FR
Mistakes / missing translations
2015-09-17 22:24:18 +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 ec8851e46c support < 0.21 syntax highlighting 2015-09-17 20:47:00 +02:00
El RIDO 106141efa4 merging @vikstrous file upload feature for #20 from
8a6d268278
2015-09-16 22:51:48 +02:00
El RIDO 61903665df logic cleanup 2015-09-16 20:49:28 +02:00
El RIDO 0e53d1ee86 added markdown support and a dropdown for the format selection. The
options other then markdown are plain text and source code (syntax
highlighting). Resolves #25
2015-09-12 17:33:16 +02:00
El RIDO 9dde7f034a moving remaining time / for your eyes only message from nav bar into
status alert in bootstrap theme, to ensure it is seen even with a
collapsed nav bar as in the mobile view
2015-09-12 10:38:04 +02:00
El RIDO 428a9d9c41 toggling mobile nav bar after tap on buttons "New", "Clone" and "Send"
to ensure any messages are visible for #21.
2015-09-12 10:23:12 +02:00
El RIDO da42968d7c "New" button became untapable in the mobile nav bar. Now it looks a bit
more ugly (it is at the end of the menu) but at least can be tapped on
again.
2015-09-12 10:10:30 +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 b26fb08732 Fixing issues with en translation, thanks @wware for spotting it 2015-09-08 20:48:18 +02:00
El RIDO 588e01fbec Merge branch 'master' of git@github.com:elrido/ZeroBin.git
Conflicts:
	i18n/fr.json
2015-09-06 19:23:43 +02:00
El RIDO b060d57524 - implemented php side of plural translation
- using it to generate labels dynamically for the expire options
(deprecating the [expire_labels] configuration).
- added translation of the human readable data sizes to support the
french octet
- fixed IEC label for kibibytes
2015-09-06 19:21:17 +02:00
Hexalyse 2f15d4c70a Missing double quote that broke the app !
"NEVER edit directly on Github" should be my new motto. The color highlighting didn't show the missing " !
2015-09-06 16:06:48 +02:00
Hexalyse 108cf69f8b Translated the added phrases
I chose to remove the word "extrait" which sounded weird, and use the English word "paste", because I really can't figure out a correct translation of this word.
2015-09-06 16:04:17 +02:00
El RIDO c83ba8256f implementing a plural translation solution, currently only the JS part 2015-09-06 15:54:43 +02:00
El RIDO eee7b0144a covering JS side of translations (#7), added the messages to the
translation files and translated the german ones
2015-09-06 13:07:46 +02:00
El RIDO 5e47feb7e1 Merge pull request #24 from Gabbalo/patch-1
Update de.json
2015-09-06 09:24:03 +02:00
El RIDO 9a370d33ea Merge pull request #23 from marsjaninzmarsa/patch-1
Added Polish translation due to #7.
2015-09-06 09:22:28 +02:00
Gabriel 9ac9f9e1a7 Update de.json
Replaced "Schnipsel" with "Text" ans some other imo better choices for words. Also correction of punctuation errors.
2015-09-06 07:30:45 +02:00
Kuba Niewiarowski 952f8b7b9a Added Polish translation due to #7. 2015-09-06 04:26:40 +02:00
Hexalyse 18f32f3625 Translated a missing sentence in fr.json 2015-09-05 18:16:20 +02:00
Hexalyse 72ace70b04 Error in de translation header : "de" => "fr" 2015-09-05 18:11:20 +02:00
Hexalyse ce331e8271 French translation.
I did a very quick French translation. Some errors may have stayed unseen.

Also, I didn't know how to translate "paste", so I chose "extrait". But I hesitated with "document".
Do not hesitate to contribute
2015-09-05 18:10:23 +02:00
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