Commit graph

357 commits

Author SHA1 Message Date
Martin Mahner
40d044e424 Merge remote-tracking branch 'origin/master' into i18n
Conflicts:
	dpaste/forms.py
2014-10-25 12:14:36 +02:00
Martin Mahner
cdd20df09d Merge pull request #65 from welshjf/doc_fixes
Doc typo fixes
2014-10-25 12:13:47 +02:00
Martin Mahner
d014c4df3f DEBUG is now False by default. 2014-10-25 12:09:06 +02:00
Martin Mahner
1185b5128b Updated german language. 2014-10-25 12:08:58 +02:00
Martin Mahner
8683c4c30d Further language cleanup. 2014-10-25 12:08:11 +02:00
Sergio Oliveira
dce3d6b9bd Fixed typo 2014-10-20 12:15:37 -02:00
Sergio Oliveira
ae2de8ef9c Fixed typo 2014-10-20 12:15:37 -02:00
Sergio Oliveira
7f602f60cd Fixed typo 2014-10-20 12:13:03 -02:00
Martin Mahner
832645f129 First pass of a German language. 2014-10-17 08:43:44 +02:00
Sergio Oliveira
434aeed6d1 Updated i18n strings 2014-10-16 09:27:17 -03:00
Marco Rougeth
ca75059f10 Add pt_BR translations 2014-10-16 09:27:08 -03:00
Martin Mahner
99a3fcd361 Merge pull request #66 from welshjf/site_settings
New settings for private installations
2014-10-02 05:16:29 +02:00
Jacob Welsh
85a02edb8f New settings for private installations
- The site name in the titles and "about" page can be changed from
  dpaste.de
- The Gist feature can be disabled (both the UI and the code that does
  the POST)
- A different URL can be given for jquery(.min).js besides google, such
  as beside the local static files
2014-10-01 19:31:28 -05:00
Jacob Welsh
fa95dc64e8 Fix non-readthedocs sphinx build
Note, this means you have to set the environment variable
READTHEDOCS=True to use the RTD theme, which appears to have been the
intent.
2014-09-30 15:36:37 -05:00
Jacob Welsh
bdd29df7c7 Fix DPASTE_SLUG_CHOICES alphabet in documentation 2014-09-30 15:34:48 -05:00
Martin Mahner
66203c18fe Fixed misleading doc typo 2014-08-02 13:10:49 +02:00
Martin Mahner
dc54b35749 Prepared for next release. 2014-08-02 13:08:15 +02:00
Martin Mahner
22e095279d Updated changelog. 2014-08-02 12:57:08 +02:00
Martin Mahner
e729ac1a46 Updated Django versions used for testing. 2014-08-02 12:56:59 +02:00
Martin Mahner
ac87dac3cc Added unittests for the xss bug. 2014-08-02 12:56:46 +02:00
Martin Mahner
e74d456272 Merge branch 'master' of github.com:bartTC/dpaste 2014-08-01 21:33:37 +00:00
Martin Mahner
497e5f0c28 Fixed XSS bug, 'code' lexer syntax were not escaped properly. 2014-08-01 20:56:58 +00:00
Martin Mahner
fc9529572b Added a note that you have to disable ‚lexer‘ to use ‚filename‘.
Might be good to rethink the logic here.
2014-06-09 20:21:26 +02:00
Martin Mahner
9768ab9573 Added Dev Changelog 2014-06-09 20:19:07 +02:00
Martin Mahner
3bc2eb0c84 Add support to set a lexer with a given filename. Closes issue #63.
This allows third-party API utils to set the lexer automatically based on the open filename.
2014-06-09 20:18:08 +02:00
Martin Mahner
fbe6aeedb7 Split testcases so we dont rely on a DB order. 2014-06-09 20:04:39 +02:00
Martin Mahner
be724756b9 Changelog update and 2.6 Release 2014-06-08 20:31:51 +02:00
Martin Mahner
5c0012b3dd Removed Recent Changes. 2014-06-08 20:27:40 +02:00
Martin Mahner
0b50fd9bd1 No „View Raw“ button when viewing a one-time snippet, since it was already deleted at this time. Closes issue #62. 2014-06-08 20:25:11 +02:00
Martin Mahner
ae61e6f9aa Added settings docs for Gist changes made in issue #58. 2014-06-08 20:21:59 +02:00
Marco Rougeth
9f1650693b Add support to tzinfo 2014-06-08 20:16:58 +02:00
Martin Mahner
34181e03f7 Added a API value to set the expire time of snippets. Closes issue #64. 2014-06-08 20:15:59 +02:00
Martin Mahner
afafd4fb3b The expiration choice ‚never‘ is now enabled by default. 2014-06-08 20:09:36 +02:00
Martin Mahner
3944c4db90 Merge pull request #58 from interlegis/master
Fixing TypeError when creating gist
2014-05-05 08:10:27 +02:00
Marco Rougeth
f7e954491c Abstracting Gist's options 2014-05-05 00:02:54 -03:00
Marco Rougeth
f094e72788 Fixing TypeError when creating gist 2014-05-04 23:52:37 -03:00
Martin Mahner
6f0481a055 Merge pull request #56 from interlegis/master
Add bootstrap3 support
2014-05-02 20:40:54 +02:00
Marco Rougeth
8c7b752f7e Add bootstrap3 support 2014-05-02 00:59:23 -03:00
Martin Mahner
1d7ba5a417 Usage update. 2014-04-12 11:33:41 -04:00
Martin Mahner
fa5c752ab9 Slightly simpler and cleaner API example. 2014-04-12 11:32:26 -04:00
Martin Mahner
8ebd3d1a82 Fixed indentation in about example. 2014-04-12 11:17:36 -04:00
Martin Mahner
c70a3e7146 Changelog Update 2014-04-12 11:04:13 -04:00
Martin Mahner
550ad5a908 The 'code' lexer renders code snippets with no highlights now. 2014-04-12 11:01:09 -04:00
Martin Mahner
05d9da53ed Minor fixes for installation docs. Closes issue #45. 2014-04-12 10:46:49 -04:00
Martin Mahner
76faf7fe9b Merge pull request #49 from kulbir/issue-45
added installation docs - #45

Thank you!
2014-04-12 10:19:58 -04:00
Martin Mahner
0a3e2b5082 Fixed duplicate slugs.
Before a slug could get generated again, which threw an error since it was not unique, but treated as a kind of primary key.

Now if the same slug gets generated again, we generate one other slug with one more character.
2014-04-12 10:10:46 -04:00
Martin Mahner
51398bdb49 Added tox settings for upcoming Django 1.7. 2014-03-13 16:04:31 +01:00
Martin Mahner
bbd68ee2c9 Fixed lexer key validation. Fixed tests. 2014-03-13 15:55:27 +01:00
Martin Mahner
a3b8c8a7a7 Fixed different fallback values for max-snippets setting.
Refs issue #51.
2014-03-13 15:48:36 +01:00
Martin Mahner
68cb1c27ec Merge remote-tracking branch 'origin/master' 2014-03-13 15:42:13 +01:00