Commit graph

30 commits

Author SHA1 Message Date
8a4a5fdd67 gitignore: added .idea folder and .env file
Signed-off-by: rscnt <rascnt@gmail.com>
2015-11-02 14:44:31 -06:00
acca06a11d Merge branch 'master' of git.ungleich.ch:dynamicweb into develop
Conflicts:
	.gitignore
	dynamicweb/settings.py
	requirements.txt
2015-09-19 17:02:36 +02:00
d7ba34f7c1 Merge branch 'master' of git-ungleich:dynamicweb 2015-09-16 01:31:17 -06:00
81207b8e12 Merge branch 'develop' of git-ungleich:dynamicweb into develop 2015-09-15 11:16:02 -06:00
8c24aaf2fb Merge branch 'develop' into digital.glarus.corwdfounding 2015-09-15 09:38:31 -06:00
Nico Schottelius
1bd55cece3 do not ignore static/
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-09-15 14:52:18 +02:00
d4948e1979 ignoring node_modules and *.db 2015-09-14 06:43:48 -06:00
08d22489f0 Merge branch 'master' of git.ungleich.ch:dynamicweb 2015-09-14 06:30:59 -06:00
d5434fce8f ignoreing node_modules 2015-09-14 06:19:04 -06:00
상희 김
5b7c9584db Merge remote-tracking branch 'origin/master' 2015-09-09 22:55:54 +02:00
Nico Schottelius
a5972c1b4a do not commit the secret-key
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-09-08 01:21:28 +02:00
Nico Schottelius
b72dd9c3ca Merge remote-tracking branch 'origin/feature/djangohosting' into feature/notifybymail 2015-08-27 18:31:59 +02:00
상희 김
cb09599804 Do NOT ignore static in subfolders 2015-08-27 18:28:25 +02:00
a1c7f47e98 gitginore: added vim cache files.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-13 20:08:07 -06:00
c8a616b7b5 gitginore: added vim cache files.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-13 20:08:07 -06:00
a01c171b17 Merge branch 'develop' of git.ungleich.ch:dynamicweb into develop 2015-06-13 12:20:34 -06:00
fc2d09d9ac Merge branch 'develop' of git.ungleich.ch:dynamicweb into develop 2015-06-13 12:20:34 -06:00
9c07c4c39a gitignore: static folder 2015-06-13 09:36:03 -06:00
7083428824 gitignore: static folder 2015-06-13 09:36:03 -06:00
Nico Schottelius
002fc42a46 do not add files below static/ to git
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-06-12 17:40:54 +02:00
Nico Schottelius
d5e4189f86 do not add files below static/ to git
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-06-12 17:40:54 +02:00
f58c7dfc75 ignore emacs cache files 2015-06-08 23:03:13 -06:00
36797bbd0f ignore emacs cache files 2015-06-08 23:03:13 -06:00
a847a4bf87 added static cache folder to gitignore 2015-05-23 01:18:26 -06:00
e3d4eac9c8 added static cache folder to gitignore 2015-05-23 01:18:26 -06:00
50e1e9e28d gitignore: added media folder 2015-05-20 22:47:11 -06:00
5a2c77de2e gitignore: added media folder 2015-05-20 22:47:11 -06:00
7f33ac39c0 gitignore: added more patterns.
local_settings.py, it's for enviroment
variables, secret keys...

The rest of patterns are just standard.

Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-20 18:56:54 -06:00
0e52fce18b gitignore: added more patterns.
local_settings.py, it's for enviroment
variables, secret keys...

The rest of patterns are just standard.

Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-20 18:56:54 -06:00
Nico Schottelius
086195073b Init
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
2015-05-02 01:30:30 +02:00