Commit graph

13666 commits

Author SHA1 Message Date
Rushabh Mehta
de47fe57cc Merge pull request #4049 from frappe-pr-bot/translations-2017-09-04
[Translation] Updated Translations
2017-09-04 20:39:29 +05:30
Rushabh Mehta
4fcd96a26b Merge pull request #4050 from adityahase/tests3
Python 3 comapatibility Fixes
2017-09-04 20:39:17 +05:30
frappe-pr-bot
44f1130a8d [Translation] Updated Translations 2017-09-04 14:30:52 +02:00
Rushabh Mehta
6ef248712c Merge pull request #4036 from mrdadah/twofactors-check
Update twofactor.py
2017-09-04 17:52:19 +05:30
Aditya Hase
352692b089 Explicitly return list from get_user_default_as_list 2017-09-04 17:05:41 +05:30
Aditya Hase
f7b7387b46 Explicitly convert filter to list wherever necessary 2017-09-04 16:05:58 +05:30
Aditya Hase
f768de6734 Replace long with int in safe_eval 2017-09-04 16:05:58 +05:30
Aditya Hase
e61a1edae2 Fixed broken (Python 3) email.Charset import 2017-09-04 16:05:58 +05:30
Aditya Hase
e4ff0444b2 Don't unnecessary encode header content 2017-09-04 16:05:58 +05:30
Aditya Hase
99f17c651c Use 'in' instead of 'has_key' 2017-09-04 16:05:58 +05:30
Aditya Hase
ac6ed0d328 Fix bleach_whitelist import 2017-09-04 16:05:57 +05:30
Aditya Hase
2974aa50e3 Fix all implicit relative imports in __init__.py 2017-09-04 16:05:57 +05:30
Aditya Hase
14800deea1 Use six.moves.urllib.parse.urljoin instead of urllib.basejoin 2017-09-04 16:05:57 +05:30
Aditya Hase
ba7412b621 Decode encryption key given by Fernet 2017-09-04 16:05:57 +05:30
Aditya Hase
79b2b93958 Pass positional arguments instead of keyword arguments to MySQLdb.connect 2017-09-04 16:05:57 +05:30
Aditya Hase
8717deb169 Use six.moves.reload_module instead of reload 2017-09-04 16:05:57 +05:30
Aditya Hase
90d7819da9 Use six.iteritems(dict) instead of dict.iteritems() 2017-09-04 16:05:57 +05:30
Aditya Hase
a72cfef14a Use six.moves.xrange instead of xrange 2017-09-04 16:05:57 +05:30
Aditya Hase
cd9c357d2b Covert filter to list before checking it's length 2017-09-04 16:05:57 +05:30
Aditya Hase
24f2669795 Use str instead of bytes for keys in exports param 2017-09-04 16:05:57 +05:30
Aditya Hase
f78df81990 Convert dict.items() to list for modifying dict while looping 2017-09-04 16:05:57 +05:30
Aditya Hase
b32ce23196 Convert dict.keys() to list explicitly 2017-09-04 16:05:57 +05:30
mbauskar
eb6c04fca1 Merge branch 'master' into develop 2017-09-04 14:49:24 +05:30
mbauskar
6b9a95acb9 Merge branch 'hotfix' 2017-09-04 14:49:24 +05:30
mbauskar
29b4ac3760 bumped to version 8.9.3 2017-09-04 15:19:24 +06:00
Rushabh Mehta
f07a6372dc Merge pull request #4041 from netchampfaris/datepicker-fixes
[Datepicker] Fix today button, disable keyboardNav
2017-09-04 14:48:08 +05:30
Rushabh Mehta
a57a140e29 Merge pull request #4037 from mbauskar/hotfix
[hotfix] delete attachment first before deleting parent doc
2017-09-04 14:46:34 +05:30
mbauskar
cb87bb5b58 [hotfix] delete attachment first before deleting parent doc 2017-09-04 14:41:12 +05:30
Rushabh Mehta
800b9c559a [minor] added create_custom_fields as a utility function 2017-09-04 14:40:40 +05:30
Faris Ansari
f5af5e8c8a Revert "Fixed top pargin issue in PDF Print (#4028)" (#4040)
This reverts commit 4ce808a81b.
2017-09-04 14:29:55 +05:30
Faris Ansari
667e89e0a1 [Datepicker] Fix today button, disable keyboardNav 2017-09-04 14:04:32 +05:30
KanchanChauhan
4ce808a81b Fixed top pargin issue in PDF Print (#4028) 2017-09-04 13:39:52 +05:30
rohitwaghchaure
ac606fbbb1 Merge pull request #4038 from rohitwaghchaure/calendar_not_working_v8
[Fix] Calendar view is not working for sales order
2017-09-04 12:13:11 +05:30
Rohit Waghchaure
66cd8419a8 [Fix] Calendar view is not working for sales order 2017-09-04 11:37:34 +05:30
Rushabh Mehta
a8a10a9d72 Merge pull request #3882 from pratu16x7/user-progress
User Progress dialog
2017-09-04 11:13:35 +05:30
pratu16x7
0776e79cb2 [setup] new loading state, remove setup_wizard.css 2017-09-04 10:29:14 +05:30
Mohammed Eldadah
db7ead1435 Update twofactor.py
check twofactors in system settings
2017-09-03 19:40:27 +03:00
pratu16x7
bf4eab3bc2 [progress] dismiss on completion 2017-09-01 17:48:09 +05:30
Rushabh Mehta
de70666c6c [fix] select.js 2017-09-01 13:15:42 +05:30
Rushabh Mehta
fb0c701407 Merge pull request #4029 from codingCoffee/develop
fix for reverse linking (for dashboard) without filter
2017-09-01 12:55:55 +05:30
mbauskar
cf6de64c4d Merge branch 'master' into develop 2017-09-01 10:18:36 +05:30
mbauskar
9e9c685a2d Merge branch 'hotfix' 2017-09-01 10:18:35 +05:30
mbauskar
c2891d5306 bumped to version 8.9.2 2017-09-01 10:48:35 +06:00
Makarand Bauskar
6fa9967a04 [hotfix] throw DoesNotExistError if doctype is not available on Delete api (#4013)
* [hotfix] throw DoesNotExistError if doctype is not available on Delete api

* [fixes] aded tests cases and codecy, travis fixes
2017-09-01 09:16:32 +05:30
Makarand Bauskar
9d84f387e0 [hotfix] socket command error eof while connecting to email server (#4025)
* [hotfix] socket command error eof while connecting to email server

* [minor] codecy fixes
2017-09-01 09:10:26 +05:30
Ameya Shenoy
01a9058a3b fix for reverse linking (for dashboard) without filter 2017-08-31 20:16:07 +05:30
Frappe PR Bot
8921cb41b7 [Translation] Updated Translations (#4024) 2017-08-31 18:38:25 +05:30
Rushabh Mehta
b3ff900a5f Merge pull request #4019 from rmehta/website-settings
[fix] refactor website_settings, fixes frappe/erpnext#8949
2017-08-31 18:18:57 +05:30
Rushabh Mehta
1a092bc0bd Merge pull request #4020 from netchampfaris/download-reports-mobile
Download reports in mobile
2017-08-31 18:18:29 +05:30
rohitwaghchaure
824094830c [Enhance] selector by class name in for UI test cases (#4022) 2017-08-31 18:16:06 +05:30