Commit graph

623 commits

Author SHA1 Message Date
Matt Westcott
f5a063e2b1 Remove RCA-specific style for H2 elements (and replace the now-complete TODO with a mini-rant about semantic markup) 2014-04-04 16:27:30 +01:00
Matt Westcott
4cfd3b937c Set a richtext-image class on images within rich text areas, and set styles on that class so that they get aligned appropriately in the editor interface. Previously the styles referred to bodytext-image, which was specific to RCA's custom image formats 2014-04-04 16:19:54 +01:00
Matt Westcott
46d594230d Add hooks to insert custom CSS/JS into the editor interface 2014-04-04 15:50:39 +01:00
Matt Westcott
f3618cfba3 Move page_permissions template tag to wagtailadmin_tags 2014-04-04 15:02:52 +01:00
Matt Westcott
2a7e3cde05 Move meta_description filter to wagtailadmin_tags 2014-04-04 14:59:58 +01:00
Matt Westcott
0b6c76b008 move fieldtype filter to wagtailadmin_tags 2014-04-04 14:28:07 +01:00
Matt Westcott
1d092eb1da move ellipsistrim filter to wagtailadmin_tags 2014-04-04 14:24:58 +01:00
Matt Westcott
a49655c08b Rename wagtailadmin_nav tag library to wagtailadmin_tags in preparation for moving other miscellaneous wagtailadmin tags there 2014-04-04 13:15:30 +01:00
Karl Hobley
381f8b29d3 Pin elasticutils to version 0.8.2 in .travis.yml (#181) 2014-04-04 09:39:23 +01:00
Matt Westcott
420c1a84b7 Merge branch 'master' of github.com:torchbox/wagtail 2014-04-03 12:37:58 +01:00
Matt Westcott
9c30e1e926 Changelog additions 2014-04-03 12:37:54 +01:00
Dave Cranwell
00d831f935 Merge branch 'master' of github.com:torchbox/wagtail 2014-04-03 12:35:57 +01:00
Dave Cranwell
1d702e74f8 added help, warning and success icons 2014-04-03 12:35:55 +01:00
Matt Westcott
a69dd20ff8 Merge branch 'master' of https://github.com/spapas/wagtail into spapas-master 2014-04-03 12:22:11 +01:00
Balazs
4213768177 Removed text shadow from collapse icons 2014-04-03 12:04:12 +01:00
Balazs
e4700709c4 Additional styling for collapsible panels to match the inline panel styles 2014-04-03 10:28:00 +01:00
Matt Westcott
64f6c008df Merge branch 'master' of github.com:torchbox/wagtail 2014-04-03 10:05:06 +01:00
Dave Cranwell
a467ddbc21 update font files. collapse icon indicated wrong motion 2014-04-03 10:01:39 +01:00
Matt Westcott
1343aaaaf5 Merge branch 'master' of https://github.com/balazs-endresz/wagtail into balazs-endresz-master 2014-04-03 09:56:50 +01:00
Balazs
a7663cbe2d Added collapsible multi-field panels 2014-04-02 18:59:33 +01:00
Serafeim Papastefanos
168d322801 Remove jquery-ui-i18n.js 2014-04-02 19:49:24 +03:00
Matt Westcott
42904aa22b Merge branch 'master' of github.com:torchbox/wagtail 2014-04-02 17:26:56 +01:00
Matt Westcott
6694b30bea Refactor wagtailuserbar logic - no need to split it between templatetags and views 2014-04-02 17:26:45 +01:00
Matt Westcott
cc78aef748 Remove redundant parameters from wagtailuserbar tag; trigger a DeprecationWarning if people are still passing a css path 2014-04-02 17:11:14 +01:00
Balazs
2506293d4d Removed trailing spaces from wagtailadmin js files 2014-04-02 16:59:11 +01:00
Balazs
115b5b3ae0 Merge branch 'master' of github.com:balazs-endresz/wagtail 2014-04-02 16:49:05 +01:00
Balazs
38c1b7e746 Removed trailing spaces from wagtailadmin scss files 2014-04-02 16:48:26 +01:00
Dave Cranwell
9e49d839db gs 2014-04-02 15:50:11 +01:00
Matt Westcott
8f781fd610 only show wagtailuserbar if page.id is defined - prevents error when previewing during page creation 2014-04-02 14:30:12 +01:00
Matt Westcott
095391e3cb changelog / contributors update for #166 2014-04-01 15:23:36 +01:00
Matt Westcott
2a7324a227 return None rather than '#' when no match found by slugurl 2014-04-01 15:19:47 +01:00
Matt Westcott
dc6e23ac53 add tests for pageurl / slugurl 2014-04-01 15:17:05 +01:00
Matt Westcott
0666c67716 Add missing Page import 2014-04-01 15:14:19 +01:00
Matt Westcott
e071cc89f4 Merge branch 'master' of https://github.com/jmiguelv/wagtail into jmiguelv-master 2014-04-01 15:06:48 +01:00
Serafeim Papastefanos
489f219de6 Add comment to remember why the tag is outside ...
compress.
2014-04-01 00:53:44 +03:00
Serafeim Papastefanos
8ea27f4571 Remove {% get_localized_datepicker_js %} from ...
{% compress %} tag to enable offline compression
2014-04-01 00:48:31 +03:00
Matt Westcott
14e15f6656 Fall back on username in moderation panel if full name not defined 2014-03-31 16:39:58 +01:00
Matt Westcott
5e373937eb changelog/contributors update 2014-03-31 11:49:57 +01:00
Matt Westcott
325b61f212 Add clarifying comment to the change_user_perm line 2014-03-31 11:34:54 +01:00
Matt Westcott
f309696ab7 Merge branch 'master' of https://github.com/v1kku/wagtail into v1kku-master
Conflicts:
	wagtail/wagtailusers/views/users.py
2014-03-31 11:32:33 +01:00
Serafeim Papastefanos
d85cd46f92 Include datepicker translations (fixes #167)
This includes all available translations for datepicker (version 1.10.3).
It also contains a list of all available translations in order to check
that the translation exists before including the translation file.
Finally, it puts the <script> for the translation inside the {% compress
%} tag.
2014-03-30 12:30:36 +03:00
Dave Cranwell
6603a9e761 Merge branch 'master' of github.com:torchbox/wagtail 2014-03-28 17:12:24 +00:00
Dave Cranwell
fd4697f677 sped up userbar fadein 2014-03-28 17:12:16 +00:00
Dave Cranwell
4821c56503 resolved merge conflicts 2014-03-28 17:10:47 +00:00
Dave Cranwell
207b28f1af added title tag to ellipsis items in edit page breadcrumb 2014-03-28 17:08:23 +00:00
Dave Cranwell
3261e1a268 view draft/view live now simply draft/live 2014-03-28 17:07:26 +00:00
Dave Cranwell
36ca7cb741 Updated breadcrumb and explorer style. Added vary_on_headers wherever ajax search results are returned. Added icons to headers where previously missed. 2014-03-28 17:05:29 +00:00
Matt Westcott
20da2468d2 Merge branch 'master' of github.com:torchbox/wagtail 2014-03-28 14:27:16 +00:00
Matt Westcott
cc3bad0ce1 Forcibly delete the sessionid cookie on logout.
This means that we can use its absence as an indication that front-end requests are being made by a non-logged-in user and are thus safe to cache (i.e. don't include the editor toolbar).
2014-03-28 14:26:09 +00:00
Dave Cranwell
80a2864017 quality of userbar js improved. also now checking origin to prevent postmessage listener trying to act on messages from other domains e.g vimeo 2014-03-28 10:57:47 +00:00