summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorYorhel <git@yorhel.nl>2019-07-25 14:30:04 +0200
committerYorhel <git@yorhel.nl>2019-07-25 14:36:21 +0200
commitf296495a912ce759df11c43e78b4552788bdbff2 (patch)
tree0c10802de65fb7c8475722e12234bff5eb980628 /.gitignore
parent0f3cfeb85caec6424bcbea47142eefbf8011636b (diff)
Merge the v3 branch into separate namespace + fix Docker stuff (again)
I was getting tired of having to keep two branches up-to-date with the latest developments, so decided to throw v3 into the same branch - just different files (...which will get mostly rewritten again soon). The two versions aren't very different in terms of dependencies, build system and support code, so they can now properly share files. Added a section to the README to avoid confusion. This merge also makes it easier to quickly switch between the different versions, which is handy for development. It's even possible to run both at the same time, but my scripts use the same port so that needs a workaround. And it's amazing how often I break the Docker scripts.
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore11
1 files changed, 11 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 2e0ca556..115208a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,12 @@
/data/config.pl
+/data/config3.pl
/data/docker-pg
/data/icons/icons.css
/data/log/
/data/multi.pid
/data/passwords.dat
+/elm3/elm-stuff/
+/elm3/Lib/Gen.elm
/static/f/js/
/static/f/icons.png
/static/f/vndb.js
@@ -12,6 +15,13 @@
/static/s/*/style.css
/static/s/*/style.css.gz
/static/s/*/boxbg.png
+/static/v3/elm.js
+/static/v3/elm-opt.js
+/static/v3/min.js
+/static/v3/min.js.gz
+/static/v3/min.css
+/static/v3/min.css.gz
+/static/v3/style.css
/static/ch
/static/cv
/static/sf
@@ -20,3 +30,4 @@
/static/api
/util/sql/editfunc.sql
/www/
+*.swp