Commit graph

3015 commits

Author SHA1 Message Date
0ccf491441 Merge branch 'master' into develop 2016-04-04 03:33:25 +02:00
67002a0a03 Merge branch 'develop' of https://github.com/ungleich/dynamicweb into develop 2016-04-04 03:32:50 +02:00
858b3ccafa blog dg fix 2016-04-04 03:32:22 +02:00
tmslav
939a6bf35f Merge pull request #16 from tmslav/master
updated ungleich
2016-04-03 11:47:04 +02:00
Tomislav R
24badb1a9c updated ungleich 2016-04-03 11:46:25 +02:00
tmslav
4061cd70ec Merge pull request #15 from tmslav/master
updated main pages links
2016-04-01 12:38:25 +02:00
Tomislav R
5fd4275046 updated main pages links 2016-04-01 12:37:01 +02:00
tmslav
29f95e753c Merge pull request #14 from ungleich/master
dynamicweb
2016-03-31 20:31:46 +02:00
tmslav
5bf93d597e Merge pull request #13 from tmslav/master
removed db
2016-03-31 18:16:50 +02:00
Tomislav R
d29902c676 removed 2016-03-31 18:15:37 +02:00
tmslav
9100b988bc Merge pull request #11 from tmslav/master
added media
2016-03-26 17:33:09 +01:00
Tomislav R
0e7662dad9 added media 2016-03-25 19:39:50 +01:00
tmslav
e2d5ca5c1b Merge pull request #10 from tmslav/master
added db
2016-03-25 19:36:38 +01:00
Tomislav R
8bc0a7d84b added db 2016-03-25 19:35:52 +01:00
tmslav
b0a636b0fb Merge pull request #9 from tmslav/master
merge blog fix
2016-03-25 19:22:04 +01:00
Tomislav R
ddb4de2954 fixed orphaned plugins and add post functionality 2016-03-25 19:18:07 +01:00
Sanghee Kim
7b12f11f7d calendar added 2016-03-23 18:25:49 +01:00
Tomislav R
78e66862bf added missing blog templates 2016-03-23 14:25:15 +01:00
Tomislav R
105dad3b9f update django settings for local and production 2016-03-22 22:09:22 +01:00
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