Commit graph

327 commits

Author SHA1 Message Date
Rushabh Mehta
5aaee31c49 fix(test): test_scheduler.py 2018-10-02 10:51:52 +05:30
Charles-Henri Decultot
98abda32b4 [Enhancement] Event timeline (#6133)
* Events in timeline wip

* Events in timeline

* Permission issue + split buttons between Frappe and ERPNext

* Add string type check

* Codacy corrections

* Permission issue

* Test and feedback corrections

* Codacy corrections

* Tests and codacy corrections

* Codacy correction

* Py3 correction

* Travis correction

* Py3 corrections"

* Travis and codacy corrections

* Removed space

* Add check for the removal of new lines

* Codacy rollup watch missing semicolon
2018-10-02 10:12:55 +05:30
Prateeksha Singh
eb5b7a77c9 [Feature] Format Autoname (#6017)
* [Feature] Format Autoname

- Generate autoname by replacing all instances of braced params
- Independent of remaining string or separators.
- Remove autoname Concatenate option

* [autoname] add test for format autoname
2018-09-03 10:58:56 +05:30
Rushabh Mehta
ad9ce8a3a3 fix(test): test_scheduler.py 2018-08-27 11:20:25 +05:30
Charles-Henri Decultot
dab491e55f Doctype links in foreign language (#5745)
* Doctype search in foreign language

* List comprehension slightly faster

* Remove obsolete comment

* Remove trailing whitespace

* Test case for address and contact query

* Refactor search and add tests

* Travis test debug

* Remove debug print

* Search limit removal for untranslated docs and tests refactor

* Remove old comments

* Test modification for Travis

* remove unused import

* Correct Role doctype
2018-08-24 15:23:20 +05:30
Neil Trini Lasrado
6177c1f4ad Changed email domain to example.com (#5985) 2018-08-20 10:36:58 +05:30
sivankar
a48b76b940 refactored code to add support in filters to get descendant or ancest… (#5847)
* refactored code to add support in filters to get descendant or ancestor for tree type documents

* added semicolon and comments to imporve code quality

* refactored code to add not ancestor and not descendants of filters

* added test cases for ancestors of and descendants of

* Translate labels
2018-08-14 12:19:18 +05:30
Prateeksha Singh
213279ec87
Merge pull request #5783 from szuyxy/global_search_support_and
[Enhance] Global search multi key words to pin point search result
2018-08-14 12:09:29 +05:30
Rushabh Mehta
aef1046b1f
[email] remove style from email so it does not mess up desk (#5860)
* [email] remove style from email so it does not mess up desk

* [fix] tests

* [fix] image parsing, #savedbyatestcase

* [fix] timeout issues in test

* [fix] timeout issues in test
2018-07-24 17:00:14 +05:30
Fisher Yu
e0cfa416cb
Update test_global_search.py 2018-07-24 00:19:40 +08:00
Fisher Yu
3ca6a19f33
Update test_global_search.py 2018-07-24 00:13:31 +08:00
Fisher Yu
c2a536938c
Update test_global_search.py 2018-07-24 00:06:57 +08:00
Shridhar Patil
abd3333bae Token based authentication (#5752)
* token based authentication

* authentication

Basic base64encode(api_key:api_secret)
token api_key:api_secret

* test added

Validation: only user with system manager can generate the keys

* codacy issues fixed

* token based authentication

* authentication

Basic base64encode(api_key:api_secret)
token api_key:api_secret

* test added

Validation: only user with system manager can generate the keys

* codacy issues fixed

* use frappe.safe_encode

* base64 encode use frappe.safe_encode

* set frappe.local.form_dict after setting user

* removed test

* removed unused imports

* test for python 3

* Update user.js

* [user.py] throw correct error

* Update user.py
2018-07-23 11:06:29 +05:30
Fisher Yu
0cbe649762
Update test_global_search.py
added 2 test cases
2018-07-19 22:01:31 +08:00
Saurabh
176f3b6a15 Resolved merge conflicts 2018-07-18 16:20:06 +05:30
Saurabh
5a7ee536d3
Merge pull request #5810 from saurabh6790/test_case_fixes
test case fixes for db query engin
2018-07-11 14:43:49 +05:30
Saurabh
b40d6f9a71 test case fixes for db query engin 2018-07-11 13:45:36 +05:30
Saurabh
081b17fbe8 [security][fix] tighten criteria to prevent sql injection in search-f… (#5800)
* [security][fix] tighten criteria to prevent sql injection in search-fields

* test cases
2018-07-11 11:04:51 +05:30
Saurabh
93165d4a5c test case fixes (#5807) 2018-07-11 11:02:27 +05:30
Rushabh Mehta
a4dd9ec91b [test] [style] 2018-07-10 16:10:08 +05:30
Rushabh Mehta
05d68968ca [fix] test 2018-07-10 15:26:43 +05:30
Rushabh Mehta
53a298a5c1 [fix] test_db_query.py 2018-07-06 18:27:08 +05:30
Saurabh
a135c6c431 resolved merge conflicts 2018-07-06 13:37:51 +05:30
Saurabh
9aeb79b874 [fix][test-case] filter sanitizer 2018-07-05 17:33:30 +05:30
Zarrar
10f7fa7fcc [Fix] Defaults doesn't comply with user permission fix (#5735)
* added additional check for user permission
If the key for default is found in user permission, then the value is checked if its permitted to the user or not

* user permission check on defaults

* test case for defaults
2018-07-03 10:52:56 +05:30
Saurabh
e2b1ebe84c [Security][fix] To avoid possible sql injection via filters and or_filters parameters and tighten the field level checks (#5721)
* [fix] sanitize filters and or_filters to avoid sql injection

* add test cases for filter sanitizer

* codacy fix

* added test cases to test valid scenarios
2018-06-27 09:15:42 +05:30
Saurabh
e9cdf322c6 [security][fix] Sanitize search fields to avoid sql injection (#5713)
* [security][fix] Sanitize search fields to avoid sql injection

* Test Cases for Sanitizer

* Test Cases fix

* [fix] test case
2018-06-25 11:23:32 +05:30
Rushabh Mehta
90188a99c5
[feature] add website_redirects hook (#5692) 2018-06-20 12:10:07 +05:30
schilgod
bcaabe5163 Enhancement to allow User to login from any IP if two factor auth is enabled (#5209)
* Enhancement to allow login from any IP if two factor auth is enabled

* Resolve Conflicts

* optimize code
2018-05-25 10:50:24 +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
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
Suraj Shetty
95c02f94ef Nested permission (#5460)
* nested permission

* test for nested permission

* [minor] Format code

* Fix nested permission test

* Fix codacy
2018-04-20 18:07:55 +05:30
Rushabh Mehta
5ed8eeadb7
Merge branch 'develop' into password-hashing 2018-04-16 01:33:35 -08:00
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
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
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
Achilles Rasquinha
b083baa443 fix fmt_moeny 2018-04-01 00:04:39 +05:30
Achilles Rasquinha
159a20e5f8 fix fmt_moeny 2018-03-31 23:59:10 +05:30
Revant Nandgaonkar
9e2f161f3e OAuth 2 ROPC Grant test (#5237) 2018-03-24 12:07:48 +05:30
lasalesi
4c6eb9b416 removed trailing whitespaces (codacy) 2018-03-21 13:47:23 +01:00
lasalesi
4b5af95bd9 added test case 2018-03-21 11:39:25 +01:00
Achilles Rasquinha
f0e84c145a fix travis test 2018-03-13 00:42:50 +05:30
Achilles Rasquinha
977491ff75 fix travis test 2018-03-13 00:41:37 +05:30
Achilles Rasquinha
e059b3c3fa fix travis test 2018-03-13 00:40:51 +05:30
Achilles Rasquinha
c26c741fec fix travis test 2018-03-13 00:39:58 +05:30
Revant Nandgaonkar
f98d782055 Oauth2 tests (#5128)
* oauth2 test for openid profile

* OAuth 2 Test : revoke token
2018-03-08 12:02:33 +05:30