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
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
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
Matt Westcott
f85c2e76a9
correct NotImplementedError messages in wagtailimages/backends/base.py
2014-03-26 13:23:32 +00:00
Matt Westcott
1a28b572c2
Merge branch 'img-proc-backends' of https://github.com/spapas/wagtail into spapas-img-proc-backends
2014-03-26 13:19:59 +00:00
Lukasz 'utek' Boldys
499798da7a
Removing compress tag
2014-03-25 17:58:47 +01:00
Tom Dyson
bddb958444
Merge pull request #164 from chrxr/master
...
Added editors guide docs
2014-03-25 14:39:13 +00:00
chrxr
4e0637a233
added editors guide docs
2014-03-25 14:14:18 +00:00
Serafeim Papastefanos
f4faa3ecd7
Add more translations
2014-03-25 12:32:23 +02:00
Victor Munene
8e7cb95012
Patched the migrations and wagtailusers app to add better support for custom AUTH_USER_MODEL
2014-03-25 02:43:29 +03:00
Tom Dyson
d562659fff
New-style format needs numerical placeholders
2014-03-24 09:38:03 +00:00
utek
c497e8f72b
Merge branch 'master' of http://github.com/torchbox/wagtail
2014-03-21 09:53:38 +01:00
Dave Cranwell
ccfde52b08
iframe now hidden and faded in when loaded, for browsers with postMessage capability
2014-03-19 13:55:01 +00:00
Dave Cranwell
82158a49db
userbar embed code now separated into own file, with postmessage enabled to allow cross-frame coms to adapt frame height
2014-03-19 13:50:18 +00:00
Dave Cranwell
cbe4ce2913
fonts and javascript libs no longer loaded from CDNs
2014-03-19 12:29:12 +00:00
Dave Cranwell
83a5455251
old reference to edit bird removed. wagtail set to use offline js libs to avoid internet outage issues for local/intranet builds. Tweaks to way userbar is added to page to ensure resulting html is still valid
2014-03-19 11:37:57 +00:00
Dave Cranwell
279450abbd
tweaking userbar to suit slight alteration to icon layout behaviour in this branch
2014-03-18 17:30:02 +00:00
Dave Cranwell
29a86ec3df
Merge branch 'master' into ben-design-change
2014-03-18 17:06:06 +00:00
Dave Cranwell
e29b52f35e
Merge branch 'feature/edit-bird'
2014-03-18 17:05:09 +00:00
Dave Cranwell
876a2c42bc
removed debugging comments
2014-03-18 17:04:54 +00:00
Dave Cranwell
7c48546825
Merge branch 'master' into ben-design-change
2014-03-18 17:01:54 +00:00
Dave Cranwell
8e303e2410
Merge branch 'feature/edit-bird'
2014-03-18 17:00:33 +00:00
Dave Cranwell
fa94df6b03
tweak to alignment of text
2014-03-18 16:56:53 +00:00
Dave Cranwell
5e17881f2d
renamed all userbar templates to be more uniform and changed 'edit bird' to 'userbar' throughout
2014-03-18 16:53:56 +00:00
Dave Cranwell
d9d631c5b3
fixing horizontal position
2014-03-18 13:51:41 +00:00
Dave Cranwell
b79aeb5ff8
updated horizontal rule icon to use a more appropriate char
2014-03-18 13:49:32 +00:00
Dave Cranwell
29e1e22853
forgot to translate strings added in my previous commit
2014-03-18 12:48:58 +00:00
Matt Westcott
4702ef0acb
Merge branch 'master' of https://github.com/spapas/wagtail into spapas-master
2014-03-18 12:45:10 +00:00
Dave Cranwell
e4893a60ce
added alternate search areas to main search results
2014-03-18 12:40:45 +00:00
Dave Cranwell
d61ac002c0
updated animation and js requirements
2014-03-18 12:08:23 +00:00
Lukasz 'utek' Boldys
9bfa84f204
missing newline
2014-03-17 22:12:32 +01:00
Lukasz 'utek' Boldys
4766f2c266
Enable to extend admin panel with custom widgets jses and csses
2014-03-17 22:10:59 +01:00
Matt Westcott
39566a898d
Use relative paths for static-root / css-root - fixes #134
...
Using paths like /static/wagtailadmin/images/ in our SCSS breaks when a STATIC_URL
other than /static/ is in use - for example, when static assets are hosted on an
external domain. However, django-compressor consistently puts the compiled CSS
at ${STATIC_URL}/CACHE/css/ regardless of operation mode, so we can reliably use
../../ to reach the correct STATIC_URL.
2014-03-17 10:16:22 +01:00