mirrors/wagtail
mirrors/wagtail
0
0
Fork 0
mirror of https://github.com/wagtail/wagtail.git synced 2024-11-30 01:46:24 +01:00
Code Issues Releases Wiki Activity
6,915 Commits 56 Branches 258 Tags 416 MiB
ad94e689fc
Commit Graph

6915 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt Westcott
f774cbafc5 Merge branch 'master' of github.com:torchbox/wagtail 2014-02-06 22:48:03 +00:00
Dave Cranwell
bdafaa59f1 Merge branch 'develop' 2014-02-06 17:03:53 +00:00
Matt Westcott
21962d3d92 Change Page.url to return a local URL when only one site is running; add full_url when we really need a full url (i.e. email notifications) 2014-02-06 17:03:43 +00:00
Dave Cranwell
7495c6d3db better linking of status tags 2014-02-06 17:03:36 +00:00
Dave Cranwell
ba9c8d7e75 Merge branch 'develop' 2014-02-06 16:50:30 +00:00
Dave Cranwell
e4a751e549 merged 2014-02-06 16:50:26 +00:00
Dave Cranwell
38829e2b61 consistency in page interface 2014-02-06 16:49:28 +00:00
Dave Cranwell
e13165186a ongoing tweaks 2014-02-06 16:41:52 +00:00
Matt Westcott
df03ca0636 Rejig breadcrumb so that we don't have a 'root' element duplicating the home icon 2014-02-06 15:46:36 +00:00
Matt Westcott
90b640225e Remove redundant (and namespace-stomping) static / template files from wagtailcore that were left over from our standard django app template 2014-02-06 15:35:33 +00:00
Matt Westcott
597b4438a4 temporarily fiddle pythonpath to import our bundled django-treebeard 2014-02-06 14:45:29 +00:00
Matt Westcott
a61a829c89 Merge branch 'master' of github.com:torchbox/wagtail 2014-02-06 14:31:42 +00:00
Matt Westcott
69cb9f7d33 Merge commit '4cce28b1f58bee3a2e698ef110fd855571704667' as 'wagtail/vendor/django-treebeard' 2014-02-06 14:27:23 +00:00
Matt Westcott
4cce28b1f5 Squashed 'wagtail/vendor/django-treebeard/' content from commit 15728a8 
git-subtree-dir: wagtail/vendor/django-treebeard
git-subtree-split: 15728a88e71f3493e5a2829eb98563bd3bf03f17
 2014-02-06 14:27:23 +00:00
Dave Cranwell
fcfafa0330 Merge branch 'develop' 2014-02-06 13:54:58 +00:00
Dave Cranwell
2e0e7bb53a added more instructive description for slug field 2014-02-06 13:54:54 +00:00
Neal Todd
63d96a589d Merge branch 'master' into feature/linting 
Conflicts:
	wagtail/wagtailadmin/templatetags/gravatar.py
 2014-02-06 13:02:23 +00:00
Neal Todd
4bdc2e7167 Linted JS 2014-02-06 12:51:09 +00:00
Neal Todd
866f4897d2 Removing redundant RCA references 2014-02-06 12:43:32 +00:00
Neal Todd
c548b391d5 Linted wagtailusers 2014-02-06 12:29:11 +00:00
Neal Todd
47ebe83c6f Linted wagtailsnippets 2014-02-06 12:24:38 +00:00
Neal Todd
a05d2700f4 Linted wagtailsearch 2014-02-06 12:22:05 +00:00
Neal Todd
a4d80fb9d0 Linted wagtailredirects 2014-02-06 11:52:14 +00:00
Dave Cranwell
bdd4d805b7 ongoing tweaks 2014-02-06 11:51:19 +00:00
Neal Todd
eb8aa224e4 Linted wagtailembeds 2014-02-06 11:46:32 +00:00
Neal Todd
53e4c40c1e Linted wagtailimages 2014-02-06 11:45:47 +00:00
Neal Todd
04f648c27c Linted wagtailembeds 2014-02-06 11:41:19 +00:00
Neal Todd
b4acc5af18 Linted wagtaildocs 2014-02-06 11:36:25 +00:00
Neal Todd
006145a196 Linted wagtailcore 2014-02-06 11:33:32 +00:00
Neal Todd
a2a580f0fe Linted wagtailadmin 2014-02-06 11:23:48 +00:00
Dave Cranwell
b6cde51830 Merge branch 'master' into feature/taavi-design-updates 2014-02-06 09:37:32 +00:00
Dave Cranwell
1ecb03c62f ongoing tweaks 2014-02-05 17:42:07 +00:00
Matt Westcott
d4ba4a2a75 Update Page.content_panels with current field defs 2014-02-05 17:15:45 +00:00
Dave Cranwell
bcf5f397d7 tweaks to menu on mobile 2014-02-05 16:35:02 +00:00
Dave Cranwell
a5a20c2d8e mobile menu now better 2014-02-05 16:15:39 +00:00
Dave Cranwell
ba7b516f9b use of svg logo instead of font 2014-02-05 15:24:54 +00:00
Dave Cranwell
33068abf00 font updates and further references to verdant removed 2014-02-05 15:14:00 +00:00
Dave Cranwell
7d67a7bac5 gs 2014-02-05 13:45:36 +00:00
Matt Westcott
758a8dadce Merge branch 'feature/taavi-design-updates' of github.com:torchbox/wagtail into feature/taavi-design-updates 2014-02-05 13:28:39 +00:00
Dave Cranwell
25819c4ca4 tweaks to img paths 2014-02-05 12:56:46 +00:00
Dave Cranwell
69d9690694 removal of orphaned merge files. tidying final references to verdant name 2014-02-05 12:49:18 +00:00
Dave Cranwell
f9c9dac30a Merge commit 'f653a19' into reapply-design-updates-pre-split 2014-02-05 12:38:53 +00:00
Dave Cranwell
deea0075ca merging from ui update branch 2014-02-05 12:38:42 +00:00
Dave Cranwell
8359d3fea2 merging from ui update branch 2014-02-05 12:35:39 +00:00
Dave Cranwell
864e2a9ac1 merging from ui update branch 2014-02-05 12:31:38 +00:00
Dave Cranwell
6fb3159074 merging from ui update branch 2014-02-05 12:29:13 +00:00
Dave Cranwell
7e3894e124 Merge commit '49fd3da' into reapply-design-updates-pre-split 2014-02-05 12:26:32 +00:00
Dave Cranwell
3c091bafde merging from ui update branch 2014-02-05 12:26:15 +00:00
Dave Cranwell
26eaf6e89f Merge commit '64d1d6b' into reapply-design-updates-pre-split 2014-02-05 12:19:33 +00:00
Dave Cranwell
46840b2c2f merging from ui update branch 2014-02-05 12:19:20 +00:00