2
0
mirror of https://github.com/frappe/frappe_docker.git synced 2024-12-27 19:54:56 +00:00
Commit Graph

484 Commits

Author SHA1 Message Date
Revant Nandgaonkar
e5a333d69e
Merge pull request #238 from revant/chore
update bench nodejs
2020-05-18 03:40:43 +05:30
Revant Nandgaonkar
20f1fa0000 chore: update frappe/bench image
use latest nodejs v10 and v12
use cloned bench for bench development
2020-05-18 00:18:08 +05:30
Revant Nandgaonkar
fdcc1cd120 fix: typo and indent
improve development/README.md
fix indent devcontainer.json
2020-05-18 00:16:21 +05:30
Revant Nandgaonkar
814d62247a
Merge pull request #235 from frappe/develop
ERPNext v12.8.0 and Frappe v12.5.2
2020-05-10 00:30:35 +05:30
Revant Nandgaonkar
ddb27f589a
Merge pull request #234 from revant/fix-push-site-config
fix: push site_config.json with backup
2020-05-09 00:51:39 +05:30
Revant Nandgaonkar
9e1841f494 fix: push site_config.json with backup 2020-05-09 00:30:15 +05:30
Revant Nandgaonkar
a56e832d7e
Merge pull request #232 from paulator/paulator-patch-1
Fix socketio error in reverse proxy setup
2020-05-06 23:21:14 +05:30
paulator
52dbc49c21
Fix socketio error in reverse proxy setup 2020-05-06 11:11:55 +02:00
Revant Nandgaonkar
ed95c2fe78
Merge pull request #228 from revant/update-docs
Update README
2020-05-05 13:22:18 +05:30
Revant Nandgaonkar
2fe9826f64 [skip travis] Update README
fix sentence to avoid version/tag confusion
2020-05-05 13:20:07 +05:30
Revant Nandgaonkar
33672e09e4 [skip travis] Update README 2020-05-05 13:18:36 +05:30
Revant Nandgaonkar
0d9d1dcf42 [skip travis] Update README 2020-05-05 13:12:25 +05:30
Revant Nandgaonkar
6ecf077f9d
Merge pull request #227 from maheshk2k/patch-1
Update branch version while installing app
2020-05-03 13:07:52 +05:30
Revant Nandgaonkar
28ea4671e8 fix: development README
info related to branches of apps
[ci-skip]
2020-05-03 13:03:23 +05:30
maheshk2k
ff73540ada
Update branch version while installing app
Both bench init and get-app need to be on the same version branch. 
Mismatch results into errors while installing app
2020-05-03 12:12:21 +05:30
Revant Nandgaonkar
2b8b5fff80
Merge pull request #225 from frappe/develop
Frappe & ERPNext Version 13.0.0 Beta.1 Released
2020-05-02 00:28:53 +05:30
Revant Nandgaonkar
65522eeb46
Merge pull request #224 from revant/release-v13-beta
build v13-beta images
2020-05-02 00:26:34 +05:30
Revant Nandgaonkar
05cb6a4596 build v13-beta images 2020-05-02 00:21:56 +05:30
Revant Nandgaonkar
ed43daeb78
Merge pull request #223 from revant/test-commands
test: all worker commands
2020-05-01 23:11:34 +05:30
Revant Nandgaonkar
da4f65438d test: separate builds for develop branch and PR
Develop branch jobs pull edge images and test
PR jobs build images and test
2020-05-01 19:42:19 +05:30
Revant Nandgaonkar
4f12e61a7a test: all worker commands 2020-05-01 16:54:52 +05:30
Revant Nandgaonkar
b6b8afe415
Merge pull request #222 from revant/fix-restore-backup
fix: restore backup grant privileges command
2020-04-29 22:56:56 +05:30
Revant Nandgaonkar
e1f0e62211 fix: restore backup grant privileges command 2020-04-29 22:52:15 +05:30
Revant Nandgaonkar
6bf66e7077
Merge pull request #220 from revant/fix-restore-backup
fix: restore backup create user password command
2020-04-29 19:34:54 +05:30
Revant Nandgaonkar
3181bc66b3 fix: restore backup create user password command 2020-04-29 19:32:51 +05:30
Revant Nandgaonkar
e80071f1de
Merge pull request #219 from revant/fix-commands
fix: commands
2020-04-29 14:05:43 +05:30
Revant Nandgaonkar
8ac55c86f9 fix: always disable maintenance mode after migration 2020-04-29 14:03:28 +05:30
Revant Nandgaonkar
e8b9710052 fix: mysql error during set db password 2020-04-29 14:03:11 +05:30
Revant Nandgaonkar
361c0f6047
Merge pull request #218 from Thunderbottom/commands-semantic-fix
fix: make semantic changes to commands
2020-04-29 13:37:37 +05:30
Chinmay D. Pai
8f20e5e00d
chore: escape backticks on db commands
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-04-29 11:44:58 +05:30
Chinmay D. Pai
884a82d814
fix: make semantic changes to commands
* add missing __main__ call to commands.py
* remove unnecessary imports
* fix backup WITH_FILES logic
* follow python semantics (?)

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-04-29 01:45:59 +05:30
Revant Nandgaonkar
5a5a79f206
Merge pull request #217 from revant/fix-readme-version-tag
fix: README site operations image version tag
2020-04-27 17:34:12 +05:30
Revant Nandgaonkar
2bfc7d6958 fix: README site operations image version tag 2020-04-27 17:32:28 +05:30
Chinmay Pai
b94a260660
Merge pull request #216 from revant/improve-docker-commands 2020-04-27 16:37:44 +05:30
Revant Nandgaonkar
081ca6f085 fix: README
source additional .env for site operations
2020-04-27 14:38:33 +05:30
Revant Nandgaonkar
0361b281f9 fix: README
single command to deploy locally
env file placed where docker-compose will be executed
2020-04-27 13:36:33 +05:30
Revant Nandgaonkar
264c2745a2
Merge pull request #215 from revant/fix-s3-region
fix: required region s3 compatible backup/restore
2020-04-26 22:53:53 +05:30
Revant Nandgaonkar
479ce83f5c fix: required region s3 compatible backup/restore 2020-04-26 22:48:35 +05:30
Revant Nandgaonkar
c4608066ea
Merge pull request #212 from frappe/develop
ERPNext v12.7.1 and Frappe v12.5.1
2020-04-23 23:00:42 +05:30
Revant Nandgaonkar
0c2cf1da50
Merge pull request #211 from revant/revert-v12-dockerfile
revert(frappe-nginx): revert v12.Dockerfile
2020-04-23 22:07:27 +05:30
Revant Nandgaonkar
7599252a62 revert(frappe-nginx): revert v12.Dockerfile
standard_style.css generation not required for v12
2020-04-23 21:56:52 +05:30
Chinmay Pai
aac3efb24b
Merge pull request #210 from revant/fix-website-style-css 2020-04-23 21:47:23 +05:30
Revant Nandgaonkar
4f411104f3 fix(frappe-nginx): Generate Standard Style CSS
use nunjucks to render jinja2 template
generate default theme
2020-04-23 14:56:46 +05:30
Revant Nandgaonkar
974f7dd74c
Merge pull request #195 from tbolender/sites-volume
Use Docker volumes for storing sites
2020-04-22 18:43:27 +05:30
Revant Nandgaonkar
4322759338
Merge pull request #205 from resourcefactor/patch-2
Update README.md
2020-04-22 18:42:00 +05:30
Revant Nandgaonkar
11ce87b7d0 fix: README typo 2020-04-22 18:40:19 +05:30
Davide Bortolami
d2d68023e1
Merge pull request #204 from resourcefactor/patch-1
Update README.md
2020-04-22 13:21:04 +01:00
resourcefactor
7c91718280
Update README.md 2020-04-22 16:20:44 +04:00
resourcefactor
2d928049b5
Update README.md 2020-04-22 16:19:37 +04:00
Tim Bolender
b633ea05de Instruct usage of RDS 2020-04-22 11:11:15 +02:00