Tomislav R
|
18c75cf00e
|
removed duplicated djangocms
|
2016-03-22 21:09:59 +01:00 |
|
Your Name
|
08e47294cd
|
resolve merge conflict
|
2016-03-22 15:16:21 +00:00 |
|
Your Name
|
d57fc21784
|
resolve merge conflict
|
2016-03-22 15:12:47 +00:00 |
|
tmslav
|
006d49d7db
|
Merge pull request #8 from tmslav/blog_fix
Blog update
|
2016-03-22 01:23:02 +01:00 |
|
Tomislav R
|
ca033be061
|
Blog update
|
2016-03-22 01:21:50 +01:00 |
|
|
|
039399b95b
|
server push
|
2016-03-19 21:28:58 +01:00 |
|
|
|
b7b0be4497
|
settings difference push
|
2016-03-16 15:23:15 +01:00 |
|
tmslav
|
47f24df349
|
Merge pull request #7 from tmslav/membership_payment
Membership payment
|
2016-03-16 15:16:11 +01:00 |
|
Tomislav R
|
0a7dd2fa3d
|
fixed new user registration
|
2016-03-16 15:10:48 +01:00 |
|
Tomislav R
|
baef7e4aa8
|
fixed requirements
|
2016-03-16 00:26:49 +01:00 |
|
jiyounyoon
|
28a50b9002
|
Add new files for design
|
2016-03-14 14:13:31 -07:00 |
|
Tomislav R
|
6223f4a1ef
|
payment app
|
2016-03-11 19:42:45 +01:00 |
|
Tomislav R
|
b14b3d2803
|
fixed login
|
2016-03-07 19:25:01 +01:00 |
|
Tomislav R
|
f82e0604ca
|
update req file and update directory structure
|
2016-03-07 19:20:45 +01:00 |
|
Tomislav R
|
5c6e0cf7c6
|
fixed CustomUser
|
2016-03-07 18:39:24 +01:00 |
|
Tomislav R
|
e7f11e9556
|
test
|
2016-03-07 17:49:02 +01: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 |
|
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 |
|
