Wykres commitów

1650 Commity (7286692c39d431573a12e7472dbd4ea9b7af4144)

Autor SHA1 Wiadomość Data
Matt Westcott 66fb8bb2d1 Merge branch 'python3-take2' of https://github.com/kaedroho/wagtail into kaedroho-python3-take2 2014-07-02 15:19:52 +01:00
Karl Hobley dd1b0ababe Fixed check for user email address 2014-07-02 14:44:40 +01:00
Karl Hobley e6f47aa403 Take a copy of parents indexed fields before modifying it to prevent indexed fields configuration being changed accidentally 2014-07-02 14:01:08 +01:00
Karl Hobley 2f74885834 Fixed bad paste 2014-07-02 13:45:43 +01:00
Neal Todd 6b41e89888 Merge branch 'master' of github.com:torchbox/wagtail 2014-07-02 13:14:51 +01:00
Neal Todd ea292d0569 Bump 1.6 testing from 1.6.2 to 1.6.5. Add job for python 3.4 (allowing failure for now). Add commented stub for 1.7.0 jobs when it's released (resulting in four jobs overall). 2014-07-02 13:12:13 +01:00
Karl Hobley 8b4fc47c56 Removed get_internal_paths 2014-07-02 13:03:15 +01:00
Karl Hobley 61fd67f2e9 Tweaks to sitemap generation docs 2014-07-02 13:01:49 +01:00
Karl Hobley 3be8c0374c Improvements to sitemaps tests 2014-07-02 12:57:21 +01:00
Karl Hobley f642e78f60 Removed get_internal_paths
I've changed my mind about this.
2014-07-02 12:52:09 +01:00
Karl Hobley ea28584b8b indexed_get_indexed_fields should always return a copy of the configuration (even it its already a dict) 2014-07-02 12:37:29 +01:00
Karl Hobley 29896dcf5e Take a copy of parents indexed fields before modifying it to prevent indexed fields configuration being changed accidentally 2014-07-02 12:30:32 +01:00
Dave Cranwell 0e5f0be811 Merge pull request #404 from wdv4758h/master
fix wrong closing tag
2014-07-02 12:14:18 +01:00
dv 5c61f75b68 fix wrong closing tag 2014-07-02 19:10:19 +08:00
Dave Cranwell fee62898fc Update README.rst 2014-07-02 11:44:39 +01:00
Dave Cranwell 4cd570c979 Update README.rst 2014-07-02 11:41:38 +01:00
Dave Cranwell 1515d3b6d6 Note about Help develop me label 2014-07-02 11:40:22 +01:00
Dave Cranwell f7b9390202 removed max-height transition until it can be done without bad effects on long forms 2014-07-02 11:16:13 +01:00
Karl Hobley 01c9ffb552 Fixed unresolved merge conflict 2014-07-02 11:07:21 +01:00
Karl Hobley 3248601cc1 Fixed wagtailforms test 2014-07-02 10:35:47 +01:00
Karl Hobley dbcb17c706 Fixed wagtailembeds tests 2014-07-02 10:35:47 +01:00
Karl Hobley a4bd768a7d Make sure that we are not iterating over tag.attrs.items() 2014-07-02 10:35:47 +01:00
Karl Hobley e58929d79b Cast test docs to bytes before uploading 2014-07-02 10:35:47 +01:00
Karl Hobley b4cf0ab15a Fixed python 3 incompatible method for concatenating dictionaries 2014-07-02 10:35:47 +01:00
Karl Hobley 623e77391d Use python 3 print function 2014-07-02 10:35:47 +01:00
Karl Hobley 6bd8e056b8 Another unicode replaced with text_type 2014-07-02 10:35:47 +01:00
Karl Hobley 99f7b56560 Replaced __unicode__ methods with __str__ methods 2014-07-02 10:35:47 +01:00
Karl Hobley 5cd1d82769 Cast email address to bytes before hashing into gravatar url 2014-07-02 10:35:47 +01:00
Karl Hobley b56c18cb19 Replaced occurance of 'xrange' with 'range' 2014-07-02 10:35:46 +01:00
Karl Hobley 0272411222 Replaced occurances of 'dict.iteritems' with 'dict.items' 2014-07-02 10:35:46 +01:00
Karl Hobley 409e6e781b Replaced occurances of 'basestring' with 'six.string_types' 2014-07-02 10:35:46 +01:00
Karl Hobley 688a9f1c68 Replaced occurances of 'unicode' with 'six.text_type' 2014-07-02 10:35:46 +01:00
Karl Hobley 600de852d8 Use six.with_metaclass to add metaclass to Page 2014-07-02 10:35:46 +01:00
Karl Hobley c90d61fa2a Use six to import urllib and StringIO 2014-07-02 10:35:46 +01:00
Karl Hobley cf15e90390 Fixed absolute import issues 2014-07-02 10:35:46 +01:00
Karl Hobley 85a68a34f1 Requirements changes
- Removed Beautiful Soup 3
 - Added six
2014-07-02 10:35:46 +01:00
Karl Hobley 1cc258f404 Don't install unicodecsv on Python 3 and fallback to pythons built in csv library it it isn't installed. 2014-07-02 10:35:38 +01:00
Dave Cranwell f3a70c9f29 correctly formatted query chooser modal content 2014-07-02 10:21:28 +01:00
Dave Cranwell 7ddcf0fbac Fixing #402, missing chooser button. Field inherited wrong template. 2014-07-02 10:17:21 +01:00
Dave Cranwell 7e65a4d578 button metrics at mobile improved 2014-07-02 10:08:31 +01:00
Dave Cranwell bdf175ae41 fixed: generated content font size bug in IE 2014-07-02 09:52:55 +01:00
Karl Hobley d9b22292f2 Merge branch 'master' into varnish-cache-invalidation
Conflicts:
	wagtail/wagtailadmin/tests/test_pages_views.py
2014-07-02 09:38:51 +01:00
Tom Dyson 479dd1edde Minor editing API doc tweaks 2014-07-01 16:53:47 +01:00
Tom Dyson 83161e324f Updates to management commands docs
With inclusion in index
2014-07-01 16:45:44 +01:00
Tom Talbot bf3e51f6fb Merge branch 'master' into fix-edit-handlers-test
Merge. Remove deprecated tests.

Conflicts:
	wagtail/tests/fixtures/test.json
2014-07-01 16:34:43 +01:00
Dave Cranwell a5376dd2ea Merge remote-tracking branch 'upstream/master' 2014-07-01 15:40:06 +01:00
Dave Cranwell eb1e8b0f87 Fixed: 'use strict' caused undeclared variable to prevent preview 2014-07-01 15:39:25 +01:00
Karl Hobley 2dd45a8e71 Merge pull request #386 from torchbox/scheduled-publishing
Scheduled publishing
2014-07-01 14:13:05 +01:00
Karl Hobley ebd73184bf Fixed migration conflict 2014-07-01 14:04:31 +01:00
Karl Hobley 96977878bc Merge remote-tracking branch 'torchbox/master' into scheduled-publishing 2014-07-01 14:02:46 +01:00