mbauskar
cd7b1c16cd
[minor] used @text-color for color attribute instead of black
2017-09-18 15:53:16 +05:30
mbauskar
24dd16f51e
[minor] reverted code control's background color to white
2017-09-18 12:07:38 +05:30
Saurabh
287d7dc2c6
Merge branch 'master' into develop
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
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
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
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
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
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
Rushabh Mehta
5a5089d7f7
Merge pull request #4064 from revant/FrappeOAuth2Client
...
Added FrappeOAuth2Client
2017-09-14 11:22:10 +05:30
Prateeksha Singh
71e71d0514
[graphs] explicitly call setup() for every graph object ( #4120 )
2017-09-14 11:21:37 +05:30
Rushabh Mehta
884f00eed8
Update web_form.js
2017-09-14 11:13:40 +05:30
shridhar
4d954d5569
Change placeholder to 'Email address or Username' in login screen
...
Change placeholder in login screen based on system setting
If allowed login using mobile number placeholder => 'Email address or Mobile number'
If allowed login using username placeholder => 'Email address or Username'
If allowed login using both username and mobile placeholder => 'Email Address or Mobile number or Username'
2017-09-14 11:09:19 +05:30
tundebabzy
bd6bea9fec
edit documentation and add correct image url ( #4116 )
2017-09-14 11:04:40 +05:30
Saurabh
cb46380e64
[fix] if supervisor is restarting, do not queue the jobs ( #4112 )
...
* [fix] if supervisor is restarting, do not queue the jobs
* Update scheduler.py
2017-09-14 11:03:56 +05:30
Nabin Hait
1d2525d6ce
[refactor] Load languages on load of slide
2017-09-13 19:41:33 +05:30
Manas Solanki
f9988fafe9
don't route to success message for the website user
2017-09-13 18:59:52 +05:30
Prateeksha Singh
57730794b6
heatmap default empty data fix ( #4115 )
2017-09-13 16:16:02 +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
mbauskar
9ed6c5341e
[minor] don't show Bulk Print Option if user don't have Print permission
2017-09-13 13:22:17 +05:30
mbauskar
beaebe5c9a
[minor] set list view as selectable to allow bulk assigment
2017-09-13 13:18:46 +05:30
Prateeksha Singh
d0d216475f
[graphs] check for start date ( #4107 )
2017-09-13 11:25:29 +05:30
pratu16x7
6dd8c60c24
remove hardcoded empty state params
2017-09-13 09:21:46 +05:30
