118 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
chabad360	ec4cd3e762	better work	2018-08-01 13:05:45 -07:00
chabad360	806eb9214b	back up	2018-08-01 12:59:49 -07:00
chabad360	0212cb0486	Merge pull request #1 from chabad360/revert ... revert	2018-08-01 12:53:46 -07:00
chabad360	1451630f8c	Merge branch 'master' into revert	2018-08-01 12:53:31 -07:00
chabad360	ddede9b5a4	revert	2018-08-01 12:48:21 -07:00
chabad360	bf849a0d48	added a debug	2018-08-01 12:40:44 -07:00
chabad360	f2034f874e	oops	2018-08-01 12:34:02 -07:00
chabad360	e41b4abce3	fixed proc_file issues	2018-08-01 12:28:33 -07:00
chabad360	4841bd1fdd	fixed frappe isues	2018-08-01 12:25:21 -07:00
chabad360	1113efd652	Update Dockerfile	2018-08-01 11:39:05 -07:00
chabad360	922832c92c	Update .travis.yml	2018-08-01 11:33:12 -07:00
chabad360	c8fcbe0fdb	Update Dockerfile	2018-08-01 11:23:14 -07:00
chabad360	9b09d61433	Update .travis.yml	2018-08-01 10:45:11 -07:00
chabad360	32451fc1f4	Update Dockerfile	2018-08-01 10:40:55 -07:00
chabad360	4c4ad963c9	Update Dockerfile	2018-08-01 10:20:02 -07:00
chabad360	95426877e0	Update .travis.yml	2018-08-01 09:57:08 -07:00
chabad360	060c86f52b	Update README.md	2018-08-01 09:55:50 -07:00
chabad360	3a497e1e0d	Update .travis.yml	2018-08-01 09:50:25 -07:00
Ameya Shenoy	6e8bb9a142	Merge pull request #37 from reilly3000/patch-1 ... Updated README.md to clarify initial admin password	2018-05-04 23:40:21 +05:30
reilly3000	720b76f4d2	Updated README.md to clarify initial admin password ... it took me a long time to way to login after initially installing. I eventually found out the default by looking into closed issues on github. I just added a line to the readme to make it clear for future users to get up and running faster.	2018-05-04 10:54:30 -07:00
Ameya Shenoy	ac3551d6ed	Merge pull request #32 from joezsweet/clone-bench-master ... Make work on latest	2018-02-28 15:22:10 +05:30
joezsweet	3f7314d5aa	change to --ignore-exist	2018-02-27 10:47:40 +01:00
joezsweet	61d2ae1e9b	Make work on latest ... - clone bench master - install yarn globally - set lang as C.UTF-8	2018-02-27 10:44:14 +01:00
vishalseshagiri	c2e45caba3	Merge pull request #22 from frappe/develop ... Updated README.md	2017-11-27 14:10:50 +05:30
vishalseshagiri	e2415aa832	Updated README.md ... - added dbench init to the README - moved usage commands to wiki	2017-11-27 14:09:12 +05:30
vishalseshagiri	cc6c7de550	Merge pull request #21 from frappe/develop ... Updated Dockerfile	2017-11-27 13:04:00 +05:30
vishalseshagiri	9efa4001c4	Updated Dockerfile ... - changed maintainer to frappé	2017-11-27 13:03:33 +05:30
vishalseshagiri	b1c218e0b1	Merge pull request #20 from frappe/develop ... merge develop into master	2017-11-27 12:46:04 +05:30
vishalseshagiri	6bf6927deb	Updated dbench ... - changed default site on bench init from bench-manager.local to site1.local - dbench init by default installs erpnext now	2017-11-27 12:44:49 +05:30
vishalseshagiri	1a24453af8	Merge pull request #18 from africlouds/hotfixes ... Fixed mariadb ports mapping	2017-10-26 09:44:03 +05:30
vishalseshagiri	a6da129cbd	Update README.md	2017-10-09 09:44:06 +05:30
vishalseshagiri	bbb1759fd9	Merge pull request #16 from frappe/develop ... Develop	2017-10-09 09:43:32 +05:30
vishalseshagiri	641c4a08ac	changed travis badge	2017-10-09 09:38:54 +05:30
vishalseshagiri	c3c639dd35	Merge pull request #15 from vishalseshagiri/develop ... dbench init added + travis errors fixed	2017-10-09 09:38:06 +05:30
vishalseshagiri	f4a52d8746	Update README.md	2017-10-09 09:35:51 +05:30
pzdge23	89654cf580	fixing travis build error	2017-10-09 09:23:42 +05:30
pzdge23	656386c44b	added init option	2017-10-09 08:45:52 +05:30
Aimable Rwema	a34106b23b	Fixed mariadb ports mapping	2017-10-08 06:50:56 +02:00
vishalseshagiri	643dd4b4ce	Update Dockerfile	2017-10-06 13:55:55 +05:30
vishalseshagiri	7e9abdc738	Update Dockerfile	2017-10-06 13:53:48 +05:30
vishalseshagiri	247f82ae0b	Update README.md ... Former-commit-id: b5a5fc6618	2017-10-02 09:48:51 +05:30
vishalseshagiri	41bc6d6164	Update dbench ... Added -s flag to dbench Former-commit-id: 2b1530e523	2017-10-02 09:48:51 +05:30
Karl G	51ded701ed	fixing various issues with dbench ... - Added missing shebang - Fixed malformed multi line variables - Removed unnecessary su (which is not working in this way anyway) - Added missing error handling (unsupported options as well as missing argument) - Simplified the whole script (without the removal of features, hopefully?) Former-commit-id: 33cc4ff3a0	2017-10-02 09:48:51 +05:30
vishalseshagiri	d3c3c52a27	Updated Readme ... Former-commit-id: 935fbb72cb	2017-10-02 09:48:51 +05:30
vishalseshagiri	7cf16223ff	Update README.md ... Former-commit-id: fa8e80fe3e	2017-10-02 09:48:51 +05:30
vishalseshagiri	f1d67b2152	Update README.md ... Former-commit-id: e9ba15a12a	2017-10-02 09:48:51 +05:30
vishalseshagiri	d850abd658	Rename LICENSE to LICENSE.md ... Former-commit-id: 5c58bd720b	2017-10-02 09:48:51 +05:30
vishalseshagiri	6413ecfc20	Delete LICENSE.md ... Former-commit-id: 62678031d6	2017-10-02 09:48:51 +05:30
vishalseshagiri	cc21ccfe2e	Create LICENSE ... Former-commit-id: 9bd9087d16	2017-10-02 09:48:51 +05:30
vishalseshagiri	f385cde5d9	Update README.md ... Former-commit-id: 7fd94ca8bc	2017-10-02 09:48:51 +05:30