Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-04-22 15:44:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
2051 commits 30 branches 112 tags 89 MiB
Commit graph

2051 commits

This branch
This branch
All branches
Author SHA1 Message Date
Karl Hobley
de70f2ab89 Improved implementation of usage_count_enabled 
Thanks to @gasman for spotting
 2014-07-31 12:19:09 +01:00
Karl Hobley
1ac807ce09 Merge branch '146-display-calculated-usage' 
Conflicts:
	wagtail/wagtailimages/models.py
	wagtail/wagtailimages/templates/wagtailimages/images/edit.html
	wagtail/wagtailimages/tests.py
	wagtail/wagtailimages/urls.py
	wagtail/wagtailimages/views/images.py
 2014-07-31 12:17:16 +01:00
Karl Hobley
92e249bba2 Fixed typo 2014-07-31 11:32:27 +01:00
Karl Hobley
4cb6fb53be Fixed indentation in usage templates. Removed invalid section elements 2014-07-31 11:30:49 +01:00
Karl Hobley
0c425976ca Improvements to titles of images/docs/snippets usage pages 2014-07-31 11:20:46 +01:00
Karl Hobley
b02c26ef77 Various renames, API changes, etc 2014-07-31 11:20:41 +01:00
Karl Hobley
7fa86fe608 Made useage count link translatable 2014-07-31 11:05:23 +01:00
Matt Westcott
ea5550c6b3 Merge pull request #520 from precise54/fix-deprecation-warning 
Fix deprecation warning for renamed wagtail_images
 2014-07-31 09:32:14 +01:00
Karl Hobley
07bc13006b Merge pull request #519 from gasman/feature/fail-on-wagtailimages-urlconf-clash 
Check for URL path clashes caused by pre-Wagtail-0.3 urlconfs that try to import wagtail.wagtailimages.urls as /admin/images/
 2014-07-31 09:28:42 +01:00
Karl Hobley
3a55ca17da Removed a couple of stray backticks 2014-07-31 09:17:52 +01:00
David Smith
29ee70aa7e Fix deprecation warning for renamed wagtail_images 2014-07-31 16:40:48 +10:00
Matt Westcott
379d48e7a4 Check for URL path clashes in wagtailimages caused by a pre-wagtail-0.3 urlconf, and fail loudly if one is encountered 2014-07-30 22:24:22 +01:00
Matt Westcott
7589748141 Merge branch 'kaedroho-image-frontend-urls' 2014-07-30 19:31:40 +01:00
Matt Westcott
30142d6201 add release notes / changelog for using images outside wagtail 2014-07-30 19:12:51 +01:00
Matt Westcott
2158dd1fc0 Add upgrade considerations note about admin/images URLs 2014-07-30 19:12:51 +01:00
Matt Westcott
738e0a44b2 add gettingstarted back to docs index (removed by mistake) 2014-07-30 19:12:51 +01:00
Matt Westcott
1388822b9b copyediting on the 'using images outside wagtail' docs 2014-07-30 19:12:51 +01:00
Karl Hobley
196810b9ea Updated docstring of process_image 2014-07-30 19:12:51 +01:00
Karl Hobley
f60216d783 Use a local URL for image previews 2014-07-30 16:41:58 +01:00
Karl Hobley
b1c29ac848 Fixed a couple of merge typos 2014-07-30 12:20:48 +01:00
Karl Hobley
b566b72736 Merge remote-tracking branch 'torchbox/master' into image-frontend-urls 
Conflicts:
	docs/core_components/images/index.rst
	wagtail/wagtailimages/models.py
	wagtail/wagtailimages/tests.py
	wagtail/wagtailimages/utils/validators.py
 2014-07-30 09:47:59 +01:00
Matt Westcott
f145719475 Merge branch 'kaedroho-image-smartcropping' 2014-07-29 17:22:06 +01:00
Matt Westcott
76491f5454 Add release notes for image feature detection 2014-07-29 17:19:50 +01:00
Karl Hobley
d515029359 Moved frontend image url docs into new images section 2014-07-29 16:35:34 +01:00
Karl Hobley
11e8770a1b Merge branch 'master' into image-frontend-urls 
Conflicts:
	docs/index.rst
 2014-07-29 16:35:04 +01:00
Matt Westcott
71138ef021 Add note that the 'libdc1394 error' thrown by OpenCV is harmless 2014-07-29 16:35:01 +01:00
Matt Westcott
f70c42e6c3 Merge branch 'image-smartcropping' of https://github.com/kaedroho/wagtail into kaedroho-image-smartcropping 2014-07-29 15:51:03 +01:00
Karl Hobley
a5f0f8ed19 Added note to say that searching on extra fields with the database backend is not supported 2014-07-29 14:57:29 +01:00
Karl Hobley
8722827937 Improvements to feature detection docs 2014-07-29 13:28:13 +01:00
Karl Hobley
56acdb2bd7 Moved image feature detection docs into new images section 2014-07-29 13:13:39 +01:00
Karl Hobley
509d066a41 Merge remote-tracking branch 'torchbox/master' into image-smartcropping 2014-07-29 13:08:14 +01:00
Karl Hobley
32378135bb Moved focal point fields migration into south_migrations 2014-07-29 13:07:19 +01:00
Karl Hobley
d6dd8d53b6 Merge branch 'master' into image-smartcropping 2014-07-29 13:06:25 +01:00
Tom Dyson
ce71b7d010 Merge pull request #511 from kaedroho/docs_restructure 
Docs restructure
 2014-07-29 12:23:24 +01:00
Karl Hobley
44ef57a6f0 Removed focal_point parameter from get_rendition 2014-07-29 10:07:14 +01:00
Karl Hobley
3d0bd3dfbd Implemented 'image_data_as_rgb' on Wand backend 2014-07-29 10:06:11 +01:00
Matt Westcott
b48089c88c Merge branch 'kaedroho-test-with-custom-user-model' 2014-07-28 13:12:50 +01:00
Matt Westcott
b7d16f51f4 remove newly-added references to User in test_account_management 2014-07-28 13:12:28 +01:00
Matt Westcott
0f92ccb972 Merge branch 'test-with-custom-user-model' of https://github.com/kaedroho/wagtail into kaedroho-test-with-custom-user-model 
Conflicts:
	runtests.py
	wagtail/tests/utils.py
 2014-07-28 13:08:23 +01:00
Matt Westcott
e6b45af2b1 Merge branch 'takeflight-feature/test-db-settings' 2014-07-28 12:07:49 +01:00
Matt Westcott
1d0c01e5fa Merge branch 'feature/test-db-settings' of https://github.com/takeflight/wagtail into takeflight-feature/test-db-settings 
Conflicts:
	runtests.py
 2014-07-28 12:07:34 +01:00
Matt Westcott
560c97a9ed Merge pull request #430 from kaedroho/south-1.0 
Use South 1.0 migration directory
 2014-07-28 08:40:37 +02:00
Matt Westcott
bcbaa4c86b Merge pull request #498 from kaedroho/deprecation_warnings 
Versioned deprecation warnings
 2014-07-28 08:32:38 +02:00
Karl Hobley
fe74aa1d00 Removed Advanced topics 2014-07-25 15:57:42 +01:00
Karl Hobley
833cfec501 Moved 'settings.rst' into howto 2014-07-25 15:57:06 +01:00
Karl Hobley
fc4b1ba177 Removed 'Overview' title from Pages index (was messing up toctree) 2014-07-25 15:41:20 +01:00
Karl Hobley
30cb0b2aae Moved some docs into contrib components 2014-07-25 15:38:53 +01:00
Karl Hobley
90cec360ff Moved roadmap into releases section 2014-07-25 15:35:15 +01:00
Karl Hobley
2b9249907b Added reference section 2014-07-25 15:33:41 +01:00
Karl Hobley
b7862a91d0 Added howto section 2014-07-25 15:32:35 +01:00