Commit graph

513 commits

Author SHA1 Message Date
Your Name
767d24adb7 resolve merge conflict 2016-03-22 15:12:47 +00:00
Your Name
268c3ebdbb Merge branch 'master' of https://github.com/ungleich/dynamicweb 2016-03-05 20:15:44 +00:00
Your Name
8f4dd038bd Merge remote-tracking branch 'refs/remotes/origin/master'
mmit.
2016-03-05 19:57:41 +00:00
Your Name
958ed9572b added python path
Signed-off-by: Your Name <you@example.com>
2016-03-05 19:49:22 +00:00
Your Name
ec789b625e changes on prod - master 2016-03-05 19:46:46 +00:00
3ec565c178 Merge pull request #6 from tmslav/update_django_version
Update django version
2016-03-04 13:06:43 -06:00
Tomislav R
5fbde4878d update 2016-03-01 21:24:51 +01:00
Tomislav R
abbc2982e3 django version update #3 2016-02-29 23:28:31 +01:00
66d042dbe7 one column supporters 2016-02-14 11:52:05 -06:00
24df1a4dfc Merge branch 'release/supporters-widget' 2016-02-14 10:11:06 -06:00
8392ed521f Merge branch 'feature/supporters' into develop 2016-02-14 09:47:15 -06:00
f25a4f3d57 added supporters plugin
Signed-off-by: rscnt <rascnt@gmail.com>
2016-02-14 09:47:07 -06:00
d1c1882831 added supporters plugin
Signed-off-by: rscnt <rascnt@gmail.com>
2016-02-13 14:28:46 -06:00
bead7f9626 supporter description can be null
Signed-off-by: rscnt <rascnt@gmail.com>
2016-02-08 04:32:18 -06:00
862ce849f2 dg: supporters styles 2016-02-08 04:31:53 -06:00
111506d885 ...
Signed-off-by: rscnt <rascnt@gmail.com>
2016-02-08 04:23:46 -06:00
eb9032592e DG: added link to supporters...
Signed-off-by: rscnt <rascnt@gmail.com>
2016-02-08 04:21:33 -06:00
218fccf8af adding assets to DG base template
Signed-off-by: rscnt <rascnt@gmail.com>
2016-02-08 04:14:00 -06:00
39be946638 DG: base template should show cms toolar
Signed-off-by: rscnt <rascnt@gmail.com>
2016-02-08 04:11:26 -06:00
e64fa30eef deleted counter on letscowork item
Signed-off-by: rscnt <rascnt@gmail.com>
2016-02-08 03:41:47 -06:00
f4b6f43db6 adding placeholder for index gallery
Signed-off-by: rscnt <rascnt@gmail.com>
2016-02-08 03:01:34 -06:00
94ac23cdf4 fixed migrations
Signed-off-by: rscnt <rascnt@gmail.com>
2016-02-08 02:58:40 -06:00
d0afe37078 added digital glarus migrations
Signed-off-by: rscnt <rascnt@gmail.com>
2016-02-08 02:43:52 -06:00
ed08e54a55 added digital glarus admin 2016-02-08 02:43:08 -06:00
e4328f94d7 added digitalglarus gallery template
Signed-off-by: rscnt <rascnt@gmail.com>
2016-02-08 02:42:53 -06:00
3d4fb0dd1b added plugins for digitalglarus 2016-02-08 02:42:26 -06:00
aa62bd16b8 added models for galleries and supporters
Signed-off-by: rscnt <rascnt@gmail.com>
2016-02-08 02:42:01 -06:00
f352f487ca added supporters admin 2016-02-08 02:41:39 -06:00
2325d5288d supporters description should be text field
Signed-off-by: rscnt <rascnt@gmail.com>
2016-02-07 20:19:11 -06:00
06c0b3ec55 added supporters migration
Signed-off-by: rscnt <rascnt@gmail.com>
2016-02-07 20:03:13 -06:00
0051981f07 updated requirements
Signed-off-by: rscnt <rascnt@gmail.com>
2016-02-07 20:02:56 -06:00
b9efa57eb6 supporters: better style for names 2016-02-03 07:36:52 -06:00
559fe2f698 adding supporters view
Signed-off-by: rscnt <rascnt@gmail.com>
2016-02-03 07:27:29 -06:00
8b8d7733d3 dynamic year for hosting template footer
Signed-off-by: rscnt <rascnt@gmail.com>
2016-02-03 05:24:58 -06:00
742ca48d36 Merge branch 'release/jazz-changes' 2015-11-29 08:38:18 -06:00
7481d18089 language option text changed
Signed-off-by: rscnt <rascnt@gmail.com>
2015-11-29 08:14:08 -06:00
eb9a337be5 Merge branch 'develop' 2015-11-14 17:29:45 -06:00
23f38df1cd added one column template 2015-11-14 16:29:05 -06:00
f9a58697fc added one column
Signed-off-by: rscnt <rascnt@gmail.com>
2015-11-14 15:58:17 -06:00
6a517b4e24 Merge branch 'release/ungleich-fixes' 2015-11-05 01:40:27 -06:00
1960f62d2c digitalglarus: blog detail small "ugly" fix
Signed-off-by: rscnt <rascnt@gmail.com>
2015-11-05 01:02:41 -06:00
8e297fcb87 settings/base: refactor - pep8, also added djangocms-blog parler conf
Signed-off-by: rscnt <rascnt@gmail.com>
2015-11-05 01:02:18 -06:00
671c66b297 blog.ungleich: only show root pages on menu
Signed-off-by: rscnt <rascnt@gmail.com>
2015-11-02 16:59:50 -06:00
f9d555c9cf Merge branch 'feature/django-settings' into develop 2015-11-02 16:03:00 -06:00
f5ca1934c0 dynamicweb/urls: removing static() call
Signed-off-by: rscnt <rascnt@gmail.com>
2015-11-02 16:02:39 -06:00
be7579134f dynamicweb/settings: base, using PROJECT_ROOT instead of BASE_DIR
Signed-off-by: rscnt <rascnt@gmail.com>
2015-11-02 15:58:52 -06:00
813db391cf dynamicweb/wsgi: using settings.prod module on production
Signed-off-by: rscnt <rascnt@gmail.com>
2015-11-02 14:45:32 -06:00
ca3031dde2 dynamicweb/urls: fetch project settings instead of project settings module
Signed-off-by: rscnt <rascnt@gmail.com>
2015-11-02 14:45:04 -06:00
cf9a9f082a gitignore: added .idea folder and .env file
Signed-off-by: rscnt <rascnt@gmail.com>
2015-11-02 14:44:31 -06:00
f885036d0e dynamicweb: added settings module with different files for each env
Signed-off-by: rscnt <rascnt@gmail.com>
2015-11-02 14:44:18 -06:00