Your Name
|
d57fc21784
|
resolve merge conflict
|
2016-03-22 15:12:47 +00:00 |
|
Your Name
|
3d34acc884
|
Merge branch 'master' of https://github.com/ungleich/dynamicweb
|
2016-03-05 20:15:44 +00:00 |
|
Your Name
|
de875f80de
|
Merge remote-tracking branch 'refs/remotes/origin/master'
mmit.
|
2016-03-05 19:57:41 +00:00 |
|
Your Name
|
b3c40bd20d
|
added python path
Signed-off-by: Your Name <you@example.com>
|
2016-03-05 19:49:22 +00:00 |
|
Your Name
|
e99f23551b
|
changes on prod - master
|
2016-03-05 19:46:46 +00:00 |
|
|
|
062afb392f
|
Merge pull request #6 from tmslav/update_django_version
Update django version
|
2016-03-04 13:06:43 -06:00 |
|
Tomislav R
|
7936e5dfe5
|
update
|
2016-03-01 21:24:51 +01:00 |
|
Tomislav R
|
0558d6e396
|
django version update #3
|
2016-02-29 23:28:31 +01:00 |
|
|
|
ed8a8c96e1
|
one column supporters
|
2016-02-14 11:52:05 -06:00 |
|
|
|
5297c5cfd7
|
Merge branch 'release/supporters-widget'
|
2016-02-14 10:11:06 -06:00 |
|
|
|
aee3251098
|
Merge branch 'feature/supporters' into develop
|
2016-02-14 09:47:15 -06:00 |
|
|
|
d6ddbc31ce
|
added supporters plugin
Signed-off-by: rscnt <rascnt@gmail.com>
|
2016-02-14 09:47:07 -06:00 |
|
|
|
30b1e5f9c3
|
added supporters plugin
Signed-off-by: rscnt <rascnt@gmail.com>
|
2016-02-13 14:28:46 -06:00 |
|
|
|
1bba65bbe9
|
supporter description can be null
Signed-off-by: rscnt <rascnt@gmail.com>
|
2016-02-08 04:32:18 -06:00 |
|
|
|
b072df90fe
|
dg: supporters styles
|
2016-02-08 04:31:53 -06:00 |
|
|
|
6b70f01799
|
...
Signed-off-by: rscnt <rascnt@gmail.com>
|
2016-02-08 04:23:46 -06:00 |
|
|
|
43bac8b075
|
DG: added link to supporters...
Signed-off-by: rscnt <rascnt@gmail.com>
|
2016-02-08 04:21:33 -06:00 |
|
|
|
acf98b2aa4
|
adding assets to DG base template
Signed-off-by: rscnt <rascnt@gmail.com>
|
2016-02-08 04:14:00 -06:00 |
|
|
|
953db48234
|
DG: base template should show cms toolar
Signed-off-by: rscnt <rascnt@gmail.com>
|
2016-02-08 04:11:26 -06:00 |
|
|
|
3b8cf21d5a
|
deleted counter on letscowork item
Signed-off-by: rscnt <rascnt@gmail.com>
|
2016-02-08 03:41:47 -06:00 |
|
|
|
333d751057
|
adding placeholder for index gallery
Signed-off-by: rscnt <rascnt@gmail.com>
|
2016-02-08 03:01:34 -06:00 |
|
|
|
63117eb40e
|
fixed migrations
Signed-off-by: rscnt <rascnt@gmail.com>
|
2016-02-08 02:58:40 -06:00 |
|
|
|
c80d6b9bc0
|
added digital glarus migrations
Signed-off-by: rscnt <rascnt@gmail.com>
|
2016-02-08 02:43:52 -06:00 |
|
|
|
9fafb5afeb
|
added digital glarus admin
|
2016-02-08 02:43:08 -06:00 |
|
|
|
2dea158e84
|
added digitalglarus gallery template
Signed-off-by: rscnt <rascnt@gmail.com>
|
2016-02-08 02:42:53 -06:00 |
|
|
|
ea1c24e5d1
|
added plugins for digitalglarus
|
2016-02-08 02:42:26 -06:00 |
|
|
|
4ddf70777d
|
added models for galleries and supporters
Signed-off-by: rscnt <rascnt@gmail.com>
|
2016-02-08 02:42:01 -06:00 |
|
|
|
c1c47e5716
|
added supporters admin
|
2016-02-08 02:41:39 -06:00 |
|
|
|
1f266e382d
|
supporters description should be text field
Signed-off-by: rscnt <rascnt@gmail.com>
|
2016-02-07 20:19:11 -06:00 |
|
|
|
3c91e3c489
|
added supporters migration
Signed-off-by: rscnt <rascnt@gmail.com>
|
2016-02-07 20:03:13 -06:00 |
|
|
|
d3238aa8f3
|
updated requirements
Signed-off-by: rscnt <rascnt@gmail.com>
|
2016-02-07 20:02:56 -06:00 |
|
|
|
be7d727a18
|
supporters: better style for names
|
2016-02-03 07:36:52 -06:00 |
|
|
|
1cdf1060a3
|
adding supporters view
Signed-off-by: rscnt <rascnt@gmail.com>
|
2016-02-03 07:27:29 -06:00 |
|
|
|
decfaa676e
|
dynamic year for hosting template footer
Signed-off-by: rscnt <rascnt@gmail.com>
|
2016-02-03 05:24:58 -06:00 |
|
|
|
e294ed80f8
|
Merge branch 'release/jazz-changes'
|
2015-11-29 08:38:18 -06:00 |
|
|
|
b401fbdebe
|
language option text changed
Signed-off-by: rscnt <rascnt@gmail.com>
|
2015-11-29 08:14:08 -06:00 |
|
|
|
4152d25eab
|
Merge branch 'develop'
|
2015-11-14 17:29:45 -06:00 |
|
|
|
6006aa0c66
|
added one column template
|
2015-11-14 16:29:05 -06:00 |
|
|
|
2611921bf8
|
added one column
Signed-off-by: rscnt <rascnt@gmail.com>
|
2015-11-14 15:58:17 -06:00 |
|
|
|
b5f827ad01
|
Merge branch 'release/ungleich-fixes'
|
2015-11-05 01:40:27 -06:00 |
|
|
|
e0bb10b2f5
|
digitalglarus: blog detail small "ugly" fix
Signed-off-by: rscnt <rascnt@gmail.com>
|
2015-11-05 01:02:41 -06:00 |
|
|
|
cc9959d632
|
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 |
|
|
|
c502021b15
|
blog.ungleich: only show root pages on menu
Signed-off-by: rscnt <rascnt@gmail.com>
|
2015-11-02 16:59:50 -06:00 |
|
|
|
579961208d
|
Merge branch 'feature/django-settings' into develop
|
2015-11-02 16:03:00 -06:00 |
|
|
|
d55a02c015
|
dynamicweb/urls: removing static() call
Signed-off-by: rscnt <rascnt@gmail.com>
|
2015-11-02 16:02:39 -06:00 |
|
|
|
55d1c94c38
|
dynamicweb/settings: local is now using DEBUG=True
Signed-off-by: rscnt <rascnt@gmail.com>
|
2015-11-02 15:59:23 -06:00 |
|
|
|
e863a8c037
|
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 |
|
|
|
7aa5586ed3
|
dynamicweb/wsgi: using settings.prod module on production
Signed-off-by: rscnt <rascnt@gmail.com>
|
2015-11-02 14:45:32 -06:00 |
|
|
|
bec5a7319d
|
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 |
|
|
|
8a4a5fdd67
|
gitignore: added .idea folder and .env file
Signed-off-by: rscnt <rascnt@gmail.com>
|
2015-11-02 14:44:31 -06:00 |
|
