vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
17019 commits 1 branch 0 tags 587 MiB
Commit graph

17019 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Ameya Shenoy
d4a8ad4533
Merge pull request #6431 from codingCoffee/dummy 
dummy commit
 2018-11-09 16:10:13 +05:30
Frappe Bot
bbd929212b dummy commit 2018-11-09 10:38:07 +00:00
Frappe Bot
cc9874e025 Merge branch 'staging-fixes' into staging 2018-11-09 10:13:51 +00:00
Frappe Bot
1a1be3852d bumped to version 11.0.3-beta.23 2018-11-09 10:13:51 +00:00
Frappe Bot
c373a172af Merge branch 'master' into staging-fixes 2018-11-09 10:08:19 +00:00
Frappe Bot
3be307169f Merge branch 'hotfix' 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
dd1d94b1aa
Merge pull request #6429 from codingCoffee/emailcc 
fix(Email Queue): change fieldtype of shown_as_cc
 2018-11-09 14:57:08 +05:30
Ameya Shenoy
afb6a7166c
fix(Email Queue): change fieldtype of shown_as_cc 
This is done to allow more number of recipients to be CCed in
the email. The existing fieldtype was Data, which had a
restriction of 140 characters, thereby allowing only a few email
addresses to be CCed. It has now been changed to Small Text, to
incorporate more email addresses.

Co-authored-by: sahil28297 <37302950+sahil28297@users.noreply.github.com>
Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
 2018-11-09 07:35:25 +00:00
Rohit Waghchaure
ac915c4257 Revert feature, listView filter shows hidden field 2018-11-09 12:59:28 +05:30
gshmu
a2642868a5 fix read_xlsx_file_from_attached_file when xlsx contain functions (#6400) 2018-11-09 10:53:03 +05:30
Navdeep Ghai
36c6552fe9 remove meta dependency when Link field options is [Select] (#6418) 2018-11-09 10:51:09 +05:30
Faris Ansari
c0a0c7e94c fix: Remove duplicate declaration 2018-11-08 13:45:28 +05:30
Faris Ansari
a8b5fdd5ca fix(Query Report): Enable refresh button after report is errored 2018-11-08 13:45:21 +05:30
Faris Ansari
cc8743aab9 fix(security): Sanitize file names in upload dialog (#6419) 2018-11-08 12:45:29 +05:30
Ameya Shenoy
5ada7746db fix: develop version should be 12 (#6414) 2018-11-08 12:44:40 +05:30
Faris Ansari
fa9b8eaeb7
Merge pull request #6415 from netchampfaris/communication-list-view-fix 
fix: Override primary_action from list_settings
 2018-11-08 11:37:51 +05:30
Faris Ansari
12b39a6118
style: Ignore console statement 2018-11-07 18:33:41 +05:30
Faris Ansari
184a3f57bc
style: Missing semicolon 2018-11-07 18:32:29 +05:30
Faris Ansari
65e0fe19cc fix: Override primary_action from list_settings 
Show Email Composer as primary action in Communication List
 2018-11-07 16:35:41 +05:30
Faris Ansari
223fa9453f
Merge pull request #6412 from netchampfaris/email-reply-chain-fix 
fix: Email Reply Chain
 2018-11-07 14:06:58 +05:30
Faris Ansari
338c4c8794 fix: Email Reply Chain 
Previous email is appended to the next reply, but was not rendered by
splitting it with a hardcoded comment string. Since Quill does not
support comments, created a new HiddenBlock for it.
 2018-11-07 13:06:22 +05:30
Ameya Shenoy
93720a911d
Merge branch 'staging-fixes' into staging 2018-11-06 11:05:32 +00:00
Ameya Shenoy
aa26e39da0 bumped to version 11.0.3-beta.22 2018-11-06 11:05:32 +00:00
rohitwaghchaure
4232bde0a1
Merge pull request #6408 from rohitwaghchaure/user_list_view_is_not_working 
[Fix] User listview is not working becaause full name field is hidden
 2018-11-06 13:31:04 +05:30
Rohit Waghchaure
6381c84ffd [Fix] User listview is not working becaause full name field is hidden 2018-11-06 12:44:25 +05:30
Faris Ansari
cac173289b
Merge pull request #6399 from deepeshgarg007/datatable-upgrade 
Upgrade Datatable to version 1.5.3
 2018-11-05 20:09:29 +05:30
Faris Ansari
fc7a4a7835
fix(listview): Smart parsing of route options (#6404) 
- Fieldname should also be searched in child tables
 2018-11-05 18:35:44 +05:30
rohitwaghchaure
5aa9dbf6ee fix: Dynamic Link filter in listview (#6405) 2018-11-05 18:35:29 +05:30
Ameya Shenoy
321e45925a
Merge branch 'staging-fixes' into staging 2018-11-05 11:43:04 +00:00
Ameya Shenoy
889f0a2744 bumped to version 11.0.3-beta.21 2018-11-05 11:43:04 +00:00
Ameya Shenoy
e289f5041e
Merge pull request #6403 from netchampfaris/quill-fixes-returns 
fix(Quill): Add all quill attributes that are required to render it
 2018-11-05 17:10:25 +05:30
Faris Ansari
fe334d2c92 fix(Quill): Add all quill attributes that are required to render it 2018-11-05 17:07:21 +05:30
deepeshgarg007
c164aac933 Datatable Upgrade 2018-11-05 12:53:34 +05:30
Ranjith Kurungadam
a34eab2140 Add Bcc in Notification (#6392) 
* Notification - add Bcc

* remove Bcc from email header

* feat: Bcc in Notification
 2018-11-05 12:27:21 +05:30
Ameya Shenoy
266a23c65c
Merge branch 'staging-fixes' into staging 2018-11-05 06:46:35 +00:00
Ameya Shenoy
2009918efa bumped to version 11.0.3-beta.20 2018-11-05 06:46:35 +00:00
Ameya Shenoy
5a791cd099
Merge branch 'master' into staging-fixes 2018-11-05 06:37:49 +00:00
Ameya Shenoy
5821163d61
Merge branch 'hotfix' 2018-11-05 06:37:45 +00:00
Ameya Shenoy
54baae96f9 bumped to version 10.1.59 2018-11-05 06:37:45 +00:00
Aditya Hase
e6b070e611 refactor: Deduplication (#6347) 
* refactor: Deduplicate setup_perms_for

`setup_perms_for` has two identical definitions in

frappe/utils/reset_doc.py and
frappe/patches/v7_2/setup_custom_perms.py

Remove definition from setup_custom_perms.py, use import instead

* refactor: Deduplicate get_parent_doc and set_timeline_doc

`get_parent_doc` and `set_timeline_doc` are accidentally defined twice in

frappe/core/utils.py and
frappe/core/doctype/communication/communication.py

Remove definition from communication.py, use import instead

* fix(python3): Replace urlopen import with six.moves.urllib.request.urlopen
 2018-11-05 11:01:59 +05:30
rohitwaghchaure
2521e306a4 [Fix] Not able to export sales analytics report (#6369) 2018-11-05 11:01:24 +05:30
Saif
8d8154b0d7 Allow selecting page orientation for print view of report (#6393) 2018-11-05 11:00:55 +05:30
Saurabh
856a721073 [fix] sql injection fix (#6390) 2018-11-05 10:51:57 +05:30