Commit Graph

843 Commits

Author SHA1 Message Date
El RIDO
89f697fe5d Merge pull request #101 from rugk/editorconfig
Add editorconfig file
2016-07-03 17:27:29 +02:00
rugk
6f84cbc58b Add editorconfig file 2016-07-03 14:21:05 +02:00
rugk
a5730b701c Revert order change
According to Wikipedia this is indeed right.. https://en.wikipedia.org/wiki/Robots_exclusion_standard#Allow_directive

Then there are only many wrong examples out there.
2016-07-03 13:09:47 +02:00
rugk
0567a720fd Change order of allow rule in robots.txt
I think this is the proper order. Don't know if it matters, but it is not bad to change it in any case.
2016-07-03 13:05:26 +02:00
El RIDO
a712babb96 Merge pull request #99 from Sobak/patch-1
Update Polish translation
2016-07-02 15:00:35 +02:00
Sobak
ba5299a393 Improve plural forms 2016-07-02 10:17:09 +02:00
Sobak
5cbc86572a Update Polish translation 2016-07-02 07:16:32 +02:00
El RIDO
00a42bed99 working on design issue, resolves #82, resolves #94 2016-06-24 10:53:46 +02:00
El RIDO
46d32948f1 Merge pull request #95 from elrido/rugk-permissions
Set permissions when saving files
2016-06-23 16:10:27 +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
rugk
cc597f6e32 Merge pull request #1 from elrido/master
update from upstream
2016-06-22 19:19:00 +02:00
rugk
fd5a7a07ae Soft fail for chmod errors 2016-06-22 18:08:25 +02:00
rugk
54f1cb9d34 Only protect file if it was written 2016-06-21 21:47:03 +02:00
rugk
8a48e9ce78 Set permissions when saving files
Fixes https://github.com/elrido/ZeroBin/issues/80
2016-06-21 17:18:11 +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
El RIDO
631d26d0e9 Merge pull request #93 from rugk/patch-1
Force line breaks for long URL
2016-06-19 12:42:34 +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
e89a8b6898 fixing deprecations with newer phpunit versions 2016-05-22 18:35:07 +02:00
El RIDO
1158c81259 only mock mcrypt if it isn't installed 2016-05-22 17:17:09 +02:00
El RIDO
67133ec090 adding support for Travis CI 2016-05-22 17:09:00 +02:00
El RIDO
1625aac798 updating showdown library, adding support for tables and strikethrough,
fixing issue with double escaping HTML entities that was causing
blockquotes to be ignored, fixes #75
2016-05-22 16:18:57 +02:00
El RIDO
7f2fd4d980 compiling license file, resolves #85 2016-05-21 09:18:00 +02:00
El RIDO
450259dc5b added credit for chinese translation 2016-05-21 09:16:17 +02:00
El RIDO
4a7547370e incrementing version 2016-05-21 09:15:52 +02:00
El RIDO
6a2cec39cf Merge pull request #76 from rugk/patch-1
Missing space
2016-05-14 10:59:03 +02:00
rugk
1a1818660d Missing space 2016-05-12 20:07:58 +02:00
El RIDO
3ec7002f63 Don't strip space characters of beginning or end of password, while
still ignoring passwords consisting of just spaces, resolves #69
2016-04-26 20:41:15 +02:00
El RIDO
ff3154316c Sometimes simple solutions are the cleanest. Resolves #51, resolves #72. 2016-04-26 20:32:48 +02:00
El RIDO
4918bef4dc Although there usually are no plurals in chinese, there's an exception
for words related to persons, when not preceeded by a numeric word.

Sources:
- http://localization-guide.readthedocs.org/en/latest/l10n/pluralforms.html#f3
- https://answers.yahoo.com/question/index?qid=20110606153553AAAW5zX
2016-04-26 20:21:30 +02:00
Jiawei Zhou
4565b72a7d Adding Chinese Translation (#73) 2016-04-26 20:08:35 +02:00
El RIDO
3a92c940a9 implementing media type negotiation (based on language negotiation
logic) in cases both JSON and (X)HTML are being requested, resolving #68
2016-04-08 23:29:44 +02:00
El RIDO
9593ba7039 Merge pull request #63 from squarefractal/htaccess-work
Add a (disabled by default) .htaccess file to block out robots and other link scanning agents.
2016-02-17 12:23:50 +01:00
squarefractal
b90260a0e1 Add a (disabled by default) .htaccess file to block out robots and other link scanning agents. 2016-02-16 17:36:28 +05:30
El RIDO
59d2b6f9fc Merge pull request #59 from rugk/patch-1
Fix typo in Readme
2016-02-03 12:51:12 +01:00
rugk
8c0ad21283 Fix typo in Readme
It's HPKP 😄
2016-02-03 00:33:50 +01:00
El RIDO
a4ebdbc606 re-introducing (optional) URL shortener support, resolves #58 2016-01-31 09:56:06 +01:00
El RIDO
d510e861d2 Added credits for Slovenian translation, resolving sebsauvage/ZeroBin#102, thank you Filip! 2015-12-26 22:25:01 +01:00
El RIDO
a459c6d836 translated to slowene
Conflicts:
	js/zerobin.js
2015-12-26 22:14:10 +01:00
El RIDO
09dd79dbc7 switching to SHA256 HMAC of IPs in traffic limiter, resolves #57 2015-12-22 20:58:23 +01:00
El RIDO
deda8e4783 Merge pull request #57 from kolobus/master
Hash instead of IP in traffic limiter
2015-12-22 20:47:44 +01:00
Mihail Fedorov
a13ad6368f MD5 instead of IP 2015-12-22 06:02:41 +03:00
El RIDO
6b3ad32665 Updated credits and changelog 2015-11-29 18:23:38 +01:00
Adam Fisher
0997520c1d Add favicon
Conflicts:
	tpl/page.html
2015-11-29 17:50:50 +01:00
El RIDO
2dc4422a27 separating the dark bootstrap theme in to two variants regarding the
new/send button placements
2015-11-16 20:06:06 +01:00
El RIDO
3fe7e77390 added changelog entry for #55 fix 2015-11-16 20:05:08 +01:00
El RIDO
ce107c928e supporting disabled password option in the JS part, fixes #55 2015-11-16 19:58:45 +01:00
El RIDO
24a4328c55 incrementing version, updating changelog, added missing phpdoc comments 2015-11-09 21:39:42 +01:00