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 |
|
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 |
|
Shivam Mishra
|
f22e84f31f
|
chore: updated docstrings for get_print
|
2019-05-01 11:47:42 +05:30 |
|
Shivam Mishra
|
026d5a8734
|
Merge branch 'develop' of https://github.com/frappe/frappe into encrypt-pdf
|
2019-04-29 16:48:50 +05:30 |
|
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 |
|
Michael Oshosanya
|
a0f8d3f21c
|
Allow user to specify database port
|
2019-04-21 19:43:49 +01: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 |
|
Frappe Bot
|
907aacc1cf
|
bumped to version 11.1.14
|
2019-03-08 09:00:40 +00:00 |
|
Himanshu Mishra
|
2585a56f6f
|
compulsorily shift db
|
2019-03-05 17:52:18 +05:30 |
|
Frappe Bot
|
497a14046e
|
Merge branch 'master' into develop
|
2019-03-01 09:10:17 +00:00 |
|
Frappe Bot
|
e0e8b54fc2
|
bumped to version 11.1.13
|
2019-03-01 09:10:17 +00:00 |
|
Frappe Bot
|
54e97b9ebc
|
Merge branch 'master' into develop
|
2019-02-28 10:05:32 +00:00 |
|
Frappe Bot
|
c72c83c400
|
bumped to version 11.1.12
|
2019-02-28 10:05:31 +00:00 |
|
Sagar Vora
|
d11dd760f8
|
Merge branch 'master' into develop
|
2019-02-26 17:06:13 +05:30 |
|
Sagar Vora
|
e1e47a22c1
|
bumped to version 11.1.11
|
2019-02-26 17:24:51 +05:50 |
|
Saurabh
|
0dd6c44e2b
|
Merge branch 'master' into develop
|
2019-02-22 10:25:19 +05:30 |
|
Saurabh
|
cd618f2aec
|
bumped to version 11.1.10
|
2019-02-22 10:55:18 +06:00 |
|
Saurabh
|
cbbc4251c9
|
Merge branch 'master' into develop
|
2019-02-21 16:18:16 +05:30 |
|
Saurabh
|
dd328340c2
|
bumped to version 11.1.9
|
2019-02-21 16:48:15 +06:00 |
|
Saurabh
|
f638a500ae
|
Merge branch 'master' into develop
|
2019-02-20 18:12:48 +05:30 |
|
Saurabh
|
6ea90fba91
|
bumped to version 11.1.8
|
2019-02-20 18:42:47 +06:00 |
|
Sagar Vora
|
56a221573b
|
Merge branch 'master' into develop
|
2019-02-19 17:52:19 +05:30 |
|
Sagar Vora
|
94a61b40fe
|
bumped to version 11.1.7
|
2019-02-19 18:10:39 +05:50 |
|
Aditya Hase
|
c08bdd88a8
|
fix: Jinja template error (#6958)
https://github.com/frappe/frappe/pull/6957
|
2019-02-19 14:22:01 +05:30 |
|
Aditya Hase
|
4b4d59026f
|
fix: Jinja template error (#6957)
Errors in Custom Print Format are not framework errors and should not have a "Report Issue" button
|
2019-02-19 14:19:51 +05:30 |
|