Davide Bortolami
|
333786d013
|
small cleanup
|
2020-03-07 18:43:58 +00:00 |
|
Davide Bortolami
|
b437dcd284
|
Update development Dockerfile to better resemble production dockerfiles. Still untested.
|
2020-03-07 18:24:54 +00:00 |
|
Revant Nandgaonkar
|
7a38666a84
|
Merge pull request #129 from revant/fix-worker-new-site
fix: worker new-site command
|
2020-03-07 19:41:33 +05:30 |
|
Revant Nandgaonkar
|
07806f1086
|
fix: worker new-site command
fixes #128
|
2020-03-07 19:39:59 +05:30 |
|
Revant Nandgaonkar
|
9cf13ef3c6
|
Merge pull request #127 from revant/fix-image-builds
fix: erpnext nginx image install_app script
|
2020-03-07 16:47:54 +05:30 |
|
Revant Nandgaonkar
|
0f03713e5c
|
fix: erpnext nginx image install_app script
|
2020-03-07 16:45:53 +05:30 |
|
Revant Nandgaonkar
|
5077c6b048
|
Merge pull request #126 from revant/fix-image-builds
fix: erpnext nginx image build
|
2020-03-07 15:48:42 +05:30 |
|
Revant Nandgaonkar
|
e5a5a05dfb
|
fix: erpnext nginx image build
|
2020-03-07 15:47:50 +05:30 |
|
Revant Nandgaonkar
|
b0a874df61
|
Merge pull request #125 from revant/develop
fix: erpnext image build
|
2020-03-07 13:36:02 +05:30 |
|
Revant Nandgaonkar
|
e53ac6b8b8
|
fix: erpnext image build
|
2020-03-07 13:27:19 +05:30 |
|
Revant Nandgaonkar
|
92a8358abb
|
Merge pull request #122 from fermiumlabs/fix-119
fix #119
|
2020-03-07 06:43:59 +05:30 |
|
Davide Bortolami
|
94e62d0268
|
fix #119
|
2020-03-07 00:38:10 +00:00 |
|
Revant Nandgaonkar
|
3549ce5409
|
Merge pull request #121 from revant/fix-readme
fix: development README for MariaDB setup
|
2020-03-07 05:56:27 +05:30 |
|
Revant Nandgaonkar
|
843d09fb6d
|
fix: development README for MariaDB setup
|
2020-03-07 05:55:11 +05:30 |
|
Revant Nandgaonkar
|
01d487b720
|
Merge pull request #104 from chabad360/install_app
Create a Wrapper script for installing custom apps
|
2020-03-07 05:37:32 +05:30 |
|
Revant Nandgaonkar
|
845f8546ff
|
fix: travis duplicate stages
|
2020-03-07 05:34:06 +05:30 |
|
Revant Nandgaonkar
|
d00770e42f
|
fix: install_app set branch
|
2020-03-07 05:33:32 +05:30 |
|
chabad360
|
4b87e50779
|
ambiguous stage names for faster builds
|
2020-03-06 06:43:28 +00:00 |
|
chabad360
|
b6eb3ccde2
|
bug fix in install_apps.sh
|
2020-03-06 06:29:12 +00:00 |
|
chabad360
|
7bdd329793
|
some small changes
|
2020-03-06 06:23:53 +00:00 |
|
chabad360
|
1c513f9e41
|
Merge remote-tracking branch 'upstream/develop' into install_app
|
2020-03-06 06:21:07 +00:00 |
|
chabad360
|
be8f0e4fa0
|
rudimentary docs
|
2020-03-06 06:12:11 +00:00 |
|
Revant Nandgaonkar
|
3d53657200
|
Merge pull request #117 from revant/fix-readme
fix: Improve README(s)
|
2020-03-06 06:48:11 +05:30 |
|
Revant Nandgaonkar
|
2f085ea234
|
fix: Improve README(s)
|
2020-03-06 06:45:54 +05:30 |
|
Revant Nandgaonkar
|
448e6e7725
|
Merge pull request #103 from fermiumlabs/documentation-updates
Documentation updates
|
2020-03-06 03:56:15 +05:30 |
|
Revant Nandgaonkar
|
c991d37e23
|
Merge pull request #116 from revant/fix-bench-image
fix: bench image
|
2020-03-05 23:51:33 +05:30 |
|
Revant Nandgaonkar
|
be3d90dd03
|
fix: bench image
install nvm in user home
allows npm install -g
install yarn in v10
|
2020-03-05 23:49:48 +05:30 |
|
Revant Nandgaonkar
|
ed6498bcaa
|
Merge pull request #115 from revant/fix-travis-yml
fix: travis yml indent error
|
2020-03-05 22:26:11 +05:30 |
|
Revant Nandgaonkar
|
7477e53428
|
fix: travis yml indent error
|
2020-03-05 22:25:11 +05:30 |
|
Revant Nandgaonkar
|
91a66e7c75
|
Merge pull request #114 from revant/feat-dev-docker
feat: development docker
|
2020-03-05 22:15:31 +05:30 |
|
Davide Bortolami
|
71763673b8
|
merged documentation changes
|
2020-03-05 16:39:32 +00:00 |
|
Revant Nandgaonkar
|
4771feee06
|
fix: travis yml formatting
|
2020-03-05 22:04:43 +05:30 |
|
Revant Nandgaonkar
|
d071bf232d
|
feat: development docker
|
2020-03-05 21:56:31 +05:30 |
|
Revant Nandgaonkar
|
02d2b9fbbf
|
Merge pull request #112 from revant/fix-rename-frappe-assets-conflicts
rename frappe assets
|
2020-03-05 12:14:46 +05:30 |
|
Revant Nandgaonkar
|
6782decfc6
|
fix: resolve travis yml conflicts
use travis.py
|
2020-03-05 12:05:32 +05:30 |
|
chabad360
|
b254e018e5
|
shave off a layer
|
2020-03-05 02:28:42 +00:00 |
|
chabad360
|
5cf8e68327
|
update docs for INSTALL_APPS
|
2020-03-05 02:00:54 +00:00 |
|
chabad360
|
d6e012e9c0
|
resolve merge conflicts
|
2020-03-05 01:43:50 +00:00 |
|
chabad360
|
2d459987c3
|
no longer conflict with #93
|
2020-03-05 01:39:18 +00:00 |
|
chabad360
|
959ab4fc7d
|
one small change to support multi-tenancy
|
2020-03-05 01:38:01 +00:00 |
|
Revant Nandgaonkar
|
1843e8a642
|
Merge pull request #108 from fermiumlabs/fix-#101
Fixes #101
|
2020-03-05 06:45:11 +05:30 |
|
Revant Nandgaonkar
|
9e7cf56cd9
|
Merge pull request #111 from revant/fix-travis-yml
fix: travis yml use to bionic
|
2020-03-05 06:40:37 +05:30 |
|
Revant Nandgaonkar
|
70021c7e50
|
fix: travis yml use to bionic
|
2020-03-05 06:34:26 +05:30 |
|
Revant Nandgaonkar
|
7d74e73b1d
|
Merge pull request #110 from revant/fix-travis-py
fix: travis py script
|
2020-03-05 06:21:14 +05:30 |
|
Revant Nandgaonkar
|
aa3f5f32b2
|
fix: travis py script
|
2020-03-05 06:20:18 +05:30 |
|
Revant Nandgaonkar
|
e438a124b6
|
Merge pull request #93 from chabad360/travis.sh
Add a build script for travis.yml
|
2020-03-05 06:04:59 +05:30 |
|
chabad360
|
301e5e3ab6
|
a bit of refactoring
|
2020-03-04 20:27:53 +00:00 |
|
chabad360
|
63ae6cf9ea
|
consistent use of f-strings
|
2020-03-04 20:21:19 +00:00 |
|
Davide Bortolami
|
922877bf92
|
Fixes #101
Nginx will now wait up to 10 seconds for frappe-python and frappe-socketio to be available
|
2020-03-04 14:15:25 +00:00 |
|
Chinmay Pai
|
e3cd90bda2
|
Merge pull request #107 from revant/fix-worker-images
fix worker images
|
2020-03-04 16:13:39 +05:30 |
|