Commit graph

13959 commits

Author SHA1 Message Date
Rushabh Mehta
397444842e [fix] totals in reportview.js 2017-09-28 12:02:14 +05:30
Rushabh Mehta
3b6ed442af [fix] frappe/erpnext#10939 2017-09-27 18:20:20 +05:30
Nabin Hait
e689cb0230 Merge branch 'hotfix' 2017-09-27 17:27:03 +05:30
Nabin Hait
1dfce98096 bumped to version 9.0.4 2017-09-27 17:57:03 +06:00
Rushabh Mehta
32d87a92c3 [fix] revert to fallback if socketio does not start the first time (#4198) 2017-09-27 17:23:12 +05:30
Nabin Hait
3280f6f376 Merge branch 'hotfix' 2017-09-27 17:18:53 +05:30
Nabin Hait
49862ef226 bumped to version 9.0.3 2017-09-27 17:48:53 +06:00
Rushabh Mehta
fbf8da1d37 [minor] compileall after migrate, might solve timeouts on VM (#4197) 2017-09-27 15:31:51 +05:30
Nabin Hait
85460b8413 Merge branch 'hotfix' 2017-09-27 13:42:53 +05:30
Nabin Hait
0d07a9b2e4 bumped to version 9.0.2 2017-09-27 14:12:52 +06:00
Rushabh Mehta
9b6ad9022c [fix] smaller chunks, longer keep-alive (#4196) 2017-09-27 13:24:50 +05:30
Nabin Hait
6afede2aab Merge branch 'hotfix' 2017-09-27 13:03:10 +05:30
Nabin Hait
adef7e2e75 bumped to version 9.0.1 2017-09-27 13:33:10 +06:00
Makarand Bauskar
ad1c04850c [hotfix] send email from sender's email account if From field is selected on communication view (#4181)
* [hotfix] send email from sender's email account if From field is selected on communication view

* [fixes] codecy fixes
2017-09-27 12:41:35 +05:30
Faris Ansari
ea1af868a8 Fix filters (#4194)
* [fix] Filters

* [fix] translation method
2017-09-27 12:40:12 +05:30
Rushabh Mehta
2dccaf5071 Merge pull request #4192 from mbauskar/message
[minor] fixed template error on frappe.confirm if message has '
2017-09-27 08:52:36 +05:30
mbauskar
c948197d3f [minor] fixed template error on frappe.confirm if message has ' 2017-09-27 07:20:18 +05:30
Nabin Hait
645526bb28 Merge branch 'staging' 2017-09-26 16:02:54 +05:30
Nabin Hait
714444bf5f bumped to version 9.0.0 2017-09-26 16:32:53 +06:00
Rushabh Mehta
0e6fd7e3ac Merge pull request #4187 from pratu16x7/staging
[fix] Heatmap values by date strings, setup indicator
2017-09-26 12:38:31 +05:30
pratu16x7
a15c2a53a2 [minor] 2017-09-26 12:27:47 +05:30
pratu16x7
fa120c3ab3 [fix] values by date strings 2017-09-26 12:10:53 +05:30
pratu16x7
40e57efa52 [setup] indicator and check color 2017-09-26 12:05:50 +05:30
Nabin Hait
ce01845d11 Merge branch 'master' into staging 2017-09-25 16:30:13 +05:30
Nabin Hait
2ce0f70c9a Merge branch 'hotfix' 2017-09-25 16:29:08 +05:30
Nabin Hait
552abc9db7 bumped to version 8.10.9 2017-09-25 16:59:07 +06:00
Rushabh Mehta
1d60941b6a Merge pull request #4173 from rmehta/hotfix-webform-date-picker
[fix] web form datepicker, trigger change event
2017-09-24 16:55:38 +05:30
Rushabh Mehta
57dfa412af [fix] web form datepicker, trigger change event 2017-09-23 16:10:37 +05:30
Rushabh Mehta
1dc8b66a8d Merge pull request #4160 from mbauskar/quick-entry
[hotfix] refresh dependancy after values are set in doc
2017-09-22 14:49:15 +05:30
Rushabh Mehta
455179b872 Update field_group.js 2017-09-22 12:40:22 +05:30
Rushabh Mehta
9c033db6fc Merge pull request #4157 from pratu16x7/staging
[navbar] layout fixes
2017-09-22 10:32:17 +05:30
pratu16x7
532e2e2dcd [navbar] layout fixes 2017-09-22 01:05:17 +05:30
mbauskar
69eb8934c0 [hotfix] refresh dependancy after values are set in doc 2017-09-21 17:55:10 +05:30
Rushabh Mehta
9a9b215de8 Merge pull request #4145 from mbauskar/email
[hotfix] set the email account for outgoing emails
2017-09-21 14:52:07 +05:30
Nabin Hait
9d24c8038a Merge branch 'develop' into staging 2017-09-21 13:01:51 +05:30
Makarand Bauskar
47677c055c [minor] refactor mark as read and mark as unread (#4154)
* [minor] refresh inbox view on mark as read or mark as unread

* [minor] refactor mark as read and mark as unread

* [minor] don't update modified datetime while settings _seen
2017-09-21 12:32:20 +05:30
Rushabh Mehta
6651726b06 Merge pull request #4151 from rmehta/file-upload-fallback
[minor] fallback to file upload
2017-09-20 21:54:25 +05:30
Rushabh Mehta
8a37efcfd2 [fix] lint 2017-09-20 14:59:47 +05:30
Rushabh Mehta
85b88d6b09 [fix] lint 2017-09-20 14:58:54 +05:30
Rushabh Mehta
202732ed5f [minor] added fallback to file upload 2017-09-20 14:51:55 +05:30
Rushabh Mehta
97393402da [fix] dirty for text editor and use emoji for desktop icon 2017-09-20 11:54:23 +05:30
mbauskar
bcecf23772 [minor] moved code to set_incoming_outgoing_accounts method 2017-09-20 11:51:09 +05:30
Rushabh Mehta
80679f1b2f Merge pull request #4135 from mbauskar/backup
[minor] change backup filename format to DDMMYY_HHMMSS_SITE_DATABASE.*
2017-09-20 11:22:00 +05:30
Rushabh Mehta
16148abc9b Update backups.py 2017-09-20 11:21:40 +05:30
Rushabh Mehta
98f92d5427 Merge pull request #4146 from mbauskar/html_utils
[minor] fixed uneven intendation, replaced spaces with tag
2017-09-20 11:20:08 +05:30
Rushabh Mehta
0bb59b83c2 Merge pull request #4138 from Zlash65/linking
[Fix] Minor fix - refresh contact links
2017-09-20 11:17:07 +05:30
Rushabh Mehta
fbabaec919 Merge pull request #4147 from mbauskar/unhandle-emails
[minor] save uid, raw email for unhandled emails and other minor fixes
2017-09-20 11:16:09 +05:30
Rushabh Mehta
3ace312ed5 Merge pull request #4149 from agritheory/patch-2
Update model.js
2017-09-20 11:15:38 +05:30
Tyler Matteson
86c44b871f Update model.js
Add comment to clarify slug or slugify functionality
2017-09-19 13:31:29 -04:00
mbauskar
c12eca952d [minor] save uid, raw email for unhandled emails and other minor fixes 2017-09-19 16:30:48 +05:30