Maik Hoepfel
4ded832f34
Manual merge branch 'feature/betterdocs'
Conflicts:
docs/source/recipes.rst
13 år sedan
Sebastian Vetter
e117d1da77
Update versions of haystack and virtual-node
13 år sedan
Moose
5ccd7e667e
Changing import of Image
The::
import Image as PImage
was failing since the switch to `Pillow`. The commit changes it to::
from PIL import Image
13 år sedan
David Winterbottom
9fbff6ff93
Merge in latest transifex .po files
13 år sedan
David Winterbottom
379389ec00
Use 'percentage' instead of '%' in translatable strings
Transifex chokes on the '%' sign. This is a work-around.
13 år sedan
David Winterbottom
d6003f7408
Update all .po files
13 år sedan
Tomasz Wysocki
a0107cf083
Translate Polish strings.
Fixes #564
13 år sedan
David Winterbottom
a154381283
Patch in Russian translations from PR #458
Merging went wrong so had to do this the hard way.
Thanks to @dgk though!
Fixes #458
13 år sedan
David Winterbottom
3e05d1414e
Use 'ru_RU' instead of 'ru' for Russian translations
13 år sedan
David Winterbottom
32e21862fa
Pull updated transifex translations
13 år sedan
David Winterbottom
dc240eb973
Merge pull request #520 from tangentlabs/fix/prevent_signal_failure_when_loading_fixtures
Ignore signals when loading fixtures
13 år sedan
David Winterbottom
e671b575da
Merge pull request #533
13 år sedan
Maik Hoepfel
9103c8a7c8
Docs: Explain docs/ directory structure
13 år sedan
Maik Hoepfel
6456126924
Update docs/ structure
To set a base for upcoming docs changes, the docs directory structure
has been streamlined to follow a simplified version of Django's docs.
The old _draft folder has been removed. Both files from there and the
current docs that don't fit nicely into the new structure are in _old/
for the moment.
13 år sedan
David Winterbottom
0535fe1b5e
Add recipe on how to integrate a payment partner
13 år sedan
David Winterbottom
5eb7588307
Replace pinocchio with spec
It's a more up-to-date version of the same thing.
13 år sedan
Maik Hoepfel
d0346c0f36
Rename base for ProductCategoryFormSet
Currently, the base class that is used to construct the
ProductCategoryFormSet and the ProductCategoryFormSet (as returned by
inlineformset_factory) share the same name. This makes overriding
harder and is against the Django docs.
As the base FormSet is never used in Oscar apart from using it in the
factory, I've renamed it to BaseProductCategoryFormSet, keeping it in
line with Django docs.
13 år sedan
Sebastian Vetter
a73c5109dc
Fix error in create product view when continue editing clicked
13 år sedan
David Winterbottom
709af8f3e8
Remove ability to delete categories from product dashboard
As mentioned in #510
There's no real use-case for deleting a category from an inline on the
product form. This could easily be triggered by accident with serious
consequences. Better to remove the option all together.
13 år sedan
David Winterbottom
5dfb5c44a7
Tidy up forms.py
* Remove tabs
* PEP8!
13 år sedan
David Winterbottom
1ed72fbcf1
Merge pull request #322
Conflicts:
setup.py
13 år sedan
David Winterbottom
af2dee1965
Add slug blacklist setting
So stopwords can be moved from slugs
13 år sedan
David Winterbottom
d41dc28d4b
Add support for a custom slug mapping setting
13 år sedan
David Winterbottom
4eae13ca52
Package core unit tests
13 år sedan
David Winterbottom
aa7f899c51
Move catalogue tests to integration folder...
...as they are all integration tests (they save stuff).
13 år sedan
David Winterbottom
aabbe853c3
Merge pull request #449
13 år sedan
David Winterbottom
bbdebec66d
Upgarde jQuery colorbox to work with jQuery 1.9
13 år sedan
David Winterbottom
6678380516
Correct URL in README
13 år sedan
David Winterbottom
94e82a0d03
Add missing var to ui.js
13 år sedan
Maik Hoepfel
6185c87c9a
Merge pull request #509 from davividal/pagination
Adding a config option to set a paginate_by for products
13 år sedan
Maik Hoepfel
a47a296eb7
Merge pull request #558 from tangentlabs/fix/sandboxassets
Rename sandbox/assets to sandbox/public
13 år sedan
Maik Hoepfel
5ffe9df6fa
Merge pull request #552 from davividal/flatpages
Adding docs about how to setup flatpages.
13 år sedan
Maik Hoepfel
e2532bdbe2
Switch from PIL to pillow.
Suggested in #449 .
13 år sedan
Maik Hoepfel
16a5b02aa5
Rename sandbox/assets/ to public/
997e317e changed the sandbox's MEDIA_ROOT. This update moves the path
accordingly, so that image_not_found.jpeg is found by sorl.
13 år sedan
Moose
51040a8eea
Adding docs for post_checkout signal
13 år sedan
Moose
c6dfa9b862
Adds a post_checkout signal
13 år sedan
Moose
813664479c
Correcting typo
13 år sedan
Moose
420d3aa041
Updating signal docs
13 år sedan
Moose
470c824941
Adding a signal on review added
13 år sedan
David Winterbottom
a808fdbac4
Add 2 new example sites to README
13 år sedan
Davi Vidal
172c2aadd1
Adding docs about how to setup flatpages.
13 år sedan
David Winterbottom
2b47dbfb10
Set tabindex=1 on search input
Read about this here:
http://news.ycombinator.com/item?id=5330998
Seems like a good default.
13 år sedan
David Winterbottom
8241734222
Fix bad path in nginx config for sandbox/qa sites
13 år sedan
David Winterbottom
796c833cdb
Document the dependencies in setup.py
13 år sedan
Davi Vidal
0f1d3a4d65
Adding doc about the configuration option
13 år sedan
David Winterbottom
3b3283bf4d
Adjust runtests to collect test paths
This allows an autocompleter to be written for faster test lookups.
13 år sedan
David Winterbottom
f80cb5e9fa
Fix warning from bytestrings being slugified
13 år sedan
David Winterbottom
59965e7239
Switch to new unicode-aware slugify everywhere
13 år sedan
David Winterbottom
aab093deea
Convert non-ASCII char to ASCII for category slugs
This uses the unidecode package to convert non-ASCII words to ASCII
equivalents. We use a new slugify function to wrap this logic as we
will want to use it elsewhere.
See this StackOverflow thread for context:
http://stackoverflow.com/questions/702337/how-to-make-django-slugify-work-properly-with-unicode-strings/
Unidecode becomes a new dependency for Oscar.
https://pypi.python.org/pypi/Unidecode
Hat-tip to @avsazonov for suggesting this fix.
13 år sedan
David Winterbottom
fc9999e70b
Rework subtree updating after move
New impl is considerably simpler and lets the save method update each
node's slug and full name.
13 år sedan