Commit graph

17063 commits

Author SHA1 Message Date
Shreya Shah
d74da75a8d fix: Add download with data checkbox (#6494) 2018-11-20 15:57:21 +05:30
Ameya Shenoy
ccb8c716a2
Merge branch 'staging-fixes' into staging 2018-11-16 09:49:41 +00:00
Ameya Shenoy
5c54c5843e bumped to version 11.0.3-beta.29 2018-11-16 09:49:41 +00:00
Ameya Shenoy
2f714c98f7
Merge pull request #6483 from codingCoffee/reqfix
fix: requirements
2018-11-16 15:17:39 +05:30
Ameya Shenoy
47097bb15b
fix: requirements 2018-11-16 15:15:31 +05:30
Frappe Bot
4d8410dacd Merge branch 'staging-fixes' into staging 2018-11-16 08:32:18 +00:00
Frappe Bot
543ccc3df7 bumped to version 11.0.3-beta.28 2018-11-16 08:32:18 +00:00
Frappe Bot
21dd1eca7c Merge branch 'master' into staging-fixes 2018-11-16 08:28:45 +00:00
Frappe Bot
1035038cbe Merge branch 'hotfix' 2018-11-16 08:22:03 +00:00
Frappe Bot
74c8015b00 bumped to version 10.1.63 2018-11-16 08:22:03 +00:00
Ameya Shenoy
564d459dbc fix(requirements): lockdown python requirements (#6481) 2018-11-16 06:11:02 +05:30
Frappe Bot
8bc1f37c49 Merge branch 'master' into staging-fixes 2018-11-15 11:17:59 +00:00
Frappe Bot
e04cd475f6 Merge branch 'hotfix' 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
Ameya Shenoy
3f2335dd87
Merge pull request #6475 from Thunderbottom/redis-requirement-freeze
redis: freeze requirement to 2.10.6
2018-11-15 16:45:26 +05:30
Chinmay Pai
ca59cdc373
redis: freeze requirement to 2.10.6
the new redis 3.0.0 update has breaking changes, so we freeze the version to 2.10.6 for now.
2018-11-15 16:39:42 +05:30
Alchez
e900deb046 Allow email reports to be sent only on weekdays (#6457)
* feat(auto_email_report): Allow email reports to be sent only on weekdays

* feat(auto_email_report): Fix indent

* fix: Remove boilerplate file
2018-11-15 15:56:02 +05:30
Faris Ansari
d0554b008f
Merge pull request #6461 from netchampfaris/route-options-filter-fix
fix(filters): via Awesome bar and dashboard
2018-11-15 15:36:02 +05:30
Faris Ansari
76bd660753
Merge pull request #6466 from deepeshgarg007/bug-fixes
[Fix]Sales Invoice dashboard add button fix
2018-11-15 15:35:22 +05:30
Frappe Bot
92e37f29b6 Merge branch 'staging-fixes' into staging 2018-11-15 09:16:23 +00:00
Frappe Bot
224603148d bumped to version 11.0.3-beta.27 2018-11-15 09:16:23 +00:00
Ameya Shenoy
dd1eddff0f
Merge pull request #6469 from netchampfaris/break-build-in-ci
fix: Fail bench build in CI environment
2018-11-14 23:23:36 +05:30
Faris Ansari
a7613c174e fix: Fail bench build in CI environment 2018-11-14 22:03:11 +05:30
deepeshgarg007
81304a72fc Sales Invoice dashboard add button fix 2018-11-14 17:44:50 +05:30
Faris Ansari
dbb3dd178b fix(filters): via Awesome bar and dashboard 2018-11-14 14:06:25 +05:30
Faris Ansari
fc663d7b5d
Merge pull request #6452 from adityahase/website-chat
[Fix] Website Chat
2018-11-13 23:27:33 +05:30
Frappe Bot
3dd32381d6 Merge branch 'staging-fixes' into staging 2018-11-13 11:02:24 +00:00
Frappe Bot
9f7346f323 bumped to version 11.0.3-beta.26 2018-11-13 11:02:24 +00:00
Frappe Bot
229c7ef42f Merge branch 'hotfix' 2018-11-13 10:52:59 +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
Faris Ansari
c0cb56763d fix(Quill): Set HTML without triggering a focus (#6456) 2018-11-13 15:39:06 +05:30
Aditya Hase
265d4501c6 fix(chat): Do not remove Chat Operators from Website Settings 2018-11-13 12:48:26 +05:30
Aditya Hase
2858118f91 fix(chat): Setup and render chat on website pages as well 2018-11-13 12:48:26 +05:30
Zarrar
4f0081743b minor fix (#6443) 2018-11-13 10:33:11 +05:30
Ameya Shenoy
0303444eb3
Merge pull request #6451 from codingCoffee/uperm
fix: set is_patch flag before running patch
2018-11-12 19:08:44 +05:30
Ameya Shenoy
7dd2ccd066
fix: set is_patch flag before running patch
set frappe.flags.in_patch to True before running the
sync_user_permission_doctype_before_migrate patch via hooks
2018-11-12 12:59:06 +00:00
rohitwaghchaure
30ee228b4a Code cleanup and fixed print permission error (#6377) 2018-11-12 11:08:18 +05:30
Deepesh Garg
57c11adc64 With group indentation checkbox while exporting reports in csv format (#6417) 2018-11-12 11:06:39 +05:30
Faris Ansari
bb9df9b128 fix(Quill Editor): Set HTML using Quill's API (#6433)
To avoid doc changes when form is loaded
2018-11-12 10:32:52 +05:30
rohitwaghchaure
8ebeb0b2a3
Merge pull request #6440 from rohitwaghchaure/date_format_not_showing_correct_in_report
[Fix] Date format not shwoing properly in the prepared report
2018-11-11 17:55:15 +05:30
Rohit Waghchaure
a5645fec64 [Fix] Date format not shwoing properly in the prepared report 2018-11-11 17:53:11 +05:30
Faris Ansari
ff6d934c66
Merge pull request #6428 from rohitwaghchaure/revert_filter_hidden_feature
Revert feature, listView filter shows hidden field
2018-11-10 20:37:10 +05:30
Faris Ansari
2a40378bc3
Merge pull request #6439 from rohitwaghchaure/hotfix_revert_filter_hidden_feature
Revert feature, listView filter shows hidden field
2018-11-10 18:26:50 +05:30
Rohit Waghchaure
4dd03618d6 Revert feature, listView filter shows hidden field 2018-11-10 17:03:24 +05:30
Frappe Bot
0bfc864a69 Merge branch 'staging-fixes' into staging 2018-11-09 11:33:29 +00:00
Frappe Bot
aa530dab24 bumped to version 11.0.3-beta.25 2018-11-09 11:33:29 +00:00
Faris Ansari
d7d86a15e7
Merge pull request #6421 from netchampfaris/misc-fixes-1
Miscellaneous fixes
2018-11-09 16:54:25 +05:30
Frappe Bot
cc563b74e4 Merge branch 'staging-fixes' into staging 2018-11-09 10:41:19 +00:00
Frappe Bot
6953924ca7 bumped to version 11.0.3-beta.24 2018-11-09 10:41:19 +00:00