Commit graph

1027 commits

Author SHA1 Message Date
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
Frappe Bot
b39bbe9baf Merge branch 'master' into staging-fixes 2018-12-06 09:09:06 +00:00
Frappe Bot
bd3b14ac18 bumped to version 10.1.67 2018-12-06 08:54:30 +00:00
Ameya Shenoy
5857b9266b bumped to version 10.1.66 2018-11-29 09:45:15 +00:00
Ameya Shenoy
c5d276b813
Merge branch 'staging' into develop 2018-11-28 08:24:00 +00:00
Ameya Shenoy
f513739d1a
Merge branch 'master' into staging-fixes 2018-11-28 07:53:35 +00:00
Ameya Shenoy
bb585e59d2 bumped to version 10.1.65 2018-11-28 07:42:16 +00:00
Ameya Shenoy
13524a1ad5
Merge branch 'staging' into develop 2018-11-23 08:14:29 +00:00
Ameya Shenoy
d1d0edc636
Merge branch 'master' into staging-fixes 2018-11-23 08:07:36 +00:00
Ameya Shenoy
889d56ae54 bumped to version 10.1.64 2018-11-23 08:02:14 +00:00
Frappe Bot
19d28a1686 Merge branch 'staging' into develop 2018-11-16 08:40:16 +00:00
Frappe Bot
21dd1eca7c Merge branch 'master' into staging-fixes 2018-11-16 08:28:45 +00:00
Frappe Bot
74c8015b00 bumped to version 10.1.63 2018-11-16 08:22:03 +00:00
Frappe Bot
8bc1f37c49 Merge branch 'master' into staging-fixes 2018-11-15 11:17:59 +00:00
Frappe Bot
f3d01d7870 bumped to version 10.1.62 2018-11-15 11:17:59 +00:00
Frappe Bot
22f4433406 Merge branch 'staging' into develop 2018-11-13 11:02:24 +00:00
Frappe Bot
24758f75ac Merge branch 'master' into staging-fixes 2018-11-13 10:52:59 +00:00
Frappe Bot
48b6ed2993 bumped to version 10.1.61 2018-11-13 10:52:59 +00:00
Frappe Bot
478e60fdb1 Merge branch 'staging' into develop 2018-11-09 10:18:33 +00:00
Frappe Bot
c373a172af Merge branch 'master' into staging-fixes 2018-11-09 10:08:19 +00:00
Frappe Bot
1800f9f70a bumped to version 10.1.60 2018-11-09 10:08:19 +00:00
Ameya Shenoy
d0e7690ae2
Merge branch 'staging' into develop 2018-11-05 06:48:46 +00:00
Ameya Shenoy
5a791cd099
Merge branch 'master' into staging-fixes 2018-11-05 06:37:49 +00:00
Ameya Shenoy
54baae96f9 bumped to version 10.1.59 2018-11-05 06:37:45 +00:00
Ameya Shenoy
62736ba219
Merge branch 'staging' into develop 2018-10-31 10:58:47 +00:00
Ameya Shenoy
55fbf7ad99
Merge branch 'master' into staging-fixes 2018-10-31 10:40:55 +00:00
Ameya Shenoy
977b5a118e bumped to version 10.1.58 2018-10-31 10:36:54 +00:00
Ameya Shenoy
ee3ae7abea
Merge branch 'staging' into develop 2018-10-30 12:52:16 +00:00
Ameya Shenoy
25a0b8dba2
Merge branch 'master' into staging-fixes 2018-10-30 12:09:41 +00:00
Ameya Shenoy
00f5ce0034 bumped to version 10.1.57 2018-10-30 12:06:18 +00:00
Ameya Shenoy
42b4419b06
Merge branch 'staging' into develop 2018-10-23 12:55:31 +00:00
Ameya Shenoy
0279e957c6
Merge branch 'master' into staging-fixes 2018-10-23 12:51:30 +00:00
Ameya Shenoy
5662d29476 bumped to version 10.1.56 2018-10-23 12:42:19 +00:00
Ameya Shenoy
aa4ef1b405
Merge branch 'staging' into develop 2018-10-23 08:04:11 +00:00
Ameya Shenoy
05317b3855
Merge branch 'master' into staging-fixes 2018-10-22 10:31:38 +00:00
Ameya Shenoy
d8b1ae8d4f bumped to version 10.1.55 2018-10-22 10:31:33 +00:00
Ameya Shenoy
06d9385829
Merge branch 'staging' into develop 2018-10-19 12:51:40 +00:00
Ameya Shenoy
b42a87746a
Merge branch 'master' into staging-fixes 2018-10-19 12:42:37 +00:00
Ameya Shenoy
d4a062fdbd bumped to version 10.1.54 2018-10-19 12:38:36 +00:00
Ameya Shenoy
e692b59330
Merge branch 'staging' into develop 2018-10-17 09:43:17 +00:00
Ameya Shenoy
b9db2a43b8
Merge branch 'master' into staging-fixes 2018-10-17 09:02:49 +00:00
Ameya Shenoy
9a24ce1814 bumped to version 10.1.53 2018-10-17 09:02:44 +00:00
Nabin Hait
d37d111f61 Fixed merge conflict 2018-10-15 15:53:26 +05:30
Nabin Hait
1022e46608 Merge branch 'master' into staging-fixes 2018-10-15 15:39:35 +05:30
Nabin Hait
d215fcd537 bumped to version 10.1.52 2018-10-15 16:09:34 +06:00