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
Matt Westcott
341cacea54
Unit tests for new page serve methods introduced in #144
2014-03-26 17:04:01 +00:00
Miguel Vieira
71ac0ac658
Added template tag slugurl
...
Added a new tag that returns a page URL according to the page slug.
2014-03-26 16:27:12 +00:00
Matt Westcott
0157d4fb94
Merge branch 'page-changes' of https://github.com/kaedroho/wagtail into kaedroho-page-changes
2014-03-26 16:11:18 +00:00
Matt Westcott
42867786b1
Merge branch 'master' of github.com:torchbox/wagtail
2014-03-26 15:47:52 +00:00
Matt Westcott
4f793d3a1e
changelog item for #152
2014-03-26 15:47:23 +00:00
Matt Westcott
77cf58c024
Merge branch 'master' of https://github.com/utek/wagtail into utek-master
2014-03-26 15:34:44 +00:00
Matt Westcott
3d889e02b3
Merge pull request #162 from spapas/master
...
Add more translations
2014-03-26 15:10:24 +00:00
Matt Westcott
9fdf2f4f27
Changelog additions
2014-03-26 14:42:49 +00:00
Matt Westcott
509f5a37b2
Skip image backend tests for wand if wand is not installed
2014-03-26 13:56:40 +00:00