Aditya Hase
cd737debcb
Open CSV file in binary mode while writing bytes
2017-09-27 01:08:07 +05:30
Aditya Hase
943f548c1e
Use 'key' keyword argument with list.sort
2017-09-27 01:08:07 +05:30
Nabin Hait
1d93c66285
Fixed merge conflict
2017-09-25 16:30:08 +05:30
Rushabh Mehta
adc7ad69cd
[fix] desktop notifications
2017-09-25 11:06:54 +05:30
Rushabh Mehta
a52d393980
[fix] test
2017-09-21 17:22:11 +05:30
Rushabh Mehta
dcaf5f98af
[fix] remove prints
2017-09-21 16:47:53 +05:30
Rushabh Mehta
d4fd3efef4
[fix] checkbox editor
2017-09-21 15:31:12 +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
Rushabh Mehta
b321d30dea
Merge pull request #4122 from mbauskar/depends-on
...
[test-cases] minor fixes and checked all the depends on fields are valid of not
2017-09-21 14:50:49 +05:30
Rushabh Mehta
ab2e36fc8c
Merge pull request #4136 from shridarpatil/notiy_by_email
...
Notiy by email
2017-09-21 14:48:08 +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
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
mbauskar
ead7056167
[hotfix] set the email account for outgoing emails
2017-09-19 15:56:33 +05:30
Rushabh Mehta
f65f38610c
Merge pull request #4134 from mbauskar/comment
...
[minor] delete comment from documents _comments column on communication on_trash event
2017-09-18 13:24:33 +05:30
Rushabh Mehta
a5caeb335e
Merge pull request #4127 from mbauskar/file
...
[minor] update the image field value if file's is_private value changed
2017-09-18 13:04:54 +05:30
Rushabh Mehta
90fe449954
Merge pull request #4100 from rmehta/file-upload-socket
...
[feature] File upload using Socket.io by making chunks
2017-09-18 13:00:18 +05:30
Saurabh
287d7dc2c6
Merge branch 'master' into develop
2017-09-16 11:54:28 +05:30
shridhar
b3df0bffe0
Resolved Conflicts
2017-09-15 16:54:52 +05:30
shridhar
144f5e23bd
Email notification on docshare
...
Send an email notification when a doc is shared
New notify_by_email colum added in docshare
Checkbox added in set_sharing.html
2017-09-15 16:47:45 +05:30
shridhar
94e216ba8a
Email notification on docshare
...
Send an email notification when a doc is shared
New notify_by_email colum added in docshare
Checkbox added in set_sharing.html
2017-09-15 16:35:55 +05:30
mbauskar
4b8aa83e61
[minor] delete comment from documents _comments column on communication on_trash event
2017-09-15 13:43:07 +05:30
mbauskar
c9df2e5922
[minor] update the image field value if file's is_private value changed
2017-09-14 17:22:40 +05:30
Saurabh
607806e74f
[fix] set default role specified in Portal Settings while signup as website user
2017-09-14 17:12:47 +05:30
Rushabh Mehta
c5b9524c15
Merge pull request #4114 from shridarpatil/develop
...
Login with username
2017-09-14 15:49:30 +05:30
Rushabh Mehta
71af10c6ff
Merge pull request #4124 from shridarpatil/gender
...
Changed User doctype "gender fieldtype to link"
2017-09-14 15:49:13 +05:30
shridhar
9b4070ab4e
Changed User doctype gender fieldtype to link
...
Changed Gender in user doctype from fieldtype select to fieldtype link
2017-09-14 15:03:46 +05:30
mbauskar
618ceb8982
[test-cases] minor fixes and checked all the depends on fields are valid of not
2017-09-14 13:46:30 +05:30
mbauskar
aca5c147c9
[minor] assingnment should not be allowed in the depends_on and collapsible_depends_on properties
2017-09-14 13:46:19 +05:30
Rushabh Mehta
1de26c939c
[enhance] use socket-io to upload files
2017-09-14 13:07:29 +05:30
Rushabh Mehta
13f472b559
Merge pull request #4095 from mbauskar/childtable-columns
...
[minor] show the child table fields lable in Auto Email Report
2017-09-14 11:40:56 +05:30
Shridhar Patil
9d6193bf70
Merge branch 'develop' into develop
2017-09-14 11:39:47 +05:30
Rushabh Mehta
33caea5e21
Merge pull request #4023 from schilgod/develop
...
Bypass 2FA if user login from restricted IP Address
2017-09-14 11:23:16 +05:30
shridhar
c436f965d3
Login with username
...
https://github.com/frappe/frappe/issues/4106
2017-09-13 14:18:31 +05:30
Rushabh Mehta
0642343940
[tests] test_runner.js show full js stack
2017-09-13 14:04:04 +05:30
Nabin Hait
7266e673ac
Merge branch 'master' into develop
2017-09-12 16:09:19 +05:30
Nabin Hait
bd5d7717e7
Disable custom checkbox for doctype if not administrator or in developer mode ( #4092 )
2017-09-12 15:46:41 +05:30
mbauskar
6fd186eaa3
[minor] translate field label for auto email reports
2017-09-11 18:07:57 +05:30
mbauskar
ce266f2944
[minor] show the child table fields lable in Auto Email Report
2017-09-11 17:27:31 +05:30
Sunny
df343aec64
merge with upstream/frappe
2017-09-07 16:04:55 +08:00
Sunny
a99216482d
merge with upstream/frappe
2017-09-07 15:56:05 +08:00
Sunny
cfd35d414b
correct field name and field value
2017-09-07 15:17:35 +08:00
Sunny
d902975080
Bypass 2FA if user login from restricted IP Address
2017-09-07 15:17:35 +08:00
mbauskar
cf3ba70e3e
Merge branch 'master' into develop
2017-09-07 11:49:20 +05:30
Makarand Bauskar
5a30cca165
[hotfix] fixed attachement issue on CommunicationComposer while reply from Communication ( #4078 )
2017-09-07 11:47:09 +05:30
Makarand Bauskar
6e6fb684ec
[hotfix] dont Patch Log, Module Def in Permission Manager ( #4070 )
2017-09-06 16:15:37 +05:30
Rushabh Mehta
44a7db75ca
Merge pull request #4056 from mbauskar/boilerplate
...
[minor] create the test_doctype_name.py for single doctype
2017-09-06 10:46:59 +05:30
Rushabh Mehta
df3fbd082a
Merge pull request #4057 from netchampfaris/file-thumbnail-crop
...
Add crop option to make_thumbnail
2017-09-06 10:46:34 +05:30
Rushabh Mehta
46eee356ff
Merge pull request #4058 from pratu16x7/setup-fixes
...
[setup] suppress post-setup messages
2017-09-05 12:20:50 +05:30
pratu16x7
276f5b5631
[setup] suppress post-setup messages
2017-09-05 12:15:43 +05:30
