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 |
|
Revant Nandgaonkar
|
501d144728
|
fix: worker images new site command
install apps is a list not boolean
|
2020-03-04 14:36:13 +05:30 |
|
chabad360
|
8eb26446da
|
make this pr not make travis build on the wrong image
|
2020-03-04 03:59:53 +00:00 |
|
chabad360
|
48a305bec6
|
Adding in the rsync for the docker-entrypoint
|
2020-03-04 03:43:49 +00:00 |
|
chabad360
|
f4e24e15a8
|
create install_app for assets
|
2020-03-04 03:33:38 +00:00 |
|
chabad360
|
b610caba7e
|
forgot about branches
|
2020-03-04 03:33:23 +00:00 |
|
chabad360
|
177ca58af6
|
add and implement install_app for worker image
|
2020-03-04 02:52:36 +00:00 |
|
chabad360
|
34d97848b5
|
remove some debugging lines
|
2020-03-04 02:22:29 +00:00 |
|
chabad360
|
8c00873065
|
swap out travis.sh for python and be compat with #100
|
2020-03-04 02:15:59 +00:00 |
|
Davide Bortolami
|
6f7a9b92ac
|
Refactor renaming erpnext-assets and frappe-assets to erpnext-nginx and frappe-nginx
|
2020-03-03 23:40:11 +00:00 |
|
chabad360
|
77aca4d3cc
|
organize travis.yml a bit
|
2020-03-03 06:04:17 +00:00 |
|
chabad360
|
37eabd9018
|
add a help file and alphabetize
|
2020-03-03 05:56:14 +00:00 |
|
chabad360
|
ca715e3e5c
|
add versioning support to travis.sh
|
2020-03-03 05:27:18 +00:00 |
|
chabad360
|
84d53bfcba
|
convert edge build to travis.sh
|
2020-03-03 05:03:13 +00:00 |
|
Chinmay D. Pai
|
c21d26fa36
|
chore: remove redundant docker-compose
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
|
2020-03-02 23:47:13 +05:30 |
|
Revant Nandgaonkar
|
97ec097870
|
Merge pull request #90 from Thunderbottom/remove-deprecated
chore: cleanup redundant files
|
2020-03-02 23:12:20 +05:30 |
|
Chinmay D. Pai
|
13df6d6b9e
|
chore: remove dbench test
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
|
2020-03-02 23:10:19 +05:30 |
|
Chinmay D. Pai
|
b9a6c42333
|
chore: cleanup redundant files
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
|
2020-03-02 23:10:16 +05:30 |
|
Chinmay Pai
|
749bf1ee2b
|
Merge pull request #91 from revant/fix-build-push-tags
fix: erpnext-assets v12 build
|
2020-03-02 23:08:36 +05:30 |
|
Revant Nandgaonkar
|
f09a20a999
|
ci: push branch tags
|
2020-03-02 22:59:10 +05:30 |
|
Revant Nandgaonkar
|
66343400ff
|
fix: erpnext-assets v12 build
|
2020-03-02 22:58:52 +05:30 |
|
Chinmay Pai
|
22a9e30451
|
Merge pull request #89 from revant/fix-docker-login
ci: fix travis build docker login condition
|
2020-03-02 21:46:17 +05:30 |
|
Revant Nandgaonkar
|
eff40a1b4b
|
ci: fix travis build docker login condition
|
2020-03-02 21:36:07 +05:30 |
|