Commit graph

320 commits

Author SHA1 Message Date
Selwin Ong
bb4e7ce36f Fixed an issue where `get_cache_key` may produce invalid memcached
keys.
2012-05-06 20:52:17 +07:00
Jannis Leidel
33c1197ad1 Merge pull request #30 from bmihelac/fix-27-MultipleObjectsReturned
Fix 27 multiple objects returned
2012-03-30 06:31:55 -07:00
Jannis Leidel
45407e1624 Merge pull request #29 from bmihelac/fix-28-test-warnings
Fix for #28
2012-03-30 06:31:23 -07:00
Bojan Mihelac
3aa3132255 Fix for #28 2012-03-30 15:25:45 +02:00
Bojan Mihelac
29f08281d7 Fix #27.
dbtemplates tries to find template from database which is associated
with current site, and if that fails then template from database which
is not associated with any site.
2012-03-30 15:14:21 +02:00
Bojan Mihelac
f503013b0f Add failing tests for #27.
Raises MultipleObjectsReturned with sites
2012-03-30 15:11:57 +02:00
Jannis Leidel
832b000c49 Merge pull request #21 from markstahler/develop
django-tinymce support
2012-03-19 14:18:49 -07:00
Jannis Leidel
311875c68b Merge pull request #25 from gandalfar/test_no_dbloader
fix for tests when dbtemplates template loader is not in main settings
2012-03-19 14:17:59 -07:00
Jure Cuhalev
0cfd927938 fix for tests when dbtemplates template loader is not in main settings.py 2012-02-25 22:47:05 +01:00
Jannis Leidel
ad7b258308 Force an encoding when writing the content to the file. 2012-02-24 23:35:51 +01:00
Mark Stahler
68d4342df4 removed urls.py which is not required if django-tinymce is installed
properly. fixed new bug relating to codemirror introduced by tinymce
2012-01-18 08:33:13 -05:00
Mark Stahler
edaf6ea258 respect column widths 2012-01-17 22:11:08 -05:00
Mark Stahler
e866e52074 fixed tinyMce not appearing in admin area 2012-01-17 21:58:47 -05:00
Mark Stahler
02aaad635a Added TinyMCE support via django-tinymce 2012-01-17 21:22:22 -05:00
Jannis Leidel
b13ffbb248 Merge pull request #19 from bmihelac/patch-2
Fix typo in docs - ``dbtemplates.loader.Loader`` should be first in ``TEMPLATE_LOADERS``.
2012-01-09 10:11:18 -08:00
bmihelac
3e18bc9784 Update docs/overview.txt 2012-01-09 13:12:19 +01:00
bmihelac
cb3fe58a6e Fix typo in docs - `dbtemplates.loader.Loader should be first in TEMPLATE_LOADERS`. 2012-01-09 12:56:09 +01:00
Jannis Leidel
6a6229648e Merge pull request #18 from bmihelac/patch-1
Fix typo in docs.
2012-01-09 03:46:42 -08:00
bmihelac
5a6053fef0 Fix typo in docs. 2012-01-09 12:37:26 +01:00
Jannis Leidel
1c10468529 Fixed ignore files. 2012-01-09 00:01:31 +01:00
Jannis Leidel
4ae9392e08 Use django-jenkins for tests and prepare it for ci.enn.io. 2012-01-09 00:01:17 +01:00
Jannis Leidel
9cc07437ee Updated year. 2012-01-09 00:00:10 +01:00
Jannis Leidel
65684c1243 Use latest versiontools. 2012-01-08 23:59:52 +01:00
Jannis Leidel
fcca3742e0 Minor cleanup in docs. 2012-01-08 23:59:34 +01:00
Jannis Leidel
cc94071fc4 Merge branch 'release/1.2.1' into develop 2011-09-07 12:08:42 +02:00
Jannis Leidel
41842de12d Bumped version to 1.2.1. 2011-09-07 12:05:09 +02:00
Jannis Leidel
b6d5bfa226 Use better testrunner. 2011-09-06 15:00:30 +02:00
Jannis Leidel
1224ab4005 Added versiontools requirement to setup.py. 2011-09-06 12:31:56 +02:00
Jannis Leidel
d5be3e42d5 Use django-appconf. 2011-09-06 12:31:28 +02:00
Jannis Leidel
fcc9045829 Fixed changelog and added bugfix to it. 2011-09-05 11:02:55 +02:00
Jannis Leidel
e3c53f6b17 Merge pull request #16 from dfalk/develop
Use ugettext_lazy instead of gettext_lazy for verbose name.
2011-08-25 15:49:44 -07:00
dfalk
9e81e53099 using ugettext 2011-08-26 01:28:49 +04:00
Jannis Leidel
f53536fdcd Merge branch 'release/1.2' into develop 2011-08-15 13:24:56 +02:00
Jannis Leidel
e12c6e8ece Updated translations. 2011-08-15 13:23:48 +02:00
Jannis Leidel
362af384a6 Updated base translation files. 2011-08-15 13:13:37 +02:00
Jannis Leidel
f6ea762ed4 Bumped to 1.2 and extended Trove classifiers. 2011-08-15 13:12:47 +02:00
Jannis Leidel
bfcf68fe63 Bundle authors list. 2011-08-15 13:09:29 +02:00
Jannis Leidel
6c08984118 Updated docs. 2011-08-15 13:08:46 +02:00
Jannis Leidel
e55e52156f Slight corrections to loader. 2011-08-15 13:08:38 +02:00
Jannis Leidel
52528648ba Fixed tests. 2011-08-15 13:05:34 +02:00
Jannis Leidel
ede4013fad Renamed admin action to be less ambiguous. 2011-08-15 13:05:26 +02:00
Jannis Leidel
09ece4a5e3 Some minor additions to the "performance speedup". Extends the list of authors, too. 2011-08-15 12:53:29 +02:00
Stephan Peijnik
49eb36775b Typo fix.
Signed-off-by: Stephan Peijnik <spe@anexia.at>
2011-08-15 12:48:16 +02:00
Stephan Peijnik
7e93da6a94 Removed license headers, reverted LICENSE file and added a CONTRIBUTORS file. 2011-08-15 12:48:10 +02:00
Stephan Peijnik
2d46b418da Use the cache to remember which templates were not found in the database.
Also reverse the logic of the database lookup. First check if there is
site-specific template in the database and only if that fails
try to load the global template.
This should cut down the number of database queries that need to be executed,
especially in a loop that includes a given template that does not exist
in the database.

Signed-off-by: Stephan Peijnik <spe@anexia.at>
2011-08-15 12:48:02 +02:00
Matt Dorn
6c25da5301 Added template syntax checker admin actions. 2011-08-15 12:42:27 +02:00
Jannis Leidel
29cedc5271 Merge branch 'release/1.1.1' into develop 2011-07-08 15:01:22 +02:00
Jannis Leidel
88f6c54c83 Bumped version up a bit. 2011-07-08 15:00:28 +02:00
Jannis Leidel
7449de7483 Extended docs about using the Loader class instead of the previously available function. Fixes #11. 2011-07-08 14:56:24 +02:00
Jannis Leidel
692a77725d Added links to the repo on Github. Fixes #10. 2011-07-08 14:53:11 +02:00