Ben Delevingne
1a19819a19
Comment changes so they are real in English
2014-06-05 15:46:37 +01:00
Dave Cranwell
81e5da010a
Merge branch 'master' into pr/286
2014-06-05 15:43:26 +01:00
Dave Cranwell
0adab4f58d
updates to tabs and forms
2014-06-05 15:42:26 +01:00
Dave Cranwell
302d50cc41
merged master
2014-06-05 15:33:21 +01:00
Dave Cranwell
9c3dbbaec4
Merge remote-tracking branch 'upstream/master'
2014-06-05 15:26:07 +01:00
Dave Cranwell
ad6a8682af
removing margins from body, which don't play well with jquery position() or offset()
2014-06-05 15:25:23 +01:00
Ben Delevingne
ea82f12935
Order snippet models during snippet registration
2014-06-05 15:25:17 +01:00
Ben Delevingne
c200ad50c4
Test ordering of snippet
2014-06-05 15:24:29 +01:00
Ben Delevingne
1f9fe4bfc1
Added two test snippet models definitions
2014-06-05 15:21:56 +01:00
Ben Delevingne
ebf1360c0f
Fix indendation of Advert test model
2014-06-05 15:19:17 +01:00
Dave Cranwell
0a6ed076e7
Merge branch 'master' into feature/styleguide
2014-06-05 15:12:01 +01:00
Dave Cranwell
dfd8575070
Merge pull request #282 from kaedroho/page-pagination
...
Page pagination
2014-06-05 14:59:46 +01:00
Tom Talbot
371e415857
Add tests for wagtailembeds.embeds.oembed()
2014-06-05 14:26:09 +01:00
Dave Cranwell
6c9646243b
Merge pull request #266 from kaedroho/ditch-more-section
...
Ditch more section
2014-06-05 14:18:37 +01:00
Tom Talbot
d0914e8043
Fix unit test failure when embedly is not installed
2014-06-05 10:20:34 +01:00
Ben Margolis
f70768cc4e
typo
2014-06-04 12:52:17 -07:00
Ben Margolis
2f029fc336
adding custom img attrs to image_tags, but no custom TestCasecreated for it
2014-06-04 11:41:02 -07:00
Karl Hobley
3b372ccbac
Splitup wagtailcore tests
...
wagtailcore/tests.py is getting a bit big so this commit splits them up into separate files
test_management_commands.py
test_page_model.py
test_page_permissions.py
test_page_queryset.py
tests.py
2014-06-04 17:17:52 +01:00
Karl Hobley
2b4b19a641
Use reversed URLs in wagtailforms tests
2014-06-04 16:41:08 +01:00
Karl Hobley
24df26c8c3
More wagtailforms tests
2014-06-04 16:41:08 +01:00
Karl Hobley
7e7885b2b5
Added tests for wagtailforms page modes
2014-06-04 16:41:08 +01:00
Karl Hobley
6d67749f5a
Cleanup of TestFormsBackend TestcAse
2014-06-04 16:41:08 +01:00
Karl Hobley
21ac2e3ab8
Split wagtailforms landing page into separate view
2014-06-04 16:41:08 +01:00
Karl Hobley
97a981a766
Cleaned up FormBuilder class
2014-06-04 16:41:08 +01:00
Karl Hobley
7cf899bdbc
Added test for FormBuilder class
2014-06-04 16:41:08 +01:00
Karl Hobley
2a84d7ef1d
A few improvements to the wagtailforms submission tests
2014-06-04 16:41:08 +01:00
Tom Talbot
3b8ca10fdb
Embedly unit tests
2014-06-04 16:19:34 +01:00
Tom Talbot
c4e7848264
Merge branch 'master' into more-unit-tests
2014-06-04 16:19:04 +01:00
Karl Hobley
8fa0bc07df
Made login view redirect already logged in users to dashboard.
...
Fixes #25
2014-06-04 15:30:15 +01:00
Matt Westcott
a104c5eb16
revert changelog entry
2014-06-04 14:44:14 +01:00
Matt Westcott
43e0ce721f
Revert "Made login view redirect already logged in users to dashboard."
...
This reverts commit 3f9cb2da6f .
2014-06-04 14:43:10 +01:00
Karl Hobley
6a4df387e3
Mark embed code as safe in frontend template
2014-06-04 13:36:33 +01:00
Karl Hobley
399f271ca7
Fixed missing return statement in embed frontend renderer
2014-06-04 13:27:06 +01:00
Jeffrey Hearn
c0e91e8466
Merge branch 'master' of github.com:torchbox/wagtail into hallo-dist-update
2014-06-03 23:30:49 -04:00
Jeffrey Hearn
a885c7a56c
Edit API docs expanded with hooks, modelcluster, and InlinePanel usage
2014-06-03 23:09:27 -04:00
Tom Talbot
c3d4ce868c
Unit tests for Wagtail admin chooser
2014-06-03 16:57:17 +01:00
Karl Hobley
fe71932a49
Fixed a couple of references to "localize" templatetags library
...
This was removed in 99a70b3
2014-06-03 15:56:14 +01:00
Karl Hobley
eea0656708
Added seconds to timepicker. Added masks to all datetime pickers
2014-06-03 15:37:55 +01:00
Matt Westcott
3546a1e48a
Merge branch 'stable/0.3.x'
...
Conflicts:
CHANGELOG.txt
2014-06-03 15:14:45 +01:00
Karl Hobley
99a70b3d9d
Removed jQueryUI datetimepicker
2014-06-03 15:06:41 +01:00
Karl Hobley
614b49213d
Swapped out jQueryUI datetimepicker for xdsoft datetimepicker
2014-06-03 15:04:28 +01:00
Karl Hobley
0d7471b94f
Installed jQuery.datetimepicker
...
https://github.com/xdan/datetimepicker/commit/3e320c9046f9c735bbff1c9e39056f
2014-06-03 14:58:49 +01:00
Matt Westcott
649cbf95c4
version bump for 0.3.1
2014-06-03 14:54:37 +01:00
Matt Westcott
a0f01b98d5
Merge branch 'stable/0.3.x'
...
Conflicts:
CHANGELOG.txt
2014-06-03 14:47:57 +01:00
Matt Westcott
e449fcc861
Changelog entry for a5072c7
2014-06-03 14:47:05 +01:00
Tom Talbot
a5072c768d
Fix #94 . Panels are now hidden on page load if they are marked as
...
deleted after a form validation failure.
2014-06-03 14:44:38 +01:00
Matt Westcott
2d7a276b83
Changelog entries for dummy_request fixes
2014-06-03 14:33:21 +01:00
Matt Westcott
f3f7b466b1
When generating dummy requests for pages with no routable URL, fall back on a hostname from ALLOWED_HOSTS and finally localhost
2014-06-03 14:15:18 +01:00
Tom Dyson
c052214880
Grammar fixes in FE docs
2014-06-03 13:30:45 +01:00
Dave Cranwell
e24e68fced
Update CHANGELOG.txt
2014-06-03 12:59:49 +01:00