Sagar Vora
c1bba94648
fix(release): don't fast-forward while merging
2019-01-15 17:48:29 +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
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
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
Mandar Vaze
fd2c8bec15
Fixed minor typo error in the README
2018-10-20 17:44:38 +05:30
Ameya Shenoy
cbc01e6486
Merge pull request #727 from codingCoffee/urllib3
...
fix(travis): urllib3
2018-10-18 13:20:58 +05:30
Ameya Shenoy
8aa7c2b913
fix(travis): urllib3
2018-10-18 13:05:29 +05:30
Ameya Shenoy
c5cea84597
Merge pull request #726 from codingCoffee/release
...
fix(prerelease): allow making prerelease for bench
2018-10-15 15:46:24 +05:30
Ameya Shenoy
0290932828
fix(prerelease): allow making prerelease for bench
...
- fixed the existing funtionality of prerelease
Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
2018-09-26 09:03:20 +00:00
Ameya Shenoy
1e8980eae8
Merge pull request #725 from frappe/pv-dep
...
Added pv as dependency for database restore
2018-09-24 11:08:41 +05:30
Achilles Rasquinha
64b02207ca
Added pv as dependency for database restore
2018-09-23 18:15:14 -05:00
Ameya Shenoy
33555fa63a
Merge pull request #709 from vjFaLk/wildcard-all-domains
...
Allow user to set single wildcard certificate for all domains
2018-09-22 03:22:54 +05:30
Ameya Shenoy
fae7d49060
Merge pull request #723 from Thunderbottom/fix-reload
...
[fix] reload(): use importlib for python3
2018-09-22 03:19:46 +05:30
Valmik Jangla
40bccb5482
Allow user to set single wildcard certificate for all domains
2018-09-21 16:31:08 +05:30
Chinmay Pai
15d2c8df16
[fix] reload(): use importlib for python3
...
reload() is an inbuilt function in python2 but has been moved to importlib since python3.4.
source: https://docs.python.org/3/library/importlib.html#importlib.reload
Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
2018-09-21 13:47:21 +05:30
Ameya Shenoy
bd67177e98
Merge pull request #718 from codingCoffee/u18
...
feat(ubuntu 18): Add support for Ubuntu 18.04
2018-09-21 12:34:47 +05:30
Ameya Shenoy
b5657c160c
Merge pull request #721 from codingCoffee/app_path
...
fix(remove_app): use app name instead of app path
2018-09-19 15:34:52 +05:30
Ameya Shenoy
e4e054e840
fix(remove_app): use app name instead of app path
...
pip 18 does not allow path to repo, instead we use the app name
Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
2018-09-19 15:32:16 +05:30
Ameya Shenoy
de94469581
feat(ubuntu 18): Add support for Ubuntu 18.04
...
- added ubuntu 18 in the list of supported OS for the easy install
script
- ensured the install script for mariadb which works on ubuntu xenial
also works on ubuntu bionic
- sidenote: prevented pip from installing requests, since a system
package is already installed in centos 7
Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
2018-09-16 22:59:09 +05:30
Ameya Shenoy
2e7619c128
Merge pull request #714 from Thunderbottom/case-fix
...
[minor] setup: fix overwrite existing site
2018-09-06 16:40:44 +05:30
Ameya Shenoy
567cd668af
Merge pull request #712 from Mangesh-Khairnar/redis-fix
...
[Minor] Redis ram fix
2018-09-06 13:51:57 +05:30
Mangesh-Khairnar
a331c012d2
[minor] redis: fix max memory size
...
some macOS systems do not have SC_PHYS_PAGES set and may raise a ValueError. As a workaround, we fallback to sysctl.
2018-09-05 18:24:48 +05:30
Ameya Shenoy
44dd195c49
Merge pull request #715 from shyjuk/patch-1
...
Update README.md
2018-08-30 04:01:00 +00:00
Shyju Kanaprath
04cb9d9e02
Update README.md
2018-08-29 20:11:25 +04:00
Chinmay Pai
0c7b92b0f1
[minor] setup: fix overwrite existing site
...
fixed a casing issue where entering "N" would overwrite the site.
Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
2018-08-29 12:58:04 +05:30
Ameya Shenoy
f969555835
Merge pull request #710 from sagarvora/patch-1
...
[python 3.7] async is a keyword => use is_async
2018-08-27 10:51:13 +00:00
Sagar Vora
03781586b7
[python 3.7] async is a keyword => use is_async
2018-08-24 10:58:06 +05:30
Ameya Shenoy
e66c9b6c37
Merge pull request #708 from codingCoffee/stuff
...
fixed path
2018-08-16 13:06:33 +05:30
Ameya Shenoy
2354396d49
fixed path
2018-08-16 13:04:02 +05:30
Ameya Shenoy
c950b162b0
Merge pull request #642 from codingCoffee/pip10_compat
...
Pip18 compatible
2018-08-15 23:40:28 +05:30
Ameya Shenoy
c6e559b8b9
better coding practices
2018-08-15 18:02:05 +00:00
Ameya Shenoy
642935a8a8
removed pip lockdown on 9.0.3
2018-08-15 18:02:03 +00:00
Saurabh
18bf1b5450
Merge pull request #706 from saurabh6790/multi-branch-release
...
[fix]semantic versioning
2018-07-19 14:38:08 +05:30
Saurabh
03186a75ba
[fix]symentic versioning
2018-07-19 13:18:23 +05:30
Ameya Shenoy
1ea46fa33d
Merge pull request #705 from adityahase/master
...
Autocompletion for bench (zsh and bash)
2018-07-12 19:50:28 +05:30