Commit graph

14215 commits

Author SHA1 Message Date
mbauskar
165b59cdcb bumped to version 9.1.8 2017-10-18 16:49:55 +06:00
Barakat
14ba7ce375 Stop reloading the HTML content after every document change (#4307) 2017-10-18 10:01:29 +03:00
Nabin Hait
aca3658f36 Removed SMS sender field from SMS Settings (#4334)
* Removed SMS sender field from SMS Settings

* patch for sms sender name
2017-10-17 15:09:13 +03:00
Faris Ansari
c06383a260 Disable socketio file upload in text editor frappe/erpnext#10991 (#4333) 2017-10-17 17:16:00 +05:30
Makarand Bauskar
99fa65cb1a [hotfix] fixed patch sequence and removed the update_email_queue patch (#4330) 2017-10-17 14:47:06 +05:30
Makarand Bauskar
9ff3dfcd4c [hotfix] robots.txt file is considered as static instead of getting context from robots.py (#4325) 2017-10-17 11:56:29 +05:30
Makarand Bauskar
fe75ffb8da [minor] fetch dictory value using get method instead of indexing (#4324) 2017-10-17 11:56:01 +05:30
Rushabh Mehta
cd968348d7 [minor] better message on permission 2017-10-16 10:18:56 +05:30
mbauskar
52d7d7af11 Merge branch 'hotfix' 2017-10-13 11:03:54 +05:30
mbauskar
be3cbd790a bumped to version 9.1.7 2017-10-13 11:33:54 +06:00
Makarand Bauskar
beeaa3f6ab [hotfix] no_socketio while uploading file for data-import-tool (#4306) (#4310) 2017-10-13 10:51:38 +05:30
mbauskar
bc396d5cba Merge branch 'hotfix' 2017-10-11 14:38:26 +05:30
mbauskar
6757c5d61b bumped to version 9.1.6 2017-10-11 15:08:26 +06:00
Makarand Bauskar
ff954462a2 [minor] attach only image type files to Background Image field (#4283) 2017-10-11 14:37:12 +05:30
Makarand Bauskar
007bb0d684 [hotfix] enable Update button if error occured after customize form save (#4294) 2017-10-10 13:56:25 +05:30
Makarand Bauskar
77f55a0ee1 [hotfix] fixed margin for disabled check field (#4293) 2017-10-10 13:48:20 +05:30
mbauskar
75c894f034 Merge branch 'hotfix' 2017-10-10 12:35:42 +05:30
mbauskar
57f6a39180 bumped to version 9.1.5 2017-10-10 13:05:42 +06:00
Saurabh
b3ee2d56fc Merge pull request #4291 from saurabh6790/upload_attendance_fix
[fix] missing dataurl in on_attach
2017-10-10 12:32:51 +05:30
Saurabh
f362f84238 [fix] missing dataurl in on_attach 2017-10-10 12:29:57 +05:30
Saurabh
ca3bbe75ae Merge branch 'hotfix' 2017-10-10 11:21:05 +05:30
Saurabh
2c25c9619d bumped to version 9.1.4 2017-10-10 11:51:05 +06:00
Saurabh
75ef8d5345 Merge pull request #4290 from saurabh6790/upload_attendance_fix
[fix] if no_socketio specified, upload file with FileReader
2017-10-10 11:19:55 +05:30
Saurabh
884555b645 [fix] if no_socketio specified, upload file with FileReader 2017-10-09 16:12:00 +05:30
mbauskar
9439a808a1 Merge branch 'hotfix' 2017-10-09 15:17:32 +05:30
mbauskar
14898d1126 bumped to version 9.1.3 2017-10-09 15:47:32 +06:00
rohitwaghchaure
60078d61a3 Custom Attach field, user not able to attach file (#4274) 2017-10-09 13:14:21 +05:30
Makarand Bauskar
229f676645 [hotfix] minor fixes in the Email Communication subject field (#4278) 2017-10-09 13:09:41 +05:30
rohitwaghchaure
705d48619c [Fix] Signature not displying in the PDF (#4271) 2017-10-09 08:46:35 +05:30
Saurabh
5cd9e167d8 Merge branch 'hotfix' 2017-10-06 17:28:04 +05:30
Saurabh
8526299650 bumped to version 9.1.2 2017-10-06 17:58:03 +06:00
Saurabh
52d1e7300b [fix] generate token while initiating razorpay payment and accept payment against the token. do not pass payment arguments in url, user can modify payment parameters (#4269) 2017-10-06 17:23:12 +05:30
Makarand Bauskar
36a0782564 [minor] moved the Website Name field to top (#4258) 2017-10-06 11:48:13 +05:30
Makarand Bauskar
946137717b [hotfix] check if doc has valid title value (#4255) 2017-10-05 15:28:30 +05:30
mbauskar
52a7b5b0b9 Merge branch 'hotfix' 2017-10-05 13:35:51 +05:30
mbauskar
5830b52321 bumped to version 9.1.1 2017-10-05 14:05:51 +06:00
rohitwaghchaure
192fae169c [Fix] Letter head not displaying proper in the pdf (#4251) 2017-10-05 13:01:35 +05:30
Makarand Bauskar
a5bc359b10 [hotfix] validate the image field on doctype or customize form update (#4244) 2017-10-05 11:21:01 +05:30
Nabin Hait
311dff662a Merge branch 'staging' 2017-10-04 18:20:50 +05:30
Nabin Hait
7bf5b6eec2 bumped to version 9.1.0 2017-10-04 18:50:49 +06:00
Nabin Hait
fde8080e6a Merge branch 'master' into staging 2017-10-04 18:18:06 +05:30
Nabin Hait
143032065c Merge branch 'hotfix' 2017-10-04 18:18:05 +05:30
Nabin Hait
fafab5620f bumped to version 9.0.10 2017-10-04 18:48:05 +06:00
Makarand Bauskar
58fd830b92 [revert] pull emails from all incoming email accounts instead of enqueuing single email account (#4247) 2017-10-04 18:17:05 +05:30
Nabin Hait
5d3f41bb26 Merge branch 'develop' into staging 2017-10-04 18:13:46 +05:30
Nabin Hait
86e283ecdb Merge branch 'master' into staging 2017-10-04 18:12:10 +05:30
Nabin Hait
936e84f345 Merge branch 'master' into develop 2017-10-04 18:12:10 +05:30
Nabin Hait
4d38e4e435 Merge branch 'hotfix' 2017-10-04 18:12:09 +05:30
Nabin Hait
f587f3a4a9 bumped to version 9.0.9 2017-10-04 18:42:09 +06:00
Makarand Bauskar
9b32196c11 [minor] don't update the parent status if comment is added (#4241) 2017-10-04 17:59:32 +05:30