Commit graph

1435 commits

Author SHA1 Message Date
Rushabh Mehta
6353912e79 [fix] bench_helper.py 2018-05-28 12:48:28 +05:30
Saurabh
56bf3bf40b [fix] resolved merge conflicts 2018-05-28 11:43:38 +05:30
Rushabh Mehta
4aff164b69 [fix] for bench get-app 2018-05-27 14:28:42 +05:30
Sharath C
22a2c682c9 Jinja Customization from hooks.py bug fix (#5604)
* Jinja Customization from hooks.py bug fix

* Condition to check for site initialization added.
2018-05-24 14:26:18 +05:30
Ameya Shenoy
949ec96fbc
Merge branch 'master' into develop 2018-05-24 08:43:19 +00:00
Ameya Shenoy
188c4c87db [fix] global-setup-help (#5603)
- custom jinja templates are taken if and only if a site is mentioned
- added test in travis as well
2018-05-24 12:05:25 +05:30
Ameya Shenoy
06851e7376
Merge branch 'master' into develop 2018-05-22 08:45:40 +00:00
ci2014
0a9192d791 Use email instead of user name for building exclude list from thread_notify (#5502)
* Update email.py

* Get the correct Email Address for Administrator

Get the correct Email Address for the Administrator User as well. I see no reason why.
2018-05-22 11:44:34 +05:30
Prateeksha Singh
e3115bfbc7 [docs-portal] Search the Docs (#5558)
* [docs-portal] search documentation

* [doc-search] remove search-result template

* [portal-search][minor] add search result section title

* [portal-search] make search result section macro

* [portal-search] two-col layout for more sections
2018-05-22 10:23:13 +05:30
Sharath C
873d3c85e8 Add Custom Jinja methods from hooks.py (#5585) 2018-05-22 10:16:38 +05:30
yogeshak
51f5988a76 JWT response does not contain email attribute for Office 365, reading upn instead (#5525) 2018-05-16 11:13:17 +05:30
Ameya Shenoy
7b003a71bc Python 3 fixes for PR bot (#5554)
In python 2 writing to file can be done by reading the file as 'w' or
'wb', however, in python 3 if we're writing 'utf-8' encoded stuff to a
file, it needs to be opened using the 'wb' argument. 'b' here stands for
binary.
2018-05-16 11:11:04 +05:30
Saurabh
f1b35c82f4 [fix] resolved merge conflicts 2018-05-15 12:56:21 +05:30
Saurabh
c1a338f8c0
Merge pull request #5491 from codingCoffee/decimal_fix
added handler for decimal object in response
2018-05-15 11:54:31 +05:30
Ameya Shenoy
fc99d691d1 Fix python3 issue reading pdf (#5541)
File types other than plain text files weren't sent properly in email. The initial implementation of try except used to destroy the file object in the try statement, and hence we were getting a blank string in the except block. The fix involves reading the file object separately before trying to decode it.
2018-05-08 15:41:12 +05:30
Nabin Hait
6737f1912c Fixed merge conflict 2018-05-08 15:27:37 +05:30
Ameya Shenoy
09e71d0d77 added floor and ceil to frappe.utils (#5536)
Added frappe wrappers to math.ceil and math.floor, since they are widely
used functions. Also added their docstrings for documentation and wote
test cases. And some minor typo fixes
2018-05-08 15:13:50 +05:30
Saurabh
c899c94c96 escape new line char while creating boilerplate for app 2018-05-07 12:50:19 +05:30
Nabin Hait
e3682cec22 Fixed merge conflict 2018-05-05 12:12:28 +05:30
Ameya Shenoy
5cc28b1257 pip fix (#5527) 2018-05-04 19:05:48 +05:30
Ameya Shenoy
dc8af84563 Login fix for python3 (#5529)
decode bytes to string
2018-05-04 18:36:27 +05:30
Prateeksha Singh
6724cf1776
Merge pull request #5200 from CodedInternet/password-hashing
Migrate password hashing away from mysql password()
2018-05-03 17:42:42 +05:30
Prateeksha Singh
d2dfda2711
Merge pull request #4973 from lasalesi/configurablepdfborder
using regex instead of soup to parse pdf page margins
2018-05-03 17:41:52 +05:30
Ameya Shenoy
2405569b18
Merge branch 'develop' into password-hashing 2018-04-26 20:22:42 +05:30
Ameya Shenoy
187b04bfa3
added handler for decimal object in response 2018-04-25 15:45:47 +05:30
Saurabh
56b6167c1f [fix] merge conflicts 2018-04-19 11:16:28 +05:30
Faris Ansari
217156e5fa
Add filepath param in read_xlsx (#5465) 2018-04-18 16:38:57 +05:30
Shreya Shah
c007c0c225 Fix for unknown locale languages in print format (#5424)
* fix for unknown locale in dates

* formatting fix
2018-04-17 11:29:22 +05:30
Rushabh Mehta
f03ac687ab [travis] --quiet 2018-04-16 15:09:08 +05:30
Rushabh Mehta
5ed8eeadb7
Merge branch 'develop' into password-hashing 2018-04-16 01:33:35 -08:00
Rushabh Mehta
b42e8f1210
Update password.py 2018-04-16 15:00:21 +05:30
Saurabh
7e58f36c88 Merge branch 'master' into develop 2018-04-15 12:50:28 +05:30
Ameya Shenoy
a6087cb243
Compatibility for pip10
- also some spaces and tabs fixes
2018-04-15 03:41:32 +05:30
KanchanChauhan
4232013e65 Check number format only if precision missing (#5357)
* Check number format only if precision missing

* handle string inputs
2018-04-13 11:11:09 +05:30
Rushabh Mehta
c4e1b9e0c1
[enhance] Add condition in transitions and move workflow to server-side (#5399)
* [workflow] move to server side

* [workflow] tests

* [workflow] tests

* [minor] remove print

* [fixes] tests and lint

* [tests] fix typo

* [fix] tests
2018-04-11 00:38:13 -08:00
Tom Price
cf6fcce961 Fix PR issues from #5200.
Fix issue with with rebase messing up patches.txt.

Change auth parameter back to user.
2018-04-11 09:01:57 +01:00
Suraj Shetty
fb25fdb609 Auto email report fixes (#5410)
* fixes https://github.com/frappe/erpnext/issues/13319

* fixes https://github.com/frappe/erpnext/issues/13422

* change auto email report template

* change auto email report template

* Update data.py

* Update data.py
2018-04-10 10:53:05 +05:30
Tom Price
e641ae70bd Migrate password hashing away from mysql password()
This is deprecated and needs to be replaced. 
Use passlib to hash, store, verify and upgrade as necessary.
Includes patch to migrate existing passwords in a non-breaking way.

Fixes #5195
2018-04-09 12:26:48 +01:00
Nabin Hait
116ac139cf Merge branch 'master' into develop 2018-04-09 15:21:30 +05:30
Saurabh
fbf66336fb [hotfix][urgent] fix backup compression (#5418) 2018-04-09 15:18:55 +05:30
Faris Ansari
da3e726fde
[fix] GCalendar Account test (#5400)
* [fix] GCalendar Account test

* [py3] fix email account test

* Decode plain text files
2018-04-07 22:38:12 +05:30
Nabin Hait
ef536e055b Merge branch 'master' into develop 2018-04-07 19:57:04 +05:30
Ameya Shenoy
a8f9a652e1 dropbox backup not ablt to find filepath (#5406) 2018-04-07 19:55:01 +05:30
Nabin Hait
944b45b62d fixed merge conflict 2018-04-06 15:05:15 +05:30
Saurabh
4e98f1689e [fix] breakdown backup process into two parts #5365 (#5390) 2018-04-05 18:24:19 +05:30
Suraj Shetty
ba91496378 Permission fixes (#5368)
* ui-fixes
- change help text
- remove if owner description and change label to Only If Creator
- adjust icon size (restricted list)
- add tags.less in build json

* remove block module for user check

* label change for module access
Rename module access section to desktop in user doctype to avoid confusion
2018-04-04 12:54:18 +05:30
Nabin Hait
82f1058ad4 Merge branch 'master' into develop 2018-04-04 11:23:21 +05:30
Suraj Shetty
0be4342649 User permissions redux (#5314)
* [start] removing simpler user permission structure

* permission changes
removed "apply user permission" from has_permission

* test fixes and other supporting fixes

* Removed Apply user permission code

* additional check to see if user has some user permissions related to a doctype

* test fixes

* removed a test

* Permission changes
- Code to restrict access if module is blocked for user.
- [Fix] ignore user perm if applicable

* List view restrictions ui changes

* removed unwanted apply user perm code

* permission (block module fix)

* permission fix

* change user permission
user permission will not be applied if user doesn't have role permission

* removed left "apply_user_permissions" property

* add user permission help template

* perm js refactor

* ui / ux changes
restrict list view before entering view if user is not permitterd
add description for if owner check in role permission manager

* codacy fixes

* permission code fix
add controller permission check
add blocked module check in build_permission

* optimized get blocked module method
2018-04-03 10:42:04 +05:30
Zarrar
edd089d4a1 append now_time to the filename incase of duplicate (#5313) 2018-04-02 18:22:12 +05:30
Achilles Rasquinha
d2bf875b8e
Merge pull request #5341 from achillesrasquinha/python3
fix fmt_money
2018-04-01 01:34:11 +05:30