0
0
mirror of https://github.com/wagtail/wagtail.git synced 2024-11-24 01:57:32 +01:00
Commit Graph

16574 Commits

Author SHA1 Message Date
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
Serafeim Papastefanos
b7158bb3fa Removes hard coded links to /admin
The _editor_js.html page has been modified in order to get the urls to the
various views through the {% url %} tag and add them to the global window
variable. I believe that this is actually the best solution in our case
and I like it much better than the other available options.
2014-02-12 11:03:47 +02:00
Dave Cranwell
3bd7fd1940 updates 2014-02-11 17:23:56 +00:00
Dave Cranwell
98daeb6a21 wholesale move from less to scss. some files stll need checking 2014-02-11 17:18:59 +00:00
Tom Dyson
594d7e03e3 Update CONTRIBUTORS 2014-02-11 17:16:12 +00:00
Karl Hobley
e32ab5b7c5 Merge pull request #29 from kaedroho/feature/search-backends
Multiple backend support in wagtailsearch
2014-02-11 16:52:46 +00:00
Karl Hobley
fd95cc0517 Fixed crash when tests are run without WAGTAILSEARCH_BACKENDS setting set 2014-02-11 16:18:47 +00:00
Matt Westcott
d95daa5d57 remove celery from requirements in setup.py 2014-02-11 16:13:08 +00:00
Karl Hobley
03e70df24f Merge branch 'feature/search-tests' into feature/search-backends 2014-02-11 15:33:32 +00:00
Karl Hobley
e40265cf40 Search: test retrieval of results 2014-02-11 15:30:55 +00:00
Karl Hobley
a3463c9787 More unit tests changes 2014-02-11 15:22:11 +00:00
Karl Hobley
c809565217 Search: Use self.stdout.write for messages in management commands 2014-02-11 15:21:54 +00:00
Karl Hobley
c159e273f9 Added multi backend support into searcher 2014-02-11 15:21:21 +00:00
Serafeim Papastefanos
a2319a897a Modified tasks.py to use celery only if available
Please see the comments inside tasks.py.
TL;DR: Defines a fake "task" decorator - the fake
decorator was needed to add the delay() attribute
to the send_notification function
2014-02-11 16:48:53 +02:00
Karl Hobley
9db3e1ce5b More improvements to unit tests 2014-02-11 14:29:36 +00:00
Karl Hobley
cb1a412c3c DB backend now doesnt attempt to search on callable fields 2014-02-11 14:28:47 +00:00
Karl Hobley
f8d2c0bc81 update_index command is now callable from unit tests 2014-02-11 14:28:20 +00:00
Karl Hobley
daa1f7fd9c Search: more unit tests 2014-02-11 13:46:38 +00:00
Karl Hobley
ae6bd25d17 Search: Various tweaks to backend importer 2014-02-11 13:46:13 +00:00
Matt Westcott
e7bb62d8ec Merge branch 'master' of https://github.com/spapas/wagtail into spapas-master 2014-02-11 13:32:03 +00:00