Wykres commitów

2143 Commity (3a1099e33080e42e7f4f17e9c91b9576ff912627)

Autor SHA1 Wiadomość Data
Neal Todd 11f2a1edf5 Matching test database name to exactly the postgres default in runtests.py. 2014-02-14 12:26:44 +00:00
Neal Todd 919f649674 Wagtail doesn't require postgres but tests currently configured to run using postgres so need to install psycopg2 dependency. 2014-02-14 12:15:34 +00:00
Neal Todd 2016dd8875 Fixed typo 2014-02-14 12:08:42 +00:00
Neal Todd f331bb3e2d Merge branch 'master' of github.com:torchbox/wagtail 2014-02-14 12:03:37 +00:00
Neal Todd 22e1f75684 Initial Travis CI configuration to test the CI setup itself. 2014-02-14 12:03:29 +00:00
Dave Cranwell 45f209c266 resolving conflicts 2014-02-14 12:00:30 +00:00
Dave Cranwell 6abd3e6a59 Merge branch 'master' of github.com:torchbox/wagtail 2014-02-14 11:57:24 +00:00
Dave Cranwell 4e5800265f removed 'account' text which was only ever present in an impossible situation 2014-02-14 11:53:44 +00:00
Dave Cranwell 120f8a4abf various regression fixes 2014-02-14 11:51:27 +00:00
Karl Hobley 3a1909be9f Merge pull request #40 from kaedroho/master
Added requests to requirements
2014-02-14 11:30:58 +00:00
Karl Hobley 7b2eb66e2c Added requests to requirements 2014-02-14 11:28:05 +00:00
Karl Hobley 40fc90e6fc Merge pull request #38 from peterarenot/master
Redirect from login view if user already logged in
2014-02-14 10:27:16 +00:00
Karl Hobley 054f9ec709 Merge pull request #37 from kaedroho/feature/embeds-tweaks
Added 'embed finders'. Cleaned up wagtail embeds
2014-02-14 10:22:52 +00:00
Dave Cranwell 530b2b2247 merging changes to less in master 2014-02-14 10:01:45 +00:00
Peter Arnott 193b75e152 Change login view to the login_wrapper view 2014-02-14 18:59:08 +11:00
Peter Arnott 4f914fdc57 Create login_wrapper view
Redirect the user if they are already logged in.
2014-02-14 18:51:18 +11:00
Karl Hobley f2ca7426ec Added 'embed finders'. Cleaned up wagtail embeds 2014-02-13 23:15:07 +00:00
Tom Dyson 05e4e52408 Change tutorial link to Serafeim's blog 2014-02-13 22:54:11 +00:00
Matt Westcott b45472ea00 Use staticfiles-ish paths in import lines, to work with django-pyscss 2014-02-13 20:16:41 +00:00
Matt Westcott 7113fe75d5 Merge branch 'master' into sass 2014-02-13 19:48:02 +00:00
Dave Cranwell a819527cab Update README.rst 2014-02-13 16:56:38 +00:00
Dave Cranwell d08ef04dcb unified search in header bar. still todo: searches in modals 2014-02-13 16:51:11 +00:00
Dave Cranwell 1e0d63ee72 password inputs should reflect errors too 2014-02-13 16:00:38 +00:00
Dave Cranwell d57b9e239b Merge branch 'master' of github.com:torchbox/wagtail 2014-02-13 15:47:29 +00:00
Dave Cranwell 8daf6b3407 added user searching 2014-02-13 15:47:19 +00:00
Tom Dyson c397a62d49 Update README.rst with link to @spapas's tutorial 2014-02-13 15:33:53 +00:00
Matt Westcott 1e932c0b0b fix typo in emed_filters typo 2014-02-13 14:44:05 +00:00
Matt Westcott ddd4b8a9c1 temporarily disable outdated wagtailembeds test 2014-02-13 12:55:08 +00:00
Matt Westcott e419cc0618 ensure that test-static gets torn down even if tests fail 2014-02-13 12:53:52 +00:00
Matt Westcott f1e9a4703d apparently we don't need imports in tests/__init__.py 2014-02-13 12:53:18 +00:00
Matt Westcott 069ff69335 Merge branch 'master' of github.com:torchbox/wagtail 2014-02-13 12:44:57 +00:00
Matt Westcott a77977a31c add a general test runner for wagtail, accessible by running './runtests.py' or 'make test' from the wagtail repo, or 'manage.py test wagtail' from a django project such as wagtaildemo 2014-02-13 12:44:49 +00:00
Karl Hobley a0f09e1990 Merge remote-tracking branch 'torchbox/master'
Conflicts:
	setup.py
2014-02-13 12:24:16 +00:00
Tom Dyson 7d4696c83a Tree support in feature list. 2014-02-13 12:08:43 +00:00
Tom Dyson a51e609f3f Update README.rst with feature list 2014-02-13 11:41:56 +00:00
Matt Westcott e3c6987a0f Merge branch 'master' of github.com:torchbox/wagtail 2014-02-13 11:00:40 +00:00
Matt Westcott 02e99b9e58 remove stray print statement from gravatar tag 2014-02-13 11:00:05 +00:00
Matt Westcott a48cbd68e2 update requirements in setup.py 2014-02-13 10:53:58 +00:00
Serafeim Papastefanos ead0ebeb4e Remove embedly from setup.pu requirements 2014-02-13 04:09:18 +02:00
Serafeim Papastefanos 74b9f43401 Make embedly optional and refactor code
This fixes #26. First of all there is some refactoring: All low level
embed functions have been moved to the wagtail.wagtailembeds.embeds
package. There you will see:

. embed.py (which is more or less a copy of the old embeds.py)
. oembed_api.py which includes some low level code for using embedding
with the help of oembed, without any external dependencies (python-oembed
was not working very well and since oembed is just a URL get to a specific
URL I implemented it with urllib2 and json),
. endpoints.json which is a list of oembed endpoints I got from
https://github.com/panzi/oembedendpoints/blob/master/endpoints-regexp.json
. unittests.py with some tests to check that well known sites like
youtube, vimeo etc work fine with the oembed_api

The code refactoring also includes a number of exceptions. The get_embed
function now is included in try / except blocks and if an exception occurs
then the output will be an emtpy string (this was the behavior before the
refactor). However, in the chooser.py function the type of the exception
will be checked and a nice message will be shown to the editor.

Finally, to choose between embedly and the oembed a check is made to see
if the embedly library has been installed and also check if EMBEDLY_KEY
has been set in the settings. If these two checks are both true then the
get_embed will be assigned to get_embed_embedly -- else it will be
assigned to get_embed_oembed.
2014-02-13 04:01:51 +02:00
Serafeim Papastefanos 0ddc5a6ff6 Added the endpoints.json and modified embeds.py
Now embeds.py has the infrastructre to select a different get_embed
function depending on if embedly should be used or not.

the different get_embed (get_embed_oembed) function should be written
now...
2014-02-12 22:21:18 +02:00
Tom Dyson be67b59b07 Update README.rst
link to wagtaildemo and make t-shirt promise.
2014-02-12 18:21:16 +00:00
Matt Westcott f7e1560a85 Merge branch 'master' into sass 2014-02-12 17:48:42 +00:00
Matt Westcott 2f13e5211a stylistic tweaks to b7158bb3fa (camel case for js vars; using a dict rather than adding vars indefinitely to the window scope; avoiding potentially dynamic code inside compress blocks) 2014-02-12 12:26:06 +00:00
Matt Westcott d9219a8515 Merge branch 'master' of https://github.com/spapas/wagtail into spapas-master 2014-02-12 12:10:44 +00:00
Dave Cranwell 5e9128fd2a merging change from master 2014-02-12 11:08:15 +00:00
Karl Hobley 9c1875d06d Merge pull request #32 from kaedroho/feature/search-unit-tests
Wagtailsearch unit tests
2014-02-12 11:07:45 +00:00
Dave Cranwell 51a16a0758 further tweaks to text size in explorer 2014-02-12 11:07:14 +00:00
Karl Hobley 1600e93491 More wagtailsearch unit tests 2014-02-12 10:50:23 +00:00
Karl Hobley f643c78053 Tweaks to the search frontend views 2014-02-12 10:49:31 +00:00