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

17230 commits

This branch
This branch
All branches
Author SHA1 Message Date
Frappe Bot
478e60fdb1 Merge branch 'staging' into develop 2018-11-09 10:18:33 +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
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
Suraj Shetty
68172aff5f Remove anticipated exception by adding a check (#6424) 2018-11-09 10:50:06 +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
8a8212c298
Merge pull request #6411 from netchampfaris/node-modules-symlink 
Symlink node_modules in app public
 2018-11-08 12:03:05 +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
Faris Ansari
56279471c0 fix(ace): Point assets path to node_modules 2018-11-07 11:33:32 +05:30
Faris Ansari
d3340ae5e9 fix(build): Symlink app node_modules in public folder 2018-11-07 11:32:20 +05:30
Faris Ansari
8f84cc4e2e
Merge pull request #6409 from netchampfaris/email-reply-fix 
fix: Dont append last email's content in reply
 2018-11-06 19:03:28 +05:30
Faris Ansari
58c0a1f75c fix: Dont append last email's content in reply 2018-11-06 19:03:23 +05:30
Ameya Shenoy
78ff13fc6e
Merge branch 'staging' into develop 2018-11-06 11:12:10 +00:00
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
Ameya Shenoy
60e2090c3b
Merge pull request #6401 from frappe-pr-bot/translations-2018-11-05 
[Translation] Updated Translations
 2018-11-06 16:33:13 +05:30
Faris Ansari
5ce2479753
Merge pull request #6407 from netchampfaris/ace-editor 
Ace Code Editor
 2018-11-06 16:13:50 +05:30
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
48c5345ce6 fix: Set Code options to JS 
For Custom Script, DocField and Customize Form Field
 2018-11-06 12:30:56 +05:30
Faris Ansari
8ffc753568 style: Linting 2018-11-06 12:03:29 +05:30
Faris Ansari
c69ce9216a fix: Add JS as a valid option 2018-11-06 11:41:56 +05:30
Faris Ansari
c88f05d711 feat(Code Editor): Ace Editor for Code fieldtypes 
- Better editing experience with syntax highlighting and auto-completion
- Support HTML, Javascript and CSS language modes via the Options field
 2018-11-06 00:59:14 +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
Faris Ansari
6beac087db
Merge pull request #6402 from netchampfaris/marketplace-fixes 
Marketplace fixes
 2018-11-05 17:50:49 +05:30
Ameya Shenoy
b9ad9f8fb1
Merge branch 'staging' into develop 2018-11-05 11:43:46 +00:00
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
Faris Ansari
c26f21781f fix(image view): Bulk actions in image view 2018-11-05 15:46:00 +05:30
Faris Ansari
dabbd45c50 fix(router): error handling for use in non-desk environment 2018-11-05 15:45:08 +05:30
frappe-pr-bot
b823dcd1cc [Translation] Updated Translations 2018-11-05 12:13:25 +02:00
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
d0e7690ae2
Merge branch 'staging' into develop 2018-11-05 06:48:46 +00:00