Commit graph

  • 1372f43992 Merge pull request #45 from jnns/develop Jannis Leidel 2013-11-06 05:52:56 -0800
  • bfd7186db0 Fix URL to django-reversion doc. Jannis 2013-11-06 14:35:34 +0100
  • 91d5e137f1 Merge pull request #42 from szelga/feature_rulocale Jannis Leidel 2013-07-30 01:59:23 -0700
  • f358d8c644 Merge 12ffd84380 into f668370eee Wasil Sergejczyk 2013-07-30 01:59:20 -0700
  • 12ffd84380 add Russian locale Wasil W Sergejczyk 2013-07-30 14:35:07 +0600
  • f668370eee Drop support for Python 2.5. Jannis Leidel 2013-04-04 11:41:38 +0200
  • b051161aea Test on Django 1.5.X, too. Jannis Leidel 2013-04-04 11:34:18 +0200
  • 4b024de965 Minor cosmetic changes to please flake8. Jannis Leidel 2013-04-04 11:33:00 +0200
  • da80d59e43 Fixing wrong option description. stdword 2013-02-06 17:32:51 +0400
  • 1022bd03ba Add -r option for setting up template matching regexp. Replacing -e option. Sergey Kolesnik 2013-02-06 17:16:37 +0400
  • a10306006a LUN-368 - fix top handle orphan templates adn templates assigned to shared sites (PBS) Marcel Cojocaru 2013-01-31 15:02:30 +0200
  • 4e88c6c9fa Use __isnull for querying a non-site specific template. Refs #33. Jannis Leidel 2012-05-19 21:40:35 +0200
  • 3563519d3c revert to original branch due to origin/HEAD and project being forked Bogdan Hodorog 2013-01-25 09:56:58 +0200
  • 09fab2c501 we need s3sourceuploader only to deploy, not to run Bogdan Hodorog 2013-01-22 16:08:05 +0200
  • 928fdae578 enable upload myself to s3 and bump the minor version Bogdan Hodorog 2013-01-22 15:49:29 +0200
  • cd197512fa merge develop into master, to have the same master branch as all lunchbox related projects Bogdan Hodorog 2013-01-22 15:48:30 +0200
  • 4e480adf95 Bumped version Amalia Gherasim 2012-10-11 18:18:52 +0300
  • a3baca829c When changing template-site assignments, invalidate cached templates that belonged to sites that got unassigned Alex Cucu 2012-10-08 17:30:34 +0300
  • e559006f05 When changing template-site assignments, invalidate cached templates that belonged to sites that got unassigned Alex Cucu 2012-10-08 11:39:23 +0300
  • f22ca2c7e0 TSK5222 Properly bump the version Bogdan Hodorog 2012-09-21 18:35:53 +0300
  • 30a470145f UNICORN-5222 pull from remotes/jezdez/tags/1.3 Bogdan Hodorog 2012-09-19 11:03:13 +0300
  • 2fc79eda7a Support for using redactorjs for editing templates. Evan Culver 2012-09-05 14:27:55 -0400
  • d2f595ce82 Moved to django-discover-runner. Jannis Leidel 2012-05-23 23:50:32 +0200
  • f7378df802 Use __isnull for querying a non-site specific template. Refs #33. Jannis Leidel 2012-05-19 21:40:35 +0200
  • 1c520b0fad Re-enabled 2.5 now that flake8 works on it again. Jannis Leidel 2012-05-19 19:24:17 +0200
  • c36d649e4d Disabled Python 2.5 again as flake8 doesn't support it at the moment :( Jannis Leidel 2012-05-19 13:27:09 +0200
  • 6d356db2ef Trying 2.5 Jannis Leidel 2012-05-19 13:10:03 +0200
  • 0672fa42bf Set env vars before installing and use crate. Jannis Leidel 2012-05-19 13:08:02 +0200
  • 7802fbe328 Merge branch 'release/1.3' into develop Jannis Leidel 2012-05-07 23:53:19 +0200
  • 327384645c Merge branch 'release/1.3' 1.3 Jannis Leidel 2012-05-07 23:53:05 +0200
  • 8844180d6c Bumped version to 1.3. Jannis Leidel 2012-05-07 23:52:59 +0200
  • 25d9283758 Use version from __version__. Jannis Leidel 2012-05-07 23:52:50 +0200
  • ca9d2fc468 Removed old hg tags. Jannis Leidel 2012-05-07 23:50:01 +0200
  • c59de762f9 Correct version. Jannis Leidel 2012-05-07 23:48:21 +0200
  • ee29bbe46e Updated settings docs. Jannis Leidel 2012-05-07 23:48:07 +0200
  • 4c3c459e82 Updated changelog. Jannis Leidel 2012-05-07 23:47:30 +0200
  • 60215fe947 Updated AUTHORS file. Jannis Leidel 2012-05-07 23:47:15 +0200
  • a1cec65e29 Removed INSTALL file from manifest template. Jannis Leidel 2012-05-07 14:15:52 +0200
  • e7b6b8ce00 Ignore long lines, stupid. Jannis Leidel 2012-05-07 14:12:07 +0200
  • d018f826da Forgotten dirname for flake8. Jannis Leidel 2012-05-07 14:10:12 +0200
  • 07fe3cc7ee Fixed typo. Jannis Leidel 2012-05-07 14:08:08 +0200
  • 842e08cf2e Switched to using nose and django-nose for easy test running. Jannis Leidel 2012-05-07 14:06:54 +0200
  • 2e430d5370 Minor code cleanup of the migrations. Jannis Leidel 2012-05-07 10:57:36 +0200
  • 2f27327beb Handle timezone on 1.4 correctly. Jannis Leidel 2012-05-07 10:57:23 +0200
  • f1e680aa31 Added link to Travic build. Jannis Leidel 2012-05-07 10:54:26 +0200
  • 0e43258b5b Added DATABASES setting to please Django 1.4. Jannis Leidel 2012-05-07 10:35:23 +0200
  • d926d6c934 Merge pull request #32 from selwin/develop Jannis Leidel 2012-05-07 01:32:40 -0700
  • 05f9e5e8dc Merge bb4e7ce36f into f3fc408385 GitHub Merge Button 2012-05-07 01:32:04 -0700
  • f3fc408385 Get the database name from the routers and dropped support for 1.2.X. Jannis Leidel 2012-05-07 10:31:24 +0200
  • dbb4dd20d8 Merge 250afd29f4 into 20aebf894d GitHub Merge Button 2012-05-07 00:59:06 -0700
  • 20aebf894d Limit the tests to dbtemplates. Jannis Leidel 2012-05-07 09:48:01 +0200
  • d3ccb0c42a Stop using a context manager when we don't need it really. Jannis Leidel 2012-05-07 09:04:31 +0200
  • 222c7947d2 Added auth app to list of installed apps during tests. Jannis Leidel 2012-05-07 09:04:05 +0200
  • bea453548f Renamed test requirements file to correct name. Jannis Leidel 2012-05-07 08:58:36 +0200
  • abc2fe5cd2 Added a few more test requirements. Jannis Leidel 2012-05-07 08:57:45 +0200
  • 87c5c46999 Further fiddling with the travis config. Jannis Leidel 2012-05-07 08:55:27 +0200
  • 0ff18227f9 Hrm, setting the variable in the env block? Jannis Leidel 2012-05-07 08:43:48 +0200
  • 20a5d9fc66 Forgot to set the DJANGO_SETTINGS_MODULE var. Jannis Leidel 2012-05-07 08:41:02 +0200
  • 3c67628a63 Removed dependency on versiontools. Jannis Leidel 2012-05-07 08:36:01 +0200
  • 45700c7e1c Moved CI to Travis. Jannis Leidel 2012-05-07 08:35:36 +0200
  • bb4e7ce36f Fixed an issue where `get_cache_key` may produce invalid memcached keys. Selwin Ong 2012-05-06 20:52:17 +0700
  • 18c5235a25 Merge 530f18142c into 33c1197ad1 GitHub Merge Button 2012-04-24 09:47:15 -0700
  • 250afd29f4 settings do not include DATABASE_ENGINE in django 1.4 John Fink 2012-04-01 21:31:20 -0400
  • 33c1197ad1 Merge pull request #30 from bmihelac/fix-27-MultipleObjectsReturned Jannis Leidel 2012-03-30 06:31:55 -0700
  • 97f5705766 Merge 29f08281d7 into 45407e1624 GitHub Merge Button 2012-03-30 06:31:25 -0700
  • 45407e1624 Merge pull request #29 from bmihelac/fix-28-test-warnings Jannis Leidel 2012-03-30 06:31:23 -0700
  • 87bab4567f Merge 3aa3132255 into 832b000c49 GitHub Merge Button 2012-03-30 06:26:44 -0700
  • 3aa3132255 Fix for #28 Bojan Mihelac 2012-03-30 15:25:45 +0200
  • 29f08281d7 Fix #27. Bojan Mihelac 2012-03-30 15:14:21 +0200
  • f503013b0f Add failing tests for #27. Bojan Mihelac 2012-03-30 15:11:57 +0200
  • 530f18142c django 1.4 no longer has DATABASE_ENGINE setting, using DATABASE['default']['ENGINE'] instead, if former is not found Dale O'Brien 2012-03-26 09:37:23 +1100
  • 832b000c49 Merge pull request #21 from markstahler/develop Jannis Leidel 2012-03-19 14:18:49 -0700
  • 916cae0529 Merge 68d4342df4 into 311875c68b GitHub Merge Button 2012-03-19 14:18:01 -0700
  • 311875c68b Merge pull request #25 from gandalfar/test_no_dbloader Jannis Leidel 2012-03-19 14:17:59 -0700
  • dc6e511cc8 Merge 0cfd927938 into ad7b258308 GitHub Merge Button 2012-02-25 13:50:50 -0800
  • 0cfd927938 fix for tests when dbtemplates template loader is not in main settings.py Jure Cuhalev 2012-02-25 22:47:05 +0100
  • ad7b258308 Force an encoding when writing the content to the file. Jannis Leidel 2012-02-24 23:35:51 +0100
  • 68d4342df4 removed urls.py which is not required if django-tinymce is installed properly. fixed new bug relating to codemirror introduced by tinymce Mark Stahler 2012-01-18 08:33:13 -0500
  • edaf6ea258 respect column widths Mark Stahler 2012-01-17 22:11:08 -0500
  • e866e52074 fixed tinyMce not appearing in admin area Mark Stahler 2012-01-17 21:58:47 -0500
  • 02aaad635a Added TinyMCE support via django-tinymce Mark Stahler 2012-01-17 21:22:22 -0500
  • a67a79e693 Merge 846034a0cb into b13ffbb248 GitHub Merge Button 2012-01-12 09:50:09 -0800
  • 846034a0cb Updated documentation, added forgotten files from previous commit Mark Stahler 2012-01-12 12:34:42 -0500
  • 3b000ee99f Added TinyMCE support Mark Stahler 2012-01-12 12:29:37 -0500
  • b13ffbb248 Merge pull request #19 from bmihelac/patch-2 Jannis Leidel 2012-01-09 10:11:18 -0800
  • 6b3a76717d Merge 3e18bc9784 into 6a6229648e GitHub Merge Button 2012-01-09 04:12:20 -0800
  • 3e18bc9784 Update docs/overview.txt bmihelac 2012-01-09 13:12:19 +0100
  • cb3fe58a6e Fix typo in docs - `dbtemplates.loader.Loader should be first in TEMPLATE_LOADERS`. bmihelac 2012-01-09 12:56:09 +0100
  • 6a6229648e Merge pull request #18 from bmihelac/patch-1 Jannis Leidel 2012-01-09 03:46:42 -0800
  • b9cd7e6efb Merge 5a6053fef0 into 1c10468529 GitHub Merge Button 2012-01-09 03:37:45 -0800
  • 5a6053fef0 Fix typo in docs. bmihelac 2012-01-09 12:37:26 +0100
  • 1c10468529 Fixed ignore files. Jannis Leidel 2012-01-09 00:01:31 +0100
  • 4ae9392e08 Use django-jenkins for tests and prepare it for ci.enn.io. Jannis Leidel 2012-01-09 00:01:17 +0100
  • 9cc07437ee Updated year. Jannis Leidel 2012-01-09 00:00:10 +0100
  • 65684c1243 Use latest versiontools. Jannis Leidel 2012-01-08 23:59:52 +0100
  • fcca3742e0 Minor cleanup in docs. Jannis Leidel 2012-01-08 23:59:34 +0100
  • fc7da2a8a5 Override the version like a man. Sever Băneşiu 2011-10-07 15:48:28 +0300
  • 720992c415 Errr. Sever Băneşiu 2011-10-07 15:44:19 +0300
  • 6b9704c0dd Added own version in order to fix dependencies. Sever Băneşiu 2011-10-07 15:39:43 +0300
  • 863e3edaa3 Made template name unique and sites required. Sever Băneşiu 2011-10-05 12:06:54 +0300