Commit graph

1071 commits

Author SHA1 Message Date
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
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
Faris Ansari
178c553b5d fix: Dont cache get_hooks in developer_mode 2019-02-16 19:51:07 +05:30
Frappe Bot
bfc25ad1e5 Merge branch 'master' into develop 2019-02-15 10:21:47 +00:00
Frappe Bot
73001d8202 bumped to version 11.1.6 2019-02-15 10:17:14 +00:00
Aditya Hase
683be9e096 feat(error-report): Collect frame locals in error report (#6938)
* feat(error-report): Collect frame locals in error report

* style: Linting fixes
2019-02-15 14:24:08 +05:30
Sagar Vora
17b20b22a3 Merge branch 'master' into develop 2019-02-12 16:31:54 +05:30
Sagar Vora
ead9bde39d bumped to version 11.1.5 2019-02-12 16:38:43 +05:50
Himanshu Mishra
53930a12eb
Close read_only db connection
Close read only db connection, else one might end up with 'Too many connections' error from mysql.
2019-02-06 22:32:26 +05:30
Sagar Vora
89efa968d8 Merge branch 'master' into develop 2019-02-05 18:39:43 +05:30
Sagar Vora
228522b555 bumped to version 11.1.4 2019-02-05 18:43:18 +05:50
Sagar Vora
cf1818f989 Merge branch 'master' into develop 2019-01-31 13:31:00 +05:30
Sagar Vora
f904987d2d bumped to version 11.1.3 2019-01-31 13:48:38 +05:50
Sagar Vora
c8f23b4746 Merge branch 'master' into develop 2019-01-30 20:08:53 +05:30
Sagar Vora
3f3dd0ddb1 bumped to version 11.1.2 2019-01-30 20:25:49 +05:50
Saurabh
76bd4e4f19 Merge branch 'master' into develop 2019-01-30 12:36:43 +05:30
Saurabh
b6c0dad25c bumped to version 11.1.1 2019-01-30 12:59:38 +06:00
Sagar Vora
8849ed5330
fix: update version to 11.1.0! 2019-01-29 18:47:35 +05:30
Sagar Vora
ef82f39f99 Merge branch 'staging' into develop 2019-01-29 18:24:11 +05:30
Sagar Vora
fe3fe0a4b8 Merge branch 'master' into staging-fixes 2019-01-29 17:08:58 +05:30
Sagar Vora
92324c740c bumped to version 10.1.71 2019-01-29 16:59:33 +05:50
Aditya Hase
434b518ebf fix(unicode): Set default encoding to utf-8 in Python 2 (#6833) 2019-01-29 10:51:12 +05:30
Sagar Vora
47c0d10631 Merge branch 'staging' into develop 2019-01-22 15:43:40 +05:30
Sagar Vora
2d166e7513 Merge branch 'master' into staging-fixes 2019-01-22 15:24:48 +05:30
Sagar Vora
a00b063d36 bumped to version 10.1.70 2019-01-22 15:39:38 +05:50
Saurabh
d1bed88f3f Merge branch 'staging' into develop 2019-01-15 19:14:06 +05:30
Saurabh
2fbf59522e Merge branch 'master' into staging-fixes 2019-01-15 19:05:42 +05:30
Saurabh
480b31587d bumped to version 10.1.69 2019-01-15 19:35:41 +06:00
Frappe Bot
0499b4a845 Merge branch 'staging' into develop 2018-12-26 12:03:03 +00:00
rohitwaghchaure
22fe10148a [Fix] Translation not working for the html data (#6647)
* [Fix] Translation not working for the html data

* Test cases

* Fixed codacy

* Fixed is html method

* Fixed test cases
2018-12-24 15:17:38 +05:30
Frappe Bot
d2c652ef3a Merge branch 'staging' into develop 2018-12-19 06:30:46 +00:00
Frappe Bot
395972bf0b Merge branch 'master' into staging-fixes 2018-12-19 06:26:37 +00:00
Frappe Bot
d63570059d bumped to version 10.1.68 2018-12-19 06:19:04 +00:00
Frappe Bot
b2779c617a Merge branch 'staging' into develop 2018-12-06 09:31:40 +00:00