Commit graph

14692 commits

Author SHA1 Message Date
Revant Nandgaonkar
cbfbaed73e [Fix] Codacy
https://www.codacy.com/app/frappe/frappe/pullRequest?prid=900990
2017-09-14 19:25:38 +05:30
tunde
0acde7bd81 change FCFA to CFA for West African francs 2017-09-14 14:16:34 +01:00
mbauskar
e1903861fc [hotfix] encode traceback for frappe.log_error method 2017-09-14 17:56:28 +05:30
Revant Nandgaonkar
4922f70076 Merge branch 'develop' of frappe/frappe into web_hooks 2017-09-14 17:39:52 +05:30
Revant Nandgaonkar
b6d982dfe7 Webhook doc correction 2017-09-14 17:39:44 +05:30
Revant Nandgaonkar
369ce0af66 [Docs] Webhook screenshot updated 2017-09-14 17:30:08 +05:30
Revant Nandgaonkar
cedb309446 Cleanup and Docs for Webhooks 2017-09-14 17:26:34 +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
Rushabh Mehta
e1b2f35640 Merge pull request #4118 from manassolanki/form-fix
don't route to success message for the website user
2017-09-14 17:19:00 +05:30
Rushabh Mehta
fca4ced23e Merge pull request #4110 from mbauskar/minor-fixes
[minor] don't show Bulk Print Option if user don't have Print permission
2017-09-14 17:18:24 +05:30
Rushabh Mehta
3c34a66a8b Merge pull request #4125 from mbauskar/list-view
[minor] don't format Code type fields in listview
2017-09-14 17:17:59 +05:30
Rushabh Mehta
a3f0fa4de5 Merge pull request #4126 from saurabh6790/set_default_role_as_per_portal_settings
[fix] set default role specified in Portal Settings while signup as website user
2017-09-14 17:17:26 +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
mbauskar
55e7fecf9f [minor] don't format Code type fields in listview 2017-09-14 16:51:36 +05:30
Rushabh Mehta
24e5d724b0 Merge pull request #4113 from Zlash65/filter
[Fix] Duplicate filters entry
2017-09-14 15:49:49 +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
Rushabh Mehta
733e29569c Merge pull request #4123 from Zlash65/email-char
[Fix] Accentuated characters are valid email's sender name
2017-09-14 15:49:02 +05:30
Rushabh Mehta
7acefeb228 [minor] handle timeouts, disconnects and errors 2017-09-14 15:45:53 +05:30
mbauskar
df8de9f440 Merge branch 'master' into staging 2017-09-14 15:24:19 +05:30
mbauskar
3cfbae5645 Merge branch 'hotfix' 2017-09-14 15:24:18 +05:30
mbauskar
e462a90d20 Merge branch 'master' into develop 2017-09-14 15:24:18 +05:30
mbauskar
e6c175a628 bumped to version 8.10.6 2017-09-14 15:54:18 +06:00
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
Zlash65
abf5c1548b function name changed as requested 2017-09-14 14:51:57 +05:30
Zlash65
5f068f7e4f accented characters are valid names 2017-09-14 14:20:50 +05:30
Revant Nandgaonkar
24a2656746 Only allow specified fields of doc 2017-09-14 14:16:44 +05:30
Emad Shaaban
04e639b02d [UI Test] UI Test for ControlHTML 2017-09-14 10:18:33 +02:00
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
Emad Shaaban
118261e590 Enable using templates inside ControlHTML
This change would enable showing computed data based on other fields in the same doc, without storing the computed data (which avoid unnecessary redundancy).
2017-09-14 10:12:03 +02:00
Revant Nandgaonkar
beb6318d88 Webhook Data DocType added 2017-09-14 13:24:02 +05:30
Rushabh Mehta
3b41d031a7 [fix] file_manager.py 2017-09-14 13:07:29 +05:30
Rushabh Mehta
b8237fecf3 [remove] socket.io client 2017-09-14 13:07:29 +05:30
Rushabh Mehta
1de26c939c [enhance] use socket-io to upload files 2017-09-14 13:07:29 +05:30
Rushabh Mehta
fd7e8eda62 [wip] file upload with socketio 2017-09-14 13:07:29 +05:30
shridhar
44e6027549 Removed trailing whitespaces from login.py 2017-09-14 12:44:13 +05:30
Rushabh Mehta
ed431b03c2 Update login.py 2017-09-14 12:31:54 +05:30
Nabin Hait
4d4e5dcc02 Fixes for align labels right 2017-09-14 12:25:21 +05:30
Makarand Bauskar
2fb63b50bc Update list_view.js 2017-09-14 12:16:12 +05:30
shridhar
fb48bca8dd Change place holder based on system settings
add place holder in login.py and then use in template
2017-09-14 12:15:58 +05:30
Makarand Bauskar
f6018f7d5d Update list_renderer.js 2017-09-14 12:12:53 +05:30
Revant Nandgaonkar
9941128477 Merge branch 'develop' of frappe/frappe into web_hooks 2017-09-14 11:58:22 +05:30
Faris Ansari
0180b3fd3a fix success spelling 2017-09-14 11:54:21 +05:30
Rushabh Mehta
563db38e40 Merge pull request #4121 from mbauskar/user-mentions
[minor] can not find users in user mentioned if username is not defined for any user
2017-09-14 11:47:44 +05:30
mbauskar
40df626b00 [minor] can not find users in user mentioned if username is not defined for any user 2017-09-14 11:44:43 +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
Zlash65
d7a41cc74a duplicate filters entry resolved 2017-09-14 11:25:11 +05:30
Rushabh Mehta
da0a4ea7fd Merge pull request #4065 from pratu16x7/page-fixes
[page] add empty state, required libs, callback
2017-09-14 11:24:47 +05:30