Commit graph

343 commits

Author SHA1 Message Date
Jannis Leidel
4c3c459e82 Updated changelog. 2012-05-07 23:47:30 +02:00
Jannis Leidel
60215fe947 Updated AUTHORS file. 2012-05-07 23:47:15 +02:00
Jannis Leidel
a1cec65e29 Removed INSTALL file from manifest template. 2012-05-07 14:15:52 +02:00
Jannis Leidel
e7b6b8ce00 Ignore long lines, stupid. 2012-05-07 14:12:07 +02:00
Jannis Leidel
d018f826da Forgotten dirname for flake8. 2012-05-07 14:10:12 +02:00
Jannis Leidel
07fe3cc7ee Fixed typo. 2012-05-07 14:08:08 +02:00
Jannis Leidel
842e08cf2e Switched to using nose and django-nose for easy test running. 2012-05-07 14:06:54 +02:00
Jannis Leidel
2e430d5370 Minor code cleanup of the migrations. 2012-05-07 10:57:36 +02:00
Jannis Leidel
2f27327beb Handle timezone on 1.4 correctly. 2012-05-07 10:57:23 +02:00
Jannis Leidel
f1e680aa31 Added link to Travic build. 2012-05-07 10:54:26 +02:00
Jannis Leidel
0e43258b5b Added DATABASES setting to please Django 1.4. 2012-05-07 10:35:31 +02:00
Jannis Leidel
d926d6c934 Merge pull request #32 from selwin/develop
Fixed an issue where ``get_cache_key`` may produce invalid memcached keys
2012-05-07 01:32:40 -07:00
Jannis Leidel
f3fc408385 Get the database name from the routers and dropped support for 1.2.X. 2012-05-07 10:31:24 +02:00
Jannis Leidel
20aebf894d Limit the tests to dbtemplates. 2012-05-07 09:48:01 +02:00
Jannis Leidel
d3ccb0c42a Stop using a context manager when we don't need it really. 2012-05-07 09:04:31 +02:00
Jannis Leidel
222c7947d2 Added auth app to list of installed apps during tests. 2012-05-07 09:04:05 +02:00
Jannis Leidel
bea453548f Renamed test requirements file to correct name. 2012-05-07 08:58:36 +02:00
Jannis Leidel
abc2fe5cd2 Added a few more test requirements. 2012-05-07 08:57:45 +02:00
Jannis Leidel
87c5c46999 Further fiddling with the travis config. 2012-05-07 08:55:27 +02:00
Jannis Leidel
0ff18227f9 Hrm, setting the variable in the env block? 2012-05-07 08:43:48 +02:00
Jannis Leidel
20a5d9fc66 Forgot to set the DJANGO_SETTINGS_MODULE var. 2012-05-07 08:41:02 +02:00
Jannis Leidel
3c67628a63 Removed dependency on versiontools. 2012-05-07 08:36:01 +02:00
Jannis Leidel
45700c7e1c Moved CI to Travis. 2012-05-07 08:35:36 +02:00
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