Levi
|
86bd024490
|
Merge branch 'develop'
|
2016-08-16 00:42:03 -05:00 |
|
Levi
|
4c3b9a5858
|
Merge branch 'master' of github.com:levivm/dynamicweb
|
2016-08-16 00:41:38 -05: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
|
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 |
 rascencio
|
0d04a18a0d
|
server push
|
2016-03-19 21:28:58 +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 |
|
rascencio
|
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 |
|
rascencio
|
66d042dbe7
|
one column supporters
|
2016-02-14 11:52:05 -06:00 |
|
rascencio
|
24df1a4dfc
|
Merge branch 'release/supporters-widget'
|
2016-02-14 10:11:06 -06:00 |
|
rascencio
|
8392ed521f
|
Merge branch 'feature/supporters' into develop
|
2016-02-14 09:47:15 -06:00 |
|
rascencio
|
f25a4f3d57
|
added supporters plugin
Signed-off-by: rscnt <rascnt@gmail.com>
|
2016-02-14 09:47:07 -06:00 |
|
rascencio
|
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 |
|
rascencio
|
bead7f9626
|
supporter description can be null
Signed-off-by: rscnt <rascnt@gmail.com>
|
2016-02-08 04:32:18 -06:00 |
|
rascencio
|
862ce849f2
|
dg: supporters styles
|
2016-02-08 04:31:53 -06:00 |
|
rascencio
|
111506d885
|
...
Signed-off-by: rscnt <rascnt@gmail.com>
|
2016-02-08 04:23:46 -06:00 |
|
rascencio
|
eb9032592e
|
DG: added link to supporters...
Signed-off-by: rscnt <rascnt@gmail.com>
|
2016-02-08 04:21:33 -06:00 |
|
rascencio
|
218fccf8af
|
adding assets to DG base template
Signed-off-by: rscnt <rascnt@gmail.com>
|
2016-02-08 04:14:00 -06:00 |
|
rascencio
|
39be946638
|
DG: base template should show cms toolar
Signed-off-by: rscnt <rascnt@gmail.com>
|
2016-02-08 04:11:26 -06:00 |
|
rascencio
|
e64fa30eef
|
deleted counter on letscowork item
Signed-off-by: rscnt <rascnt@gmail.com>
|
2016-02-08 03:41:47 -06:00 |
|
rascencio
|
f4b6f43db6
|
adding placeholder for index gallery
Signed-off-by: rscnt <rascnt@gmail.com>
|
2016-02-08 03:01:34 -06:00 |
|
rascencio
|
94ac23cdf4
|
fixed migrations
Signed-off-by: rscnt <rascnt@gmail.com>
|
2016-02-08 02:58:40 -06:00 |
|
rascencio
|
d0afe37078
|
added digital glarus migrations
Signed-off-by: rscnt <rascnt@gmail.com>
|
2016-02-08 02:43:52 -06:00 |
|
rascencio
|
ed08e54a55
|
added digital glarus admin
|
2016-02-08 02:43:08 -06:00 |
|
rascencio
|
e4328f94d7
|
added digitalglarus gallery template
Signed-off-by: rscnt <rascnt@gmail.com>
|
2016-02-08 02:42:53 -06:00 |
|
rascencio
|
3d4fb0dd1b
|
added plugins for digitalglarus
|
2016-02-08 02:42:26 -06:00 |
|
rascencio
|
aa62bd16b8
|
added models for galleries and supporters
Signed-off-by: rscnt <rascnt@gmail.com>
|
2016-02-08 02:42:01 -06:00 |
|
rascencio
|
f352f487ca
|
added supporters admin
|
2016-02-08 02:41:39 -06:00 |
|
rascencio
|
2325d5288d
|
supporters description should be text field
Signed-off-by: rscnt <rascnt@gmail.com>
|
2016-02-07 20:19:11 -06:00 |
|
rascencio
|
06c0b3ec55
|
added supporters migration
Signed-off-by: rscnt <rascnt@gmail.com>
|
2016-02-07 20:03:13 -06:00 |
|
rascencio
|
0051981f07
|
updated requirements
Signed-off-by: rscnt <rascnt@gmail.com>
|
2016-02-07 20:02:56 -06:00 |
|
rascencio
|
b9efa57eb6
|
supporters: better style for names
|
2016-02-03 07:36:52 -06:00 |
|
rascencio
|
559fe2f698
|
adding supporters view
Signed-off-by: rscnt <rascnt@gmail.com>
|
2016-02-03 07:27:29 -06:00 |
|
rascencio
|
8b8d7733d3
|
dynamic year for hosting template footer
Signed-off-by: rscnt <rascnt@gmail.com>
|
2016-02-03 05:24:58 -06:00 |
|
rascencio
|
742ca48d36
|
Merge branch 'release/jazz-changes'
|
2015-11-29 08:38:18 -06:00 |
|
rascencio
|
7481d18089
|
language option text changed
Signed-off-by: rscnt <rascnt@gmail.com>
|
2015-11-29 08:14:08 -06:00 |
|
rascencio
|
eb9a337be5
|
Merge branch 'develop'
|
2015-11-14 17:29:45 -06:00 |
|
rascencio
|
23f38df1cd
|
added one column template
|
2015-11-14 16:29:05 -06:00 |
|
rascencio
|
f9a58697fc
|
added one column
Signed-off-by: rscnt <rascnt@gmail.com>
|
2015-11-14 15:58:17 -06:00 |
|
rascencio
|
6a517b4e24
|
Merge branch 'release/ungleich-fixes'
|
2015-11-05 01:40:27 -06:00 |
|
rascencio
|
1960f62d2c
|
digitalglarus: blog detail small "ugly" fix
Signed-off-by: rscnt <rascnt@gmail.com>
|
2015-11-05 01:02:41 -06:00 |
|
rascencio
|
8e297fcb87
|
settings/base: refactor - pep8, also added djangocms-blog parler conf
Signed-off-by: rscnt <rascnt@gmail.com>
|
2015-11-05 01:02:18 -06:00 |
|
rascencio
|
671c66b297
|
blog.ungleich: only show root pages on menu
Signed-off-by: rscnt <rascnt@gmail.com>
|
2015-11-02 16:59:50 -06:00 |
|
rascencio
|
f9d555c9cf
|
Merge branch 'feature/django-settings' into develop
|
2015-11-02 16:03:00 -06:00 |
|
rascencio
|
f5ca1934c0
|
dynamicweb/urls: removing static() call
Signed-off-by: rscnt <rascnt@gmail.com>
|
2015-11-02 16:02:39 -06:00 |
|
rascencio
|
be7579134f
|
dynamicweb/settings: base, using PROJECT_ROOT instead of BASE_DIR
Signed-off-by: rscnt <rascnt@gmail.com>
|
2015-11-02 15:58:52 -06:00 |
|
rascencio
|
813db391cf
|
dynamicweb/wsgi: using settings.prod module on production
Signed-off-by: rscnt <rascnt@gmail.com>
|
2015-11-02 14:45:32 -06:00 |
|
rascencio
|
ca3031dde2
|
dynamicweb/urls: fetch project settings instead of project settings module
Signed-off-by: rscnt <rascnt@gmail.com>
|
2015-11-02 14:45:04 -06:00 |
|
rascencio
|
cf9a9f082a
|
gitignore: added .idea folder and .env file
Signed-off-by: rscnt <rascnt@gmail.com>
|
2015-11-02 14:44:31 -06:00 |
|
rascencio
|
f885036d0e
|
dynamicweb: added settings module with different files for each env
Signed-off-by: rscnt <rascnt@gmail.com>
|
2015-11-02 14:44:18 -06:00 |