Revant Nandgaonkar
|
e7459c7e83
|
Clean up
|
2017-09-19 16:40:17 +05:30 |
|
mbauskar
|
c12eca952d
|
[minor] save uid, raw email for unhandled emails and other minor fixes
|
2017-09-19 16:30:48 +05:30 |
|
mbauskar
|
6b5b78b3cf
|
[minor] fixed uneven intendation, replaced spaces with tag
|
2017-09-19 16:12:22 +05:30 |
|
mbauskar
|
ead7056167
|
[hotfix] set the email account for outgoing emails
|
2017-09-19 15:56:33 +05:30 |
|
Manas Solanki
|
7ddc6ce933
|
try catch expression in eval for depends_on
|
2017-09-19 14:07:01 +05:30 |
|
mbauskar
|
92973a1cf9
|
[minor] don't setup checkbox if the childtable is read_only
|
2017-09-19 12:49:43 +05:30 |
|
Nabin Hait
|
ea571a0d6c
|
Merge branch 'master' into staging
|
2017-09-19 12:07:08 +05:30 |
|
Nabin Hait
|
79787d0ec5
|
Merge branch 'hotfix'
|
2017-09-19 12:07:07 +05:30 |
|
Nabin Hait
|
399c26d043
|
Merge branch 'master' into develop
|
2017-09-19 12:07:07 +05:30 |
|
Nabin Hait
|
1774e60c0d
|
bumped to version 8.10.8
|
2017-09-19 12:37:07 +06:00 |
|
Revant Nandgaonkar
|
620b7f482e
|
Merge branch 'develop' of frappe/frappe into web_hooks
|
2017-09-18 17:12:46 +05:30 |
|
Revant Nandgaonkar
|
fadb45e369
|
enqueue webhook request
|
2017-09-18 17:10:53 +05:30 |
|
Revant Nandgaonkar
|
421b436803
|
move run webhook to Document from hooks
|
2017-09-18 16:32:33 +05:30 |
|
Rushabh Mehta
|
9d15d74918
|
Merge pull request #4142 from nabinhait/backup_fix
Delete backups if path exists
|
2017-09-18 15:55:53 +05:30 |
|
Rushabh Mehta
|
c86176c572
|
Merge pull request #4140 from mbauskar/control-code
[minor] reverted code control's background color to white
|
2017-09-18 15:54:42 +05:30 |
|
mbauskar
|
cd7b1c16cd
|
[minor] used @text-color for color attribute instead of black
|
2017-09-18 15:53:16 +05:30 |
|
Nabin Hait
|
44277a35fb
|
Delete backups if path exists
|
2017-09-18 15:41:00 +05:30 |
|
Rushabh Mehta
|
e4bca53088
|
Merge pull request #4130 from mbauskar/4005
[fixes] render extracted jinja title for custom doctypes
|
2017-09-18 13:25:06 +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
|
387f471575
|
Merge pull request #4139 from mbauskar/website-slideshow
[minor] images attached to website slideshow should be public
|
2017-09-18 13:22:34 +05:30 |
|
Rushabh Mehta
|
ddcc922756
|
Merge pull request #4137 from mbauskar/quick-entry
[minor] dont show the quick entry dialog if there are no mandatory or bold fields available
|
2017-09-18 13:21:31 +05:30 |
|
Rushabh Mehta
|
5276f7ef00
|
Merge pull request #4129 from ci2014/patch-12
Update attach.js
|
2017-09-18 13:17:21 +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
|
20e3fa428e
|
Merge pull request #4128 from mbauskar/log-error
[hotfix] encode traceback for frappe.log_error method
|
2017-09-18 13:04:06 +05:30 |
|
Rushabh Mehta
|
579d907b21
|
Merge pull request #4101 from tundebabzy/add_new_currencies
Add new currencies
|
2017-09-18 13:00:36 +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 |
|
Rushabh Mehta
|
e4351cb8c9
|
Merge pull request #3999 from emadshaaban92/develop
Enable using templates inside ControlHTML
|
2017-09-18 12:52:15 +05:30 |
|
Rushabh Mehta
|
8c078dd839
|
Merge pull request #4059 from manassolanki/portal-newsletter
Portal for Newsletter
|
2017-09-18 12:52:02 +05:30 |
|
mbauskar
|
24dd16f51e
|
[minor] reverted code control's background color to white
|
2017-09-18 12:07:38 +05:30 |
|
mbauskar
|
9d2985e38c
|
[minor] images attached to website slideshow should be public
|
2017-09-18 11:57:44 +05:30 |
|
Revant Nandgaonkar
|
10779be115
|
Merge branch 'develop' of frappe/frappe into web_hooks
|
2017-09-18 11:31:10 +05:30 |
|
Manas Solanki
|
2f885191da
|
added the test case
|
2017-09-18 02:04:51 +05:30 |
|
Manas Solanki
|
1bbcfc5f9f
|
webview for the newsletter
|
2017-09-18 01:01:59 +05:30 |
|
Manas Solanki
|
d0d92d5ebd
|
codacy fix and change template path
|
2017-09-18 01:01:59 +05:30 |
|
Manas Solanki
|
f26f4353fc
|
minor changes in the sql query
|
2017-09-18 01:01:59 +05:30 |
|
Manas Solanki
|
b3994f1a79
|
portal viewe for the newsletter
|
2017-09-18 01:01:59 +05:30 |
|
Zlash65
|
7a3dd1613d
|
minor refresh fix - contacts
|
2017-09-17 00:40:04 +05:30 |
|
Saurabh
|
287d7dc2c6
|
Merge branch 'master' into develop
|
2017-09-16 11:54:28 +05:30 |
|
Saurabh
|
c3e67ec48d
|
Merge branch 'master' into staging
|
2017-09-16 11:54:28 +05:30 |
|
Saurabh
|
d44594fd39
|
Merge branch 'hotfix'
|
2017-09-16 11:54:27 +05:30 |
|
Saurabh
|
957c1a6eb5
|
bumped to version 8.10.7
|
2017-09-16 12:24:27 +06:00 |
|
mbauskar
|
c1a1a3cdfe
|
[minor] dont show the quick entry dialog if there are no mandatory or bold fields available
|
2017-09-15 18:01:46 +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
|
bcc861ad28
|
[minor] change backup filename format to DDMMYY_HHMMSS_SITE_DATABASE.*
|
2017-09-15 15:32:11 +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
|
5be75aaf27
|
[fixes] render extracted jinja title for custom doctypes
|
2017-09-15 11:38:50 +05:30 |
|
ci2014
|
ffe1559f57
|
Update attach.js
|
2017-09-14 19:52:49 +02:00 |
|
ci2014
|
5b9582ba12
|
Update attach.js
Fix paper-clip to paperclip
|
2017-09-14 19:35:06 +02:00 |
|