Commit graph

649 commits

Author SHA1 Message Date
Tomislav R
26de99e773 fixed orphaned plugins and add post functionality 2016-03-25 19:18:07 +01:00
Sanghee Kim
17a9245d21 calendar added 2016-03-23 18:25:49 +01:00
Tomislav R
f5ece43b25 added missing blog templates 2016-03-23 14:25:15 +01:00
Tomislav R
28df2526a8 update django settings for local and production 2016-03-22 22:09:22 +01:00
Tomislav R
1f2c94a053 removed duplicated djangocms 2016-03-22 21:09:59 +01:00
Your Name
1ce3f4bbac resolve merge conflict 2016-03-22 15:16:21 +00:00
Your Name
767d24adb7 resolve merge conflict 2016-03-22 15:12:47 +00:00
tmslav
d56bbd5eab Merge pull request #8 from tmslav/blog_fix
Blog update
2016-03-22 01:23:02 +01:00
Tomislav R
6b78bac53b Blog update 2016-03-22 01:21:50 +01:00
0d04a18a0d server push 2016-03-19 21:28:58 +01:00
0f3ebfdbba settings difference push 2016-03-16 15:23:15 +01:00
tmslav
3d23db0c73 Merge pull request #7 from tmslav/membership_payment
Membership payment
2016-03-16 15:16:11 +01:00
Tomislav R
6319515bb4 fixed new user registration 2016-03-16 15:10:48 +01:00
Tomislav R
ff9a6e1b2b fixed requirements 2016-03-16 00:26:49 +01:00
jiyounyoon
2013317420 Add new files for design 2016-03-14 14:13:31 -07:00
Tomislav R
e5d2d74450 payment app 2016-03-11 19:42:45 +01:00
Tomislav R
3ca9ef5900 fixed login 2016-03-07 19:25:01 +01:00
Tomislav R
2477fbc11b update req file and update directory structure 2016-03-07 19:20:45 +01:00
Tomislav R
b8824b3f46 fixed CustomUser 2016-03-07 18:39:24 +01:00
Tomislav R
3157db235a test 2016-03-07 17:49:02 +01: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
Sanghee Kim
530ca19556 Import cal + css from Jiyoun 2016-03-04 21:15:48 +01:00
3ec565c178 Merge pull request #6 from tmslav/update_django_version
Update django version
2016-03-04 13:06:43 -06:00
Tomislav R
9f944ca1ed init membership 2016-03-03 22:55:23 +01:00
Tomislav R
9eed348b62 Merge branch 'master' into update_django_version 2016-03-03 22:32:36 +01:00
Tomislav R
bfaa88e774 test 2016-03-03 22:22:37 +01:00
Sanghee Kim
c7a9eb1e59 error button added 2016-03-02 20:06:31 +01:00
Sanghee Kim
5606421739 text change 2016-03-02 19:42:39 +01:00
Sanghee Kim
1fef3c0b90 button color 2016-03-02 18:00:55 +01:00
Sanghee Kim
c929823c2b button color 2016-03-02 00:18:52 +01:00
Sanghee Kim
b2e62b1fd7 button color 2016-03-02 00:16:00 +01:00
Sanghee Kim
fa5c914c40 button color 2016-03-02 00:09:14 +01:00
상희 김
6cd443c568 color changes 2016-03-01 21:52:04 +01: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
상희 김
6b4b2a6be9 payment page draft 2016-02-11 16:22:15 +01:00
상희 김
caecf7c8f6 membership page design draft 2016-02-10 23:50:10 +01: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