1580 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Saurabh	d4d58b4232	Merge pull request #795 from frappe/fix_swap_setup ... fix: provision to pass container flag while setting up swap	2019-04-25 19:00:29 +05:30
Saurabh	ee8a8fbbfb	fix: provision to pass container flag while setting up swap	2019-04-25 18:58:51 +05:30
vrms	cbe2786f25	adding a comment about choosing a custom frappe user name (other then 'frappe') to the Easy Install Section)	2019-04-23 08:41:13 +02:00
Suraj Shetty	5799ebeaa3	Merge pull request #791 from adityahase/fix-ownership ... fix: Change ownership of all log and config files	2019-04-15 11:00:03 +05:30
Aditya Hase	b7f568aec2	fix: Change ownership of all log and config files	2019-04-13 10:55:41 +05:30
Faris Ansari	93264c6b71	Revert "perf: Remove unwanted check (#788)" (#790) ... This reverts commit 431e96909c.	2019-04-13 10:11:25 +05:30
Suraj Shetty	7843edc8af	Merge pull request #789 from surajshetty3416/improve-cmd-perf ... Revert "fix: Change ownership of all log and config files (#787)"	2019-04-13 00:03:25 +05:30
Suraj Shetty	c16c8e69f0	Revert "fix: Change ownership of all log and config files (#787)" ... This reverts commit 2435cb6b2e.	2019-04-13 00:01:00 +05:30
Suraj Shetty	431e96909c	perf: Remove unwanted check (#788) ... `get_frappe_commands` returns a list of valid frappe commands which is used to check if the user command is valid. But this is unnecessary because even without it bench can report the command not found error. This saves ~1 second.	2019-04-12 21:03:15 +05:30
Aditya Hase	2435cb6b2e	fix: Change ownership of all log and config files (#787) ... Without this, after ` sudo bench setup production ` file ownership of all log files isn't changed and requires human intervention.	2019-04-12 15:32:17 +05:30
Saurabh	3dbb412e3c	Merge pull request #781 from saurabh6790/vm_fixes ... Vm fixes	2019-03-07 19:07:33 +05:30
Saurabh	f7a095b0f9	Merge branch 'master' of https://github.com/frappe/bench into vm_fixes	2019-03-07 19:04:30 +05:30
Saurabh	064fb66280	fix: ubuntu iso version and packer path	2019-03-07 19:04:23 +05:30
Chinmay Pai	192c343230	Merge pull request #780 from frappe/clickjacking-fix ... fix: add x-frame-origin to prevent clickjacking	2019-03-07 18:20:51 +05:30
Chinmay Pai	ecdcbb9219	fix: add x-frame-origin to prevent clickjacking	2019-03-07 17:22:09 +05:30
Salmanul Farzy	ae9cef3f54	Fix link to Linux install wiki page (#775)	2019-02-19 16:06:37 +05:30
Sagar Vora	d55d29b8fd	fix: syntax error	2019-01-29 23:59:42 +05:30
Sagar Vora	21925fa06f	fix: syntax error	2019-01-29 23:58:23 +05:30
Sagar Vora	47a9aca0e7	fix: importing reload caused issues in python2	2019-01-29 23:52:31 +05:30
Sagar Vora	4d02801f53	fix: use reload only if imported	2019-01-29 19:51:12 +05:30
Shivam Mishra	fd4be52e32	Removed foundation dependency (#763)	2019-01-22 15:38:01 +05:30
Sagar Vora	11de4f1cb7	Merge pull request #758 from sagarvora/no-ff ... fix(release): don't fast-forward while merging	2019-01-22 15:07:41 +05:30
Aditya Hase	d1810e1dc1	fix(error): Python 2 does not provide stderr on CalledProcessError (#762)	2019-01-21 16:11:10 +05:30
Sagar Vora	5ab2da3d39	Merge pull request #761 from saurabh6790/fix_requirements_installation ... fix: pull app list from sites/apps.txt	2019-01-21 13:25:43 +05:30
Sagar Vora	656358cd59	fix: use existing function	2019-01-21 13:24:21 +05:30
Saurabh	c2165b471a	fix: pull app list from sites/apps.txt	2019-01-21 13:09:25 +05:30
Sagar Vora	856974939b	Merge pull request #747 from Thunderbottom/p3.7-fix ... remove-app: fix for python3.7	2019-01-20 10:46:35 +05:30
Aditya Hase	1497f9b14b	feat(error): Show SyntaxError found in frappe (#759)	2019-01-19 13:12:21 +05:30
Sagar Vora	c1bba94648	fix(release): don't fast-forward while merging	2019-01-15 17:48:29 +05:30
Sagar Vora	518b8f32da	Merge pull request #744 from codingCoffee/reqfix ... fix: install app instead of requirements.txt	2019-01-14 22:10:10 +05:30
Dominik Ottenbreit	97b2891a95	Update README.md (#750) ... Changed wkhtmltopdf version to 0.12.5, information about "patched qt" not necessary anymore	2019-01-04 13:04:20 +05:30
Saurabh	58ec378515	Merge pull request #755 from codingCoffee/container ... feat(LXC): container support for Frappe	2019-01-03 17:54:07 +05:30
Saurabh	277a7107a1	Merge pull request #751 from codingCoffee/broken_site_config ... fix: setup nginx fails for broken site_config	2019-01-03 12:57:17 +05:30
Ameya Shenoy	651856bfd3	Merge pull request #756 from sagarvora/patch-1 ... fix(readme): add ubuntu 18.04 to easy install	2018-12-21 11:25:28 +05:30
Sagar Vora	4f8114f941	fix(readme): add ubuntu 18.04 to easy install	2018-12-21 08:26:48 +05:30
Ameya Shenoy	9d7d089df2	Merge pull request #754 from sagarvora/fixes ... fix: default caching of pip packages and other changes	2018-12-13 11:27:45 +05:30
Sagar Vora	0afb89a2c1	fix: default caching of pip packages, use reload_supervisor function	2018-12-13 09:49:55 +05:30
Ameya Shenoy	36d12fe110	Merge pull request #753 from sagarvora/circleci ... feat(CircleCI): tests shall not fail! ✔️	2018-12-12 15:31:28 +05:30
Sagar Vora	68538fd78c	feat(CircleCI): tests shall not fail! ✔️	2018-12-12 15:28:01 +05:30
Ameya Shenoy	ea73913115	feat(LXC): container support for Frappe	2018-12-11 23:33:26 +05:30
Ameya Shenoy	8b02bed71c	fix: setup nginx fails for broken site_config ... Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>	2018-11-30 13:47:06 +05:30
Ameya Shenoy	b9f750fc42	Merge pull request #749 from codingCoffee/frontport ... feat(release): option to prevent frontport	2018-11-19 17:48:45 +05:30
Ameya Shenoy	479ab08deb	feat(release): option to prevent frontport ... Option to prevent frontporting code to new branches, for example v11(staging-fixes) should go into v12(develop) Reason: To offload tasks to bot for normal releases, which can be done without conflicts on a regular basis. However the frontporting releases need manual intervention since merge conflicts arise.	2018-11-19 17:42:28 +05:30
Chinmay Pai	ce7a5e757d	remove-app: fix for python3.7 ... "bench remove-app <app>" exits with TypeError on python3.7 converting the subprocess output to string fixes this issue. Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>	2018-11-12 13:51:11 +05:30
Ameya Shenoy	50f97e28d0	Merge pull request #745 from codingCoffee/releasefix ... fix: proper semantic version bumping	2018-11-07 16:19:20 +05:30
Ameya Shenoy	64a3a5c40a	fix: proper semantic version bumping ... - also included tests for the same Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>	2018-11-07 16:17:30 +05:30
Ameya Shenoy	d99780b041	fix: install app instead of requirements.txt ... pip installs the frappe apps instead of just their requirements.txt It needs to be done so as to prevent update the app version for pip and to prevent conflits for the dependencies in requirements.txt Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>	2018-11-07 13:32:03 +05:30
Ameya Shenoy	222d4605f6	Merge pull request #733 from codingCoffee/gitpython ... fix: bump up GitPython to 2.1.11	2018-10-23 15:42:12 +05:30
Ameya Shenoy	8d1e1f3137	fix: bump up GitPython to 2.1.11	2018-10-23 08:07:17 +00:00
Ameya Shenoy	5f6783b186	Merge pull request #728 from mandarvaze/patch-1 ... Fixed minor typo error in the README	2018-10-21 14:28:34 +05:30