pratu16x7
40e57efa52
[setup] indicator and check color
2017-09-26 12:05:50 +05:30
Nabin Hait
ce01845d11
Merge branch 'master' into staging
2017-09-25 16:30:13 +05:30
Nabin Hait
2ce0f70c9a
Merge branch 'hotfix'
2017-09-25 16:29:08 +05:30
Nabin Hait
552abc9db7
bumped to version 8.10.9
2017-09-25 16:59:07 +06:00
Rushabh Mehta
1d60941b6a
Merge pull request #4173 from rmehta/hotfix-webform-date-picker
...
[fix] web form datepicker, trigger change event
2017-09-24 16:55:38 +05:30
Rushabh Mehta
57dfa412af
[fix] web form datepicker, trigger change event
2017-09-23 16:10:37 +05:30
Rushabh Mehta
1dc8b66a8d
Merge pull request #4160 from mbauskar/quick-entry
...
[hotfix] refresh dependancy after values are set in doc
2017-09-22 14:49:15 +05:30
Rushabh Mehta
455179b872
Update field_group.js
2017-09-22 12:40:22 +05:30
Rushabh Mehta
9c033db6fc
Merge pull request #4157 from pratu16x7/staging
...
[navbar] layout fixes
2017-09-22 10:32:17 +05:30
pratu16x7
532e2e2dcd
[navbar] layout fixes
2017-09-22 01:05:17 +05:30
mbauskar
69eb8934c0
[hotfix] refresh dependancy after values are set in doc
2017-09-21 17:55:10 +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
Nabin Hait
9d24c8038a
Merge branch 'develop' into staging
2017-09-21 13:01:51 +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
6651726b06
Merge pull request #4151 from rmehta/file-upload-fallback
...
[minor] fallback to file upload
2017-09-20 21:54:25 +05:30
Rushabh Mehta
8a37efcfd2
[fix] lint
2017-09-20 14:59:47 +05:30
Rushabh Mehta
85b88d6b09
[fix] lint
2017-09-20 14:58:54 +05:30
Rushabh Mehta
202732ed5f
[minor] added fallback to file upload
2017-09-20 14:51:55 +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
Rushabh Mehta
80679f1b2f
Merge pull request #4135 from mbauskar/backup
...
[minor] change backup filename format to DDMMYY_HHMMSS_SITE_DATABASE.*
2017-09-20 11:22:00 +05:30
Rushabh Mehta
16148abc9b
Update backups.py
2017-09-20 11:21:40 +05:30
Rushabh Mehta
98f92d5427
Merge pull request #4146 from mbauskar/html_utils
...
[minor] fixed uneven intendation, replaced spaces with tag
2017-09-20 11:20:08 +05:30
Rushabh Mehta
0bb59b83c2
Merge pull request #4138 from Zlash65/linking
...
[Fix] Minor fix - refresh contact links
2017-09-20 11:17:07 +05:30
Rushabh Mehta
fbabaec919
Merge pull request #4147 from mbauskar/unhandle-emails
...
[minor] save uid, raw email for unhandled emails and other minor fixes
2017-09-20 11:16:09 +05:30
Rushabh Mehta
3ace312ed5
Merge pull request #4149 from agritheory/patch-2
...
Update model.js
2017-09-20 11:15:38 +05:30
Tyler Matteson
86c44b871f
Update model.js
...
Add comment to clarify slug or slugify functionality
2017-09-19 13:31:29 -04:00
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
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
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
