mirror
/
wagtail
kopia lustrzana https://github.com/wagtail/wagtail
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność
5 222 Commity
55 Gałęzie
256 Tagi
3,4 GiB
Wykres commitów

5222 Commity (69e277e5f50c1f8206bc593e5057abe1cfe12a40)

Autor SHA1 Wiadomość Data
Matt Westcott 69e277e5f5 Merge branch 'overcastsoftware-master' 2015-10-20 10:37:28 +01:00
Matt Westcott 6994f7b7b5 Release note for #1843 2015-10-20 10:37:04 +01:00
Matt Westcott 6cb450e28e Merge branch 'master' of https://github.com/overcastsoftware/wagtail into overcastsoftware-master 2015-10-20 10:20:34 +01:00
Matt Westcott d7ab458b36 fix jslint complaint 2015-10-19 22:45:24 +01:00
Sævar Öfjörð Magnússon 31358535b1 Remove the length argument to URLify 
The URLify function supplied by django does not need a length argument in order to work. The problem with supplying the length argument is that when you have Unicode characters that are translated to two characters in the slug version, the resulting slug will be missing one character for each such double character.

Example:
Æ or æ is translated as ae when slugified.
A call to URLify would then be: URLify("kjaftæði", 8) which would result in the slug "kjaftaed", since the slug is 9 characters in length due to æ being expanded to two characters. URLify("kjaftæði") works fine and returns "kjaftaedi".
 2015-10-19 15:57:16 +00:00
Matt Westcott 3b882dd1e9 Merge branch 'kaedroho-wagtailapirouter' 2015-10-19 14:12:16 +01:00
Matt Westcott c0c9972aca Merge branch 'wagtailapirouter' of https://github.com/kaedroho/wagtail into kaedroho-wagtailapirouter 2015-10-19 13:11:56 +01:00
Karl Hobley 26889ba128 Merge pull request #1812 from gasman/feature/block-template-context 
Allow block subclasses to pass extra context variables to templates
 2015-10-19 09:29:59 +01:00
Karl Hobley 37685dee6f Merge pull request #1835 from gasman/fix/empty-explorer-menu 
If explorer nav menu is empty, take user directly to the explorer view
 2015-10-19 09:26:50 +01:00
Karl Hobley 88aab062ec Merge pull request #1810 from gasman/fix/preserve-slug 
Avoid auto-updating slug on live pages
 2015-10-19 09:18:49 +01:00
Matt Westcott 29a62f6b16 Merge pull request #1838 from timorieber/cleanup/vagrant 
Removed Vagrantfile from startproject command
 2015-10-16 23:57:00 +01:00
Timo Rieber a990bccff4 Removed Vagrantfile from startproject command 2015-10-17 00:14:55 +02:00
Matt Westcott 0c93d133c3 Merge branch 'JoshBarr-docs/signals' 2015-10-16 17:24:58 +01:00
Matt Westcott 1c115ca429 Add Josh Barr to contributors 2015-10-16 17:24:24 +01:00
Matt Westcott 141129f587 Merge branch 'docs/signals' of https://github.com/JoshBarr/wagtail into JoshBarr-docs/signals 2015-10-16 17:23:04 +01:00
Karl Hobley db49484201 Docstrings for router class 2015-10-16 13:19:38 +01:00
Karl Hobley 5733f16002 Refactored detail_url calculation into function 2015-10-16 13:19:38 +01:00
Karl Hobley de689215b0 Removed WagtailJSONRenderer 2015-10-16 13:19:37 +01:00
Karl Hobley 789cbabebf Get detail_url values from router 
No longer need ObjectDetailURL!
 2015-10-16 13:19:37 +01:00
Karl Hobley ed42eb001d RelatedField and ChildRelation now pass down context 2015-10-16 13:19:37 +01:00
Karl Hobley c813a2c682 Removed URLPath 
Replaced with calls to get_full_url in serializers.py
 2015-10-16 13:19:37 +01:00
Karl Hobley 1e1077f891 Added WagtailAPIRouter 2015-10-16 13:19:37 +01:00
Matt Westcott a3473544b8 Merge pull request #1785 from takeflight/bug/asset-compilation 
Fix bug where built assets may not be packaged
 2015-10-16 12:31:18 +01:00
Matt Westcott c06a2cde85 Merge pull request #1772 from kaedroho/api-tweaks2 
Cleanup in WagtailAPI module
 2015-10-16 12:24:35 +01:00
Matt Westcott 5c1abe3a86 Merge branch 'mayapurmedia-set_multipart' 2015-10-16 12:12:13 +01:00
Matt Westcott bce6fba24f Release note for #1741 2015-10-16 12:12:07 +01:00
Matt Westcott 6310c906ee Merge branch 'set_multipart' of https://github.com/mayapurmedia/wagtail into mayapurmedia-set_multipart 2015-10-16 11:42:05 +01:00
Matt Westcott f63986f47d If explorer nav menu is empty, take user directly to the explorer view 2015-10-15 22:37:22 +01:00
Matt Westcott 749258ebbb Merge pull request #1828 from jheasly/patch-1 
Docs fix: Need to flip order of class creation
 2015-10-15 11:40:45 +01:00
Matt Westcott c0f390a9c2 Merge branch 'timorieber-cleanup/project-template-documentation' 2015-10-15 09:22:00 +01:00
Matt Westcott bebc4d4ed3 Remove mention of SASS / django-compressor; fix minor text errors 2015-10-15 09:21:47 +01:00
Matt Westcott e1b564ee80 Merge branch 'cleanup/project-template-documentation' of https://github.com/timorieber/wagtail into timorieber-cleanup/project-template-documentation 2015-10-15 09:18:42 +01:00
Timo Rieber f522b146b3 Removed vagrant configuration section 2015-10-15 08:11:16 +02:00
Timo Rieber 8e2c5cfd87 Synced structure to reflect current project template 2015-10-15 08:10:27 +02:00
Petr Vacha c6bb0adac7 Merge with latest version, fixing conflicts. 2015-10-15 10:19:34 +05:30
John Heasly d87d737f52 Need to flip order of class creation 
Need to flip order of creating `BlogIndexRelatedLink` and `BlogIndexPage`, otherwise `BlogIndexRelatedLink` references `BlogIndexPage` before it's been created and you get:
```bash
ERRORS:
blog.BlogIndexRelatedLink.page: (fields.E300) Field defines a relation with model 'BlogIndexPage', which is either not installed, or is abstract.
```
 2015-10-14 17:29:19 -07:00
Matt Westcott 30d5b62eed Fix broken link to topics/pages 2015-10-14 17:28:49 +01:00
Matt Westcott 14b1fa68b8 Merge branch 'kaedroho-issue/1671' 2015-10-14 17:26:12 +01:00
Matt Westcott da42620089 Release note for #1791 2015-10-14 17:26:03 +01:00
Matt Westcott e946215817 Merge branch 'issue/1671' of https://github.com/kaedroho/wagtail into kaedroho-issue/1671 2015-10-14 17:23:49 +01:00
Matt Westcott 148f05e0d2 Merge branch 'RyanPineo-fix-page-edit-publish-view-live-url' 2015-10-14 17:16:34 +01:00
Matt Westcott 7e7ba37639 Release note for #1770 2015-10-14 17:16:21 +01:00
Matt Westcott bf0166945c reword comment - the URL *may* have changed 2015-10-14 17:11:59 +01:00
Matt Westcott 33faa40ecd Merge branch 'fix-page-edit-publish-view-live-url' of https://github.com/RyanPineo/wagtail into RyanPineo-fix-page-edit-publish-view-live-url 2015-10-14 17:09:59 +01:00
Matt Westcott e45b73fd0b Merge branch 'kaedroho-html-comments-in-rich-text' 2015-10-14 17:07:44 +01:00
Matt Westcott bb8894aa6c Release note for #1821 2015-10-14 17:07:26 +01:00
Matt Westcott 55e98db83a Merge branch 'html-comments-in-rich-text' of https://github.com/kaedroho/wagtail into kaedroho-html-comments-in-rich-text 2015-10-14 16:57:34 +01:00
Karl Hobley e6fcb9e504 Merge pull request #1811 from gasman/fix/frontend-search-use-queryset 
Update frontend search to use queryset-based search method
 2015-10-14 16:21:33 +01:00
Matt Westcott baf36e0111 Merge branch 'kaedroho-docs-self-var' 2015-10-14 15:26:04 +01:00
Matt Westcott 9b6a389850 Add note about variable names to Jinja2 release notes 2015-10-14 15:25:40 +01:00