Vishal Dhayagude
42100a15bc
[fix]syntax error on file list ( #3559 )
...
* [fix]syntax error on file list
* [fix]Linked with file bug
2017-06-25 10:58:27 +05:30
Sophat Vathana
7074d0cfe1
Update requirements.txt ( #3522 )
2017-06-23 18:01:25 +05:30
Prateeksha Singh
283f67d752
commonify parse_validate_and_set_in_modal, onchange in df ( #3540 )
2017-06-23 18:00:57 +05:30
Manas Solanki
64262dc635
error in the reports while downloading in the mobile app ( #3551 )
2017-06-23 17:53:42 +05:30
almeidapaulopt
615f135311
file list error + codacy ( #3552 )
2017-06-23 17:44:59 +05:30
Charles-Henri Decultot
ef3b892a5e
New avatar-xl css class ( #3543 )
2017-06-23 17:43:54 +05:30
Rushabh Mehta
834ee797ca
[wip] add inline images in frappe.sendmail ( #3528 )
2017-06-23 17:23:29 +05:30
Faris Ansari
fd082ea9f0
Fallback calendar color to blue ( #3542 )
2017-06-22 22:50:41 +05:30
Charles-Henri Decultot
fb85e91ed6
Bug in contact.js ( #3546 )
2017-06-22 22:50:16 +05:30
Sagar Vora
3dbe747292
[ci] use deprecated trusty build for now ( #3544 )
2017-06-22 17:05:23 +05:30
mbauskar
69adb000b0
Merge branch 'develop'
2017-06-22 17:01:02 +05:30
mbauskar
35bb6566e9
bumped to version 8.1.1
2017-06-22 17:31:02 +06:00
Makarand Bauskar
d07d9a72dd
Merge pull request #3545 from mbauskar/dropbox
...
[minor] updated requirement for dropbox
2017-06-22 16:52:22 +05:30
mbauskar
49ac5cc9e5
[minor] updated requirement for dropbox
2017-06-22 16:14:25 +05:30
mbauskar
7a06746992
Merge branch 'develop'
2017-06-22 13:09:47 +05:30
mbauskar
9ace9205ed
bumped to version 8.1.0
2017-06-22 13:39:46 +06:00
mbauskar
d8ed23e854
Merge branch 'hotfix'
2017-06-22 10:57:21 +05:30
mbauskar
ed99879c2b
Merge branch 'master' into develop
2017-06-22 10:57:21 +05:30
mbauskar
00344848ec
bumped to version 8.0.71
2017-06-22 11:27:21 +06:00
Saurabh
9aeb393bf0
Merge pull request #3536 from mbauskar/password-strength-fixes
...
[hotfix] return {} if enable_password_policy and minimum_password_score is not set in System settings
2017-06-22 10:53:15 +05:30
Makarand Bauskar
b98ebddbac
Merge pull request #3535 from manassolanki/web-forms
...
Fix for success message and redirect url in webforms
2017-06-21 21:08:25 +05:30
mbauskar
162557cc31
[hotfix] return {} if enable_password_policy and minimum_password_score is not set in System settings
2017-06-21 19:53:07 +05:30
Makarand Bauskar
677ac31fe0
Merge pull request #3532 from mbauskar/develop
...
Merge branch 'britlog-welcome_email' into develop
2017-06-21 19:13:14 +05:30
Makarand Bauskar
7fbad251d2
Merge pull request #3518 from saurabh6790/dropbox_v2_updates_1_access_token
...
[Update] dropbox backup mechanism to support Dropbox's V2 api and generate access token via centralized redirect url
2017-06-21 19:11:28 +05:30
Manas Solanki
bb7cfda345
Success message and redirect url should also work for 'login require' types webforms
...
fixes https://github.com/frappe/erpnext/issues/9073
2017-06-21 18:37:52 +05:30
Makarand Bauskar
501c19b505
Merge pull request #3533 from sagarvora/frappe-docs
...
[docs] Changes in homepage and before.md
2017-06-21 18:15:55 +05:30
Sagar Vora
b919aa4b74
Organisation, adding more resources and language changes
2017-06-21 18:07:37 +05:30
mbauskar
a4293dbace
Merge branch 'britlog-welcome_email' into develop
2017-06-21 18:01:53 +05:30
mbauskar
87d5ee2650
[minor] get company name from get_site_info hook for welcome email
2017-06-21 17:50:35 +05:30
britlog
d5fecab620
Change welcome email subject and delete username regex
2017-06-21 17:50:35 +05:30
Makarand Bauskar
b9788a31c2
Merge pull request #3523 from netchampfaris/mobile-app-error
...
Fix mobile app error
2017-06-21 16:51:52 +05:30
Makarand Bauskar
921a37eaeb
Merge pull request #3525 from mbauskar/develop
...
merged hotfix branch to develop
2017-06-21 16:42:08 +05:30
Sagar Vora
dc51c4c439
minor spelling and grammar fixes
2017-06-21 15:39:46 +05:30
mbauskar
bd88d09040
resolved merge conflicts
2017-06-21 14:37:18 +05:30
Faris Ansari
e841219d0a
Fix mobile app error
...
frappe/erpnext#9406
2017-06-21 14:26:48 +05:30
mbauskar
023d55e3ae
Merge branch 'hotfix'
2017-06-21 13:22:46 +05:30
mbauskar
61aa008182
bumped to version 8.0.70
2017-06-21 13:52:46 +06:00
Makarand Bauskar
7b4e390fd4
Merge pull request #3510 from netchampfaris/thumbnail
...
Maintain aspect ratio in thumbnail
2017-06-21 12:08:18 +05:30
Makarand Bauskar
79a6adf73e
Merge pull request #3521 from frappe/bcornwellmott-patch-1
...
Make upload files private by default
2017-06-21 11:29:42 +05:30
Makarand Bauskar
214e9a194a
Merge pull request #3515 from manassolanki/profit-loss-report
...
Add the empty row in the excel report, fixes #9377
2017-06-21 11:08:13 +05:30
bcornwellmott
264af6ad3d
Make upload files private by default
...
This unchecks the private box when uploading files by default. It's better to accidentally attach as private something that is meant to be public than to accidentally attach something as public which is meant to be private.
2017-06-20 10:35:19 -07:00
Makarand Bauskar
5068fb7c3a
Merge pull request #3517 from mbauskar/password-strength-fixes
...
[fixes] fixed password strength, ignore password strength if password policy is disabled
2017-06-20 21:42:16 +05:30
Makarand Bauskar
ffe53b0cd1
Merge pull request #3520 from saurabh6790/timeout_fix
...
[fix] set queue timeout explicitly while enqueuing a job
2017-06-20 20:06:26 +05:30
Saurabh
2510e4509a
[fix] set queue timeout explicitly while enqueuing a job
2017-06-20 20:01:00 +05:30
Makarand Bauskar
de181b82d1
Merge pull request #3514 from rohitwaghchaure/auto_email_report_error
...
[fix] Auto email report not working
2017-06-20 19:02:39 +05:30
Makarand Bauskar
acba96bf2a
minor fixes in auto email report
2017-06-20 19:02:10 +05:30
Saurabh
ee13f1bc93
[fix] bypass setup_dropbox page via rest api
2017-06-20 18:39:47 +05:30
Saurabh
ec16d11ae6
generate oauth2 access token from oauth1 access token
2017-06-20 18:39:47 +05:30
Saurabh
0c6b1c4481
[fix] fixes to oauth 2 token generation for frappe cloud users
2017-06-20 18:39:47 +05:30
Saurabh
eb2611dd83
[enhance] update dropbox backup to be compatible with Dropbox V2 api
2017-06-20 18:39:46 +05:30
