Commit graph

2680 commits

Author SHA1 Message Date
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
Sanghee Kim
ba554deca1 Import cal + css from Jiyoun 2016-03-04 21:15:48 +01:00
062afb392f Merge pull request #6 from tmslav/update_django_version
Update django version
2016-03-04 13:06:43 -06:00
Tomislav R
6bb092a101 init membership 2016-03-03 22:55:23 +01:00
Tomislav R
88a5825c8c Merge branch 'master' into update_django_version 2016-03-03 22:32:36 +01:00
Tomislav R
850a0e7f85 test 2016-03-03 22:22:37 +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
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
상희 김
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
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