Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-05-12 17:23:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
3423 commits 30 branches 112 tags 89 MiB
Commit graph

3423 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matt Westcott
2f37e188f5 Merge branch 'master' into feature/streamfield 2015-02-18 10:50:32 +00:00
Matt Westcott
8f5412e76c release note for #999 2015-02-18 10:50:10 +00:00
Matt Westcott
9500826d05 Merge branch 'davecranwell-feature/hallo-requireparagraphs' 2015-02-18 10:47:46 +00:00
Matt Westcott
979616384c Merge branch 'feature/hallo-requireparagraphs' of https://github.com/davecranwell/wagtail into davecranwell-feature/hallo-requireparagraphs 2015-02-18 10:44:54 +00:00
Matt Westcott
763b5df8c4 Release note for #1001 2015-02-18 10:19:59 +00:00
Matt Westcott
71aa6133fb Merge pull request #1001 from m-sanders/feature/absolute-wagtailadmin-scss-paths 
Using absolute imports in SCSS.
 2015-02-18 09:56:54 +00:00
Karl Hobley
467ced3836 Merge pull request #1002 from chimeno/patch-1 
Update third_party_tutorials.rst
 2015-02-18 09:18:45 +00:00
Daniel Chimeno
de65f8da8b Update third_party_tutorials.rst 2015-02-18 00:29:24 +01:00
Martin Sanders
3b65bfd378 Using absolute imports in SCSS. 
This allows consumers of the wagtailadmin to override the scss files in
the same manner that Django devs override templates.
 2015-02-17 19:54:31 +00:00
Matt Westcott
735f879784 version bump 0.8.x branch to 0.8.5 2015-02-17 16:56:34 +00:00
Matt Westcott
6c9df29e57 no markdown in the changelog, thx 2015-02-17 16:46:42 +00:00
Matt Westcott
adaf36edd6 release note for #998 (and add a missing apostrophe) 2015-02-17 16:42:14 +00:00
Matt Westcott
5711d5abed Merge pull request #998 from gasman/default-base-url 
Add a default BASE_URL setting to the project template
 2015-02-17 16:39:00 +00:00
Matt Westcott
149da7f578 Mention the wagtailbakery module 2015-02-17 16:33:53 +00:00
Dave Cranwell
f0f7bc8e32 enforced creation of paragraphs when first typing in a rich text field 2015-02-17 16:08:01 +00:00
Matt Westcott
3c3a0c4189 use example.com as the default BASE_URL 2015-02-17 15:56:35 +00:00
Matt Westcott
591478d8da Add a default BASE_URL setting to the project template 2015-02-17 15:32:22 +00:00
Matt Westcott
82c7a42255 Move release note for #997 to 0.8.5 in the docs as well 2015-02-17 15:22:30 +00:00
Dave Cranwell
d7b2b631a7 Merge branch 'master' of github.com:torchbox/wagtail 2015-02-17 15:01:10 +00:00
Dave Cranwell
71315d6910 making focused menu items more obvious 2015-02-17 15:00:44 +00:00
Dan Braghis
7fabf23fae Move changelog entry for 997 to 0.8.5 instead of 0.9 2015-02-17 14:41:02 +00:00
Dan Braghis
1aa9bae6e8 Add changelog and release notes for #997 2015-02-17 14:18:00 +00:00
Dan Braghis
3f3f5cee15 Merge pull request #997 from gasman/password-reset-url 
Use BASE_URL in password reset email if available - fixes #841
 2015-02-17 14:12:52 +00:00
Karl Hobley
610ae217e6 Removed Rect.get_key 2015-02-17 12:48:34 +00:00
Karl Hobley
214e337aef Merge pull request #966 from kaedroho/drone 
Added Drone config
 2015-02-17 12:08:27 +00:00
Matt Westcott
82cca64b2a Use BASE_URL in password reset email if available - fixes #841 2015-02-16 18:31:17 +00:00
Dan Braghis
77340cfe95 Add tests for the password reset emails 2015-02-16 17:48:57 +00:00
Matt Westcott
42a48b0085 release note for 4068385 2015-02-16 15:09:02 +00:00
Matt Westcott
a62022d898 allow non-digit chars (e.g. '-') in user IDs in URLs; fixes #565 2015-02-16 15:08:52 +00:00
Matt Westcott
30c4affa4d Merge pull request #993 from johnfraney/patch-1 
Update form_builder.rst
 2015-02-16 14:01:59 +00:00
Matt Westcott
39da9c5d1d Merge branch 'edrex-URLOrAbsolutePathField' 2015-02-16 13:51:26 +00:00
Matt Westcott
77e99e951d fix italic vs code formatting mismatches 2015-02-16 13:51:14 +00:00
Matt Westcott
c921023702 release note for #917 2015-02-16 13:49:01 +00:00
Matt Westcott
b734042140 Unit test for #917 2015-02-16 13:39:47 +00:00
Matt Westcott
9fabf8ec39 Merge branch 'URLOrAbsolutePathField' of https://github.com/edrex/wagtail into edrex-URLOrAbsolutePathField 2015-02-16 13:31:18 +00:00
Matt Westcott
342fd7a061 make block names work properly when passed as binary strings 2015-02-16 12:17:56 +00:00
Karl Hobley
5a3431c9c3 Merge pull request #986 from kaedroho/docs 
Getting started docs changes
 2015-02-16 10:29:14 +00:00
Karl Hobley
e6da637256 Changed ports to 8000 2015-02-16 10:28:39 +00:00
Karl Hobley
f52203ec39 Added wagtaildemo section back 2015-02-16 10:27:17 +00:00
Karl Hobley
88753e4370 Installation docs 2015-02-16 10:27:17 +00:00
Karl Hobley
495c834ff0 Added "Trying wagtail" page 2015-02-16 10:27:17 +00:00
Karl Hobley
3cdedf12f2 Docs updates 2015-02-16 10:27:17 +00:00
Karl Hobley
5d6aa0c6ca Started restructuring getting started docs 2015-02-16 10:27:17 +00:00
Karl Hobley
9072274a01 Improved front page 2015-02-16 10:26:34 +00:00
Matt Westcott
64d5ffe2b2 Always deconstruct StreamBlock and StructBlock as basic non-subclassed instances 2015-02-13 22:25:46 +00:00
Matt Westcott
17acb8867d Normalise the output of StreamField.deconstruct to a list of block defs. 
This ensures that the migration code is the same even if the StreamBlock is defined as an external instance or class, and that in those cases the block definitions get frozen into the migration.
 2015-02-13 21:37:37 +00:00
Matt Westcott
0ee9649415 fix some tests that were presumably meant to use StreamBlock but didn't 2015-02-13 20:42:06 +00:00
Matt Westcott
a6c207a1f6 Fix another place where we make a set() of block instances 
(and add the unit tests that would have caught it)
 2015-02-13 20:33:03 +00:00
Matt Westcott
53ffb18a35 move blocks module to wagtailcore 2015-02-13 19:59:11 +00:00
Matt Westcott
f5bed5ded7 Avoid placing Block instances into a set(), as this requires them to be hashable. 
Defining Block.__eq__ in 047ff734ca causes the default __hash__ implementation to be nullified on Python 3. Since it's non-trivial to define a replacement __hash__ method that's consistent with our __eq__ behaviour (it depends on the equality of lists / dicts, which are themselves unhashable), it's more correct to explicitly define Block as unhashable, bringing the Python 2 behaviour in line with Python 3.

The one place where we currently depend on Block being hashable is in constructing the 'dependencies' set for nested blocks. Since we don't actually need the de-duplicating behaviour of set(), we can replace this with a plain list with no ill effects.
 2015-02-13 18:33:32 +00:00