Levi
|
b2b788d779
|
template moved
|
2016-04-03 21:28:04 -05:00 |
|
Levi
|
979a0bb24d
|
Merge branch 'develop' into feature/supporter
|
2016-04-03 21:15:05 -05:00 |
|
Levi
|
ceeed874d2
|
fixed supporter page, change footer info, added support-us page, changed contact email
|
2016-04-03 20:39:57 -05:00 |
|
|
|
1a5b1ec6e1
|
Merge branch 'master' into develop
|
2016-04-04 03:33:25 +02:00 |
|
|
|
3f1f43752f
|
Merge branch 'develop' of https://github.com/ungleich/dynamicweb into develop
|
2016-04-04 03:32:50 +02:00 |
|
|
|
a2a3e6156c
|
blog dg fix
|
2016-04-04 03:32:22 +02:00 |
|
tmslav
|
725a1d1e3d
|
Merge pull request #16 from tmslav/master
updated ungleich
|
2016-04-03 11:47:04 +02:00 |
|
Tomislav R
|
949ee20a8a
|
updated ungleich
|
2016-04-03 11:46:25 +02:00 |
|
tmslav
|
a4de615301
|
Merge pull request #15 from tmslav/master
updated main pages links
|
2016-04-01 12:38:25 +02:00 |
|
Tomislav R
|
1d18894b60
|
updated main pages links
|
2016-04-01 12:37:01 +02:00 |
|
tmslav
|
7b0f0db338
|
Merge pull request #14 from ungleich/master
dynamicweb
|
2016-03-31 20:31:46 +02:00 |
|
tmslav
|
eb9df736bb
|
Merge pull request #13 from tmslav/master
removed db
|
2016-03-31 18:16:50 +02:00 |
|
Tomislav R
|
40cdf8a11f
|
removed
|
2016-03-31 18:15:37 +02:00 |
|
tmslav
|
2d2f7ca6f4
|
Merge pull request #11 from tmslav/master
added media
|
2016-03-26 17:33:09 +01:00 |
|
Tomislav R
|
e13947df8d
|
added media
|
2016-03-25 19:39:50 +01:00 |
|
tmslav
|
e78fe3ca01
|
Merge pull request #10 from tmslav/master
added db
|
2016-03-25 19:36:38 +01:00 |
|
Tomislav R
|
c77f80dc45
|
added db
|
2016-03-25 19:35:52 +01:00 |
|
tmslav
|
fb539cbe92
|
Merge pull request #9 from tmslav/master
merge blog fix
|
2016-03-25 19:22:04 +01:00 |
|
Tomislav R
|
26de99e773
|
fixed orphaned plugins and add post functionality
|
2016-03-25 19:18:07 +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 |
|
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 |
|
|
|
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 |
|
