jiyounyoon
|
28a50b9002
|
Add new files for design
|
2016-03-14 14:13:31 -07:00 |
|
Sanghee Kim
|
ba554deca1
|
Import cal + css from Jiyoun
|
2016-03-04 21:15:48 +01:00 |
|
Sanghee Kim
|
13be0d6d74
|
error button added
|
2016-03-02 20:06:31 +01:00 |
|
Sanghee Kim
|
b571ff834b
|
text change
|
2016-03-02 19:42:39 +01:00 |
|
Sanghee Kim
|
b1d7beac15
|
button color
|
2016-03-02 18:00:55 +01:00 |
|
Sanghee Kim
|
3f1ae15e64
|
button color
|
2016-03-02 00:18:52 +01:00 |
|
Sanghee Kim
|
fcd0754506
|
button color
|
2016-03-02 00:16:00 +01:00 |
|
Sanghee Kim
|
618121641e
|
button color
|
2016-03-02 00:09:14 +01:00 |
|
상희 김
|
3c4f646d5e
|
color changes
|
2016-03-01 21:52:04 +01:00 |
|
상희 김
|
9f3fd1e576
|
payment page draft
|
2016-02-11 16:22:15 +01:00 |
|
상희 김
|
f6ceced8cc
|
membership page design draft
|
2016-02-10 23:50:10 +01: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 |
|
|
|
aec2cd4298
|
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 |
|
|
|
180ad09fab
|
added django-dotenv to requirements.txt
Signed-off-by: rscnt <rascnt@gmail.com>
|
2015-11-02 14:43:03 -06:00 |
|
|
|
05c8bf3d37
|
dynamicweb: deleted old settings files
Signed-off-by: rscnt <rascnt@gmail.com>
|
2015-11-02 14:41:21 -06:00 |
|
|
|
9185a63ba5
|
python version added
|
2015-10-10 16:03:13 -06:00 |
|
|
|
9ac807a3bc
|
added python version
|
2015-10-07 20:27:34 -06:00 |
|
|
|
c4236ed273
|
digitalglarus: fixed menu on blog static
|
2015-10-04 19:37:45 -06:00 |
|
|
|
fd3dd6ba46
|
digitalglarus: changing lang menu content.
Signed-off-by: rscnt <rascnt@gmail.com>
|
2015-10-04 19:31:40 -06:00 |
|
|
|
6b8a33c28f
|
Merge branch 'release/digital.glarus.menu.layout'
|
2015-10-04 19:06:30 -06:00 |
|
|
|
254d027e4e
|
Merge branch 'hotfix/digital.glarus.menu' into develop
|
2015-10-04 19:05:31 -06:00 |
|
|
|
5aa6c1fb3e
|
Merge branch 'hotfix/digital.glarus.menu'
|
2015-10-04 19:05:15 -06:00 |
|
|
|
54cadfb6a4
|
digitalglarus: fixed menu layout
|
2015-10-04 19:05:09 -06:00 |
|
|
|
4eecb94a63
|
digitalglarus: fixing nav menu
|
2015-10-04 18:00:09 -06:00 |
|
|
|
ec46be3fe9
|
Merge branch 'release/digital.glarus.german'
|
2015-10-04 17:25:38 -06:00 |
|
|
|
ecb9467781
|
digitalglarus: cms, fixed menu format
Signed-off-by: rscnt <rascnt@gmail.com>
|
2015-10-04 17:12:35 -06:00 |
|
|
|
8a90caf7da
|
digitalglarus: submenu for digitalglarus
|
2015-10-04 16:57:50 -06:00 |
|
|
|
a4c3c341a3
|
digitalglarus: changes on urls
|
2015-10-04 16:48:33 -06:00 |
|
|
|
1b17e2aac1
|
digitalglarus: fix urls for blog.
Signed-off-by: rscnt <rascnt@gmail.com>
|
2015-10-04 15:38:53 -06:00 |
|
|
|
50e0cb9a71
|
digitalglarus: fixed typo on menu call
Signed-off-by: rscnt <rascnt@gmail.com>
|
2015-10-04 15:26:05 -06:00 |
|
|
|
eb9c1cebdb
|
Merge branch 'feature/digital.glarus.navigation' into develop
|
2015-10-04 15:21:08 -06:00 |
|
|
|
0827c6f2ff
|
digitalglarus: moving digital glarus static url.
Signed-off-by: rscnt <rascnt@gmail.com>
|
2015-10-04 15:20:39 -06:00 |
|
|
|
b338ba6092
|
digitalglarus: cms navigation.
Signed-off-by: rscnt <rascnt@gmail.com>
|
2015-10-04 15:13:13 -06:00 |
|
|
|
6b292531de
|
Merge branch 'release/digital.glarus.german'
|
2015-10-04 10:48:56 -06:00 |
|
|
|
5b6b8d1427
|
digital.glarus: cms templates don't have to call 'static' base.
Signed-off-by: rscnt <rascnt@gmail.com>
|
2015-10-04 10:45:06 -06:00 |
|
