From 1e290fceb9833c36235202c9443f33ba6f86a461 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Fri, 19 Mar 2010 00:37:59 +0100 Subject: Added a gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore (limited to '.gitignore') diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b25c15b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*~ -- cgit v1.2.3 From 5a3432ca87b054daa75c5bc46327a1ea41153177 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Thu, 25 Mar 2010 17:56:24 +0100 Subject: Removed files auto-generated by infrastructure/ace/bin/make --- .gitignore | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index b25c15b..e48532d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,13 @@ *~ +etherpad/src/etherpad/collab/ace/contentcollector.js +etherpad/src/etherpad/collab/ace/domline.js +etherpad/src/etherpad/collab/ace/easysync1.js +etherpad/src/etherpad/collab/ace/easysync2.js +etherpad/src/etherpad/collab/ace/easysync2_tests.js +etherpad/src/etherpad/collab/ace/linestylefilter.js +etherpad/src/static/js/ace.js +etherpad/src/static/js/colorutils.js +etherpad/src/static/js/cssmanager_client.js +etherpad/src/static/js/domline_client.js +etherpad/src/static/js/easysync2_client.js +etherpad/src/static/js/linestylefilter_client.js -- cgit v1.2.3 From 9111bde776cc4f687a1720daafe326de63b09d6d Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Sat, 3 Apr 2010 02:16:25 +0200 Subject: Bugfix for .gitignore for log files --- .gitignore | 1 + 1 file changed, 1 insertion(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index e48532d..d0995e3 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ etherpad/src/static/js/cssmanager_client.js etherpad/src/static/js/domline_client.js etherpad/src/static/js/easysync2_client.js etherpad/src/static/js/linestylefilter_client.js +etherpad/*.log -- cgit v1.2.3 From 2cbc8b55729ccf17fc7b733f36547f1a6ccf71b7 Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Wed, 7 Apr 2010 18:09:43 -0400 Subject: Look for the etherpad.local.properties file in the logical location (same directory as the default file) instead of the nonexistent data directory. Also update the .gitignore to ignore this file. --- .gitignore | 1 + 1 file changed, 1 insertion(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index d0995e3..850962b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ *~ +etherpad/etc/etherpad.local.properties etherpad/src/etherpad/collab/ace/contentcollector.js etherpad/src/etherpad/collab/ace/domline.js etherpad/src/etherpad/collab/ace/easysync1.js -- cgit v1.2.3 From 4f3e0789c45056a5fa2ab76c006d4357f1cac0fc Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Wed, 7 Apr 2010 18:56:02 -0400 Subject: Many users may add the cos.jar file for import/export; place in .gitignore so those users don't constantly have git whining at them. --- .gitignore | 1 + 1 file changed, 1 insertion(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 850962b..c99c9f1 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ etherpad/src/static/js/domline_client.js etherpad/src/static/js/easysync2_client.js etherpad/src/static/js/linestylefilter_client.js etherpad/*.log +infrastructure/lib/cos.jar -- cgit v1.2.3 From c6c9281b939ca20b351a9c178254f05e69ced28b Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Wed, 28 Apr 2010 22:14:31 +0200 Subject: git-buildpackage-converted debian packaging --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index c99c9f1..e7289c5 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,6 @@ etherpad/src/static/js/easysync2_client.js etherpad/src/static/js/linestylefilter_client.js etherpad/*.log infrastructure/lib/cos.jar +build-arch-stamp +build-indep-stamp +configure-stamp -- cgit v1.2.3 From edad7a3d3a607e79a17cc18e6cdae3ba96009e51 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Wed, 28 Apr 2010 22:19:48 +0200 Subject: Added generated jars to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index e7289c5..e28a719 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ infrastructure/lib/cos.jar build-arch-stamp build-indep-stamp configure-stamp +infrastructure/lib/mysql-connector*.jar -- cgit v1.2.3 From c5f02735aab63649db141d9da67c2d9bdc52290e Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Wed, 28 Apr 2010 22:37:02 +0200 Subject: Ignoring all files generated by git-buildpackage --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index e28a719..7577f46 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,8 @@ build-arch-stamp build-indep-stamp configure-stamp infrastructure/lib/mysql-connector*.jar +debian/etherpad.debhelper.log +debian/etherpad.postrm.debhelper +debian/etherpad.substvars +debian/etherpad +debian/files -- cgit v1.2.3 From dc1a949831c99cb1a842d7941b3bd755c465b311 Mon Sep 17 00:00:00 2001 From: Mikko Rantalainen Date: Thu, 6 May 2010 11:26:48 +0300 Subject: Updated .gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 7577f46..cc959da 100644 --- a/.gitignore +++ b/.gitignore @@ -19,7 +19,8 @@ build-indep-stamp configure-stamp infrastructure/lib/mysql-connector*.jar debian/etherpad.debhelper.log -debian/etherpad.postrm.debhelper +debian/etherpad.*.debhelper debian/etherpad.substvars debian/etherpad debian/files +build-stamp -- cgit v1.2.3