Commit graph

263 commits

Author SHA1 Message Date
Jannis Leidel
bc206765fa
Appease flake8. 2017-11-22 11:01:02 +01:00
Khamid Tomov
8176a137dd Recompiled russian locale correctly 2017-05-18 18:00:03 +03:00
Paul Gueltekin
1c9467fa37 fixed method call with named argument 2017-01-17 16:51:06 +01:00
Jannis Leidel
70fb31c190 Add Django appconfig for overriding the name in the admin 2016-09-20 12:41:44 +02:00
Jannis Leidel
e4acf6e754 Use saner test assertion 2016-09-20 12:02:03 +02:00
Jannis Leidel
3d5d70db41 More Py3 fixes 2016-09-20 11:46:13 +02:00
Jannis Leidel
8c1e33de72 Use io instead of codecs 2016-09-20 11:34:28 +02:00
Jannis Leidel
44c040523a Remove last version switch 2016-09-20 11:34:15 +02:00
Jannis Leidel
39c8420511 Fix a codec issue in Py3 2016-09-20 11:20:34 +02:00
Jannis Leidel
7454e109ea Update docs 2016-09-20 10:57:49 +02:00
Jannis Leidel
d7ecd93cce Port to Python 3 and removed legacy code 2016-09-20 10:34:59 +02:00
Jannis Leidel
f0cfdfa9ce Use better version checks, fix #78 2016-09-20 10:33:24 +02:00
Michael Kutý
ca8841ce9c Use native importlib. 2016-01-03 00:01:45 +01:00
Mikhail Polykovskij
2c7afb6a1a Fix localization 2015-10-16 17:05:42 +05:00
Michael Kutý
9648555473 fix RemovedInDjango19Warning: 'get_cache' is deprecated in favor of 'caches'. 2015-09-17 21:15:10 +02:00
Michael Kutý
c8a048352e Fix some Python 3 issues - thanks @vikingco 2015-08-19 11:42:39 +02:00
Michael Kutý
c55e2220b3 use managers for django 1.8+ 2015-07-23 15:42:07 +02:00
Michael Kutý
70da2e6a48 use migrations generated from django 1.7 2015-07-15 00:08:45 +02:00
Michael Kutý
04c2d12dbd added django migrations and south moved to own directory 2015-07-14 23:30:53 +02:00
Michael Kutý
42590af744 fixed (fields.W340) null has no effect on ManyToManyField and import sorting 2015-07-06 22:16:43 +02:00
Michael Kutý
464425b236 fix settings runtime patching which cause fails because if we set correct template dirs is not there test dirs 2015-06-16 00:07:27 +02:00
Michael Kutý
201077e11b properly collect template dirs for all available template engines in dj 1.8 and prettify readme 2015-06-15 23:10:41 +02:00
Michael Kutý
99ed8b2ce3 fix app dirs on django 1.8 2015-06-15 22:44:44 +02:00
Michael Kutý
51b62d9a62 omg fix pep8 passing 2015-06-15 21:17:18 +02:00
Michael Kutý
c9569a81db update readme and added notice about compatibility, bump version and changelog 2015-06-15 21:03:09 +02:00
Michael Kutý
b47af2e1ff added middleware classes 2015-06-15 20:36:24 +02:00
Michael Kutý
16fe97575c pep8 cleanup and fix test runner for new django 2015-06-15 20:20:02 +02:00
Michael Kutý
0e97716488 ModelForm now requires either fields or exclude - mentoined in #52 thanks @volksman 2015-06-15 16:54:21 +02:00
Michael Kutý
b03803010d Merge pull request #59 from eculver/develop
Support for using redactorjs for editing templates.
2015-06-15 16:48:43 +02:00
Michael Kutý
078d556390 fix flake8 2015-06-15 16:44:34 +02:00
Michael Kutý
658aca88dc bump version 2015-06-15 16:35:15 +02:00
Michael Kutý
685c77e718 proper solution 2015-04-28 11:16:06 +02:00
Michael Kutý
15c4a5930b fix loader for django 1.8 2015-04-28 01:03:45 +02:00
Michael Kutý
50a877a7d5 fix name 2015-04-28 01:00:24 +02:00
Michael Kutý
c2d49e1d71 hot-fixed populating template djagno 1.8+ 2015-04-27 23:40:42 +02:00
Sutrisno Efendi
4352fb639e Include fields to class Meta 2014-09-23 15:19:16 +07:00
Wasil W Sergejczyk
12ffd84380 add Russian locale 2013-07-30 14:35:07 +06:00
Jannis Leidel
4b024de965 Minor cosmetic changes to please flake8. 2013-04-04 11:33:00 +02:00
Evan Culver
2fc79eda7a Support for using redactorjs for editing templates. 2012-09-05 16:47:34 -04:00
Jannis Leidel
d2f595ce82 Moved to django-discover-runner. 2012-05-23 23:50:32 +02:00
Jannis Leidel
f7378df802 Use __isnull for querying a non-site specific template. Refs #33. 2012-05-19 21:40:47 +02:00
Jannis Leidel
8844180d6c Bumped version to 1.3. 2012-05-07 23:52:59 +02:00
Jannis Leidel
c59de762f9 Correct version. 2012-05-07 23:48:21 +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
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
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
3c67628a63 Removed dependency on versiontools. 2012-05-07 08:36:01 +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
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
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
4ae9392e08 Use django-jenkins for tests and prepare it for ci.enn.io. 2012-01-09 00:01:17 +01:00
Jannis Leidel
b6d5bfa226 Use better testrunner. 2011-09-06 15:00:30 +02:00
Jannis Leidel
d5be3e42d5 Use django-appconf. 2011-09-06 12:31:28 +02:00
dfalk
9e81e53099 using ugettext 2011-08-26 01:28:49 +04: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
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
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
88f6c54c83 Bumped version up a bit. 2011-07-08 15:00:28 +02:00
Jannis Leidel
0379c8cf39 Fixed cache loading. Fixes #13. 2011-07-08 14:46:41 +02:00
Jannis Leidel
99188bb92c Bumped version and copyright year. 2011-07-06 21:25:17 +02:00
Jannis Leidel
d5de8390ac Updated translations. 2011-07-06 21:23:41 +02:00
Jannis Leidel
a3cc44c069 Removed trailing whitespace. 2011-07-06 21:16:16 +02:00
Alen Mujezinovic
8c5e1b95b3 Fixes template names being cut off when using sync_templates:
http://cl.ly/0R092W1H3n3m19120j1x
2011-07-06 18:11:05 +01:00
kmooney
c588e51e83 Change to skip template loaders whose load method is not implemented. This happens with the Django cached template loader, in particular. 2011-07-06 17:21:31 +02:00
olivergeorge
fb1fdcbd84 Extended sync_templates command to make exporting changes out to file easier. 2011-07-06 17:00:44 +02:00
Jannis Leidel
7473b54bb1 Added tests for sync_templates command. 2011-07-06 15:40:56 +02:00
Jannis Leidel
05b109ec5a A bunch of flake8 fixees. 2011-07-01 15:50:04 +02:00
Jannis Leidel
2804cd527f Refactored loader to be class based only. 2011-07-01 15:44:23 +02:00
Jannis Leidel
a40204def7 Moved setttings over to use AppSettings class. 2011-07-01 15:44:09 +02:00
Jannis Leidel
ca032e70cf Split utils module. 2011-07-01 15:41:24 +02:00
Jannis Leidel
519ad3763a Fixed import. 2011-06-15 16:20:30 +02:00
Jason Mayfield
825e3b95ff allow blank sites
Signed-off-by: Jannis Leidel <jannis@leidel.info>
2011-06-15 16:17:47 +02:00
Jason Mayfield
1415896b3d allow save as for templates to easily copy templates for another site
Signed-off-by: Jannis Leidel <jannis@leidel.info>
2011-06-15 16:16:29 +02:00
Jason Mayfield
dd15deab60 filter horizontal the sites
Signed-off-by: Jannis Leidel <jannis@leidel.info>
2011-06-15 16:16:21 +02:00
Jason Mayfield
587b66232c typo 2011-06-15 16:16:09 +02:00
Jason Mayfield
e694b3dfb8 remove name uniqueness, with migration
Signed-off-by: Jannis Leidel <jannis@leidel.info>
2011-06-15 16:15:31 +02:00
Jannis Leidel
4507b02ed5 Relaxed the cache setting handling a bit. Fixes #7. 2011-06-15 15:59:29 +02:00
Jannis Leidel
1dc6580b67 Bumped to 1.0.1. 2011-04-14 13:46:15 +02:00
Jannis Leidel
ae6818f745 Fixed cache setting handling. Fixes issue #4. 2011-04-14 13:45:22 +02:00