Commit graph

1521 commits

Author SHA1 Message Date
Sahil Khan
ac99dbaf49 bumped to version 11.1.31 2019-05-28 15:08:39 +05:50
Sahil Khan
44e6d3338f bumped to version 11.1.30 2019-05-22 16:13:32 +05:50
Sahil Khan
e4aedc3e66 bumped to version 11.1.29 2019-05-21 14:27:05 +05:50
Rushabh Mehta
068e6279f6
Merge pull request #7439 from saurabh6790/read_from_secondary_hotfix
fix: naming and provision to use same db credentails for secondary
2019-05-16 14:40:17 +05:30
Sahil Khan
b7161378d5 bumped to version 11.1.28 2019-05-14 17:06:03 +05:50
Saurabh
ca01c75ea4 fix: naming 2019-05-10 10:54:35 +05:30
Saurabh
5e284db206 fix: naming and provision to use same db credentails for secondary 2019-05-10 10:54:35 +05:30
Saurabh
636efb7046 fix: naming 2019-05-10 10:53:27 +05:30
Saurabh
8586b88515 fix: v11 compatible changes 2019-05-10 10:49:03 +05:30
Saurabh
d07d3605b7 fix: naming and provision to use same db credentails for secondary 2019-05-10 10:49:03 +05:30
Sahil Khan
9bbb5b2b5d bumped to version 11.1.27 2019-05-07 14:59:51 +05:50
Shivam Mishra
c5a11f9fd0
Merge pull request #7358 from scmmishra/encrypt-pdf
feat: Added encryption feature for pdfs
2019-05-03 11:26:01 +05:30
Aditya Hase
5d5e68dbed fix: Do not show locals to user (#7397) 2019-05-02 19:35:17 +05:30
Aditya Hase
b14d6e76b1 fix: Do not show locals to user (#7396) 2019-05-02 19:35:07 +05:30
Sahil Khan
49d2d838ad bumped to version 11.1.26 2019-05-01 15:32:07 +05:50
Shivam Mishra
f22e84f31f chore: updated docstrings for get_print 2019-05-01 11:47:42 +05:30
Sahil Khan
362d31c231 bumped to version 11.1.25 2019-04-29 19:57:03 +05:50
Shivam Mishra
026d5a8734 Merge branch 'develop' of https://github.com/frappe/frappe into encrypt-pdf 2019-04-29 16:48:50 +05:30
Sahil Khan
b0db49a273 bumped to version 11.1.24 2019-04-29 16:53:37 +05:50
Faris Ansari
1064a7f687
fix: Method docstring 2019-04-26 15:37:33 +05:30
Shivam Mishra
d791285ac2 feat: Added encryption feature for pdfs 2019-04-25 17:23:38 +05:30
Rushabh Mehta
fce9989e1f
Merge pull request #7326 from oshosanya/allow-database-port-config
feat: Allow user to specify database port
2019-04-25 11:40:54 +05:30
Saif Ur Rehman
dc74a83d90 fix: Remove trailing spaces from exported JSON 2019-04-24 17:05:55 +05:00
Rushabh Mehta
dd63977710
Revert "feat: DocType JSON changes for cleaner Git Diffs" 2019-04-24 17:04:29 +05:30
Rushabh Mehta
a6ddb424f3
Merge pull request #7305 from SaiFi0102/DocType-JSON-Field-Order
feat: DocType JSON changes for cleaner Git Diffs
2019-04-24 14:21:56 +05:30
Sahil Khan
2454a85b92 bumped to version 11.1.23 2019-04-22 14:24:09 +05:50
Michael Oshosanya
a0f8d3f21c Allow user to specify database port 2019-04-21 19:43:49 +01:00
Saif Ur Rehman
0e5e261d9e fix: Remove trailing spaces from exported JSON 2019-04-18 18:40:24 +05:00
Saurabh
bc4e68176e bumped to version 11.1.22 2019-04-16 14:02:17 +06:00
Nabin Hait
8c91e46563 Fixed merge conflict 2019-04-11 11:56:37 +05:30
Rushabh Mehta
ad37597fb0 Revert "fix: Raise exception if apps are on incompatible branches (#7177)"
This reverts commit 52da1476e3.
2019-04-08 17:09:54 +05:30
Frappe Bot
ba682c5f14 Merge branch 'master' into develop 2019-04-08 09:16:59 +00:00
Frappe Bot
75fa6f4038 bumped to version 11.1.21 2019-04-08 09:15:01 +00:00
Frappe Bot
629a5e502a Merge branch 'master' into develop 2019-04-07 09:03:27 +00:00
Frappe Bot
acd7c99db6 bumped to version 11.1.20 2019-04-07 08:47:11 +00:00
Saurabh
1972ff2375 bumped to version 11.1.19 2019-04-05 17:09:04 +06:00
Aditya Hase
52da1476e3 fix: Raise exception if apps are on incompatible branches (#7177) 2019-04-04 10:38:06 +05:30
Aditya Hase
cb48feac98 fix: Raise exception if apps are on incompatible branches (#7175) 2019-04-04 10:37:41 +05:30
Saurabh
fac0ddf62f bumped to version 11.1.18 2019-03-30 15:29:37 +06:00
Faris Ansari
70246946b2 fix: Dont escape tracebacks in errprint 2019-03-28 15:05:23 +05:30
Sahil Khan
f085765abd Merge branch 'master' into develop 2019-03-28 13:44:14 +05:30
Sahil Khan
bfb96d7639 bumped to version 11.1.17 2019-03-28 13:42:14 +05:50
Frappe Bot
bd2e410a02 Merge branch 'master' into develop 2019-03-23 07:23:54 +00:00
Frappe Bot
30bc0f95ad bumped to version 11.1.16 2019-03-23 07:21:22 +00:00
Saurabh
6d9fa54f0b Merge branch 'master' into develop 2019-03-20 14:30:48 +05:30
Saurabh
1e4abd4f5b bumped to version 11.1.15 2019-03-20 15:00:47 +06:00
Rushabh Mehta
eaaeba5df2 Merge remote-tracking branch 'upstream/hotfix' into develop 2019-03-15 14:52:09 +05:30
Rushabh Mehta
1a25daf6c1
Merge pull request #7020 from ElasticRun/shift-db
fix: compulsorily shift db
2019-03-15 09:09:26 +05:30
Faris Ansari
eeb8fe98eb fix: Don't escape traceback
Traceback breaks when there is a python object <frappe.model.Document>.
This is occasional, and other tracebacks are not clean, so reverting.
2019-03-14 13:20:11 +05:30
Frappe Bot
94ea028db3 Merge branch 'master' into develop 2019-03-08 09:38:18 +00:00